Skip to content

Commit

Permalink
fix lints and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@felixwrt
felixwrt committed Aug 7, 2023
1 parent 3eb33ff commit 8e2f19f
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 59 deletions.
32 changes: 16 additions & 16 deletions internal/persistence/json/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (db *Database) MigrateToV1(providers []provider.Provider) {
return
}
db.data.Version = "1"
new_records := []record{};
newRecords := []record{}
for _, rec := range db.data.Records {
versions := map[ipversion.IPVersion][]models.HistoryEvent{}
for _, provider := range providers {
Expand All @@ -168,30 +168,30 @@ func (db *Database) MigrateToV1(providers []provider.Provider) {
for version := range versions {
rec.IPVersion = version.String()
}
new_records = append(new_records, rec)
newRecords = append(newRecords, rec)
} else {
_, provider_v4 := versions[ipversion.IP4]
_, provider_v6 := versions[ipversion.IP6]
_, providerV4 := versions[ipversion.IP4]
_, providerV6 := versions[ipversion.IP6]
for _, evt := range rec.Events {
if evt.IP.Is4() && provider_v4 {
versions[ipversion.IP4] = append(versions[ipversion.IP4], evt);
} else if evt.IP.Is6() && provider_v6 {
versions[ipversion.IP6] = append(versions[ipversion.IP6], evt);
} else {
switch {
case evt.IP.Is4() && providerV4:
versions[ipversion.IP4] = append(versions[ipversion.IP4], evt)
case evt.IP.Is6() && providerV6:
versions[ipversion.IP6] = append(versions[ipversion.IP6], evt)
default:
versions[ipversion.IP4or6] = append(versions[ipversion.IP4or6], evt)
}
}
for version, events := range versions {
new_record := record {
Domain: rec.Domain,
Host: rec.Host,
newRecord := record{
Domain: rec.Domain,
Host: rec.Host,
IPVersion: version.String(),
Events: events,
Events: events,
}
new_records = append(new_records, new_record)
newRecords = append(newRecords, newRecord)
}
}
}
db.data.Records = new_records;
db.write()
db.data.Records = newRecords
}
86 changes: 43 additions & 43 deletions internal/persistence/json/database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
)

type MockProvider struct {
domain string
host string
ipVersion ipversion.IPVersion
domain string
host string
ipVersion ipversion.IPVersion
}

func (p *MockProvider) String() string {
Expand Down Expand Up @@ -53,27 +53,27 @@ func (p *MockProvider) HTML() models.HTMLRow {
}
}

func (p *MockProvider) Update(ctx context.Context, client *http.Client, ip netip.Addr) (newIP netip.Addr, err error) {
func (p *MockProvider) Update(_ context.Context, _ *http.Client, _ netip.Addr) (newIP netip.Addr, err error) {
return netip.Addr{}, nil
}

var IPV4_ADDR, _ = netip.ParseAddr("97.155.132.1")
var IPV6_ADDR, _ = netip.ParseAddr("2001:fff:8987:4000:3e18:ffff:fe03:ffff")
var T1, _ = time.Parse("2006-Jan-02", "2013-Feb-03")
var T2, _ = time.Parse("2006-Jan-02", "2013-Feb-13")
var addrIPv4, _ = netip.ParseAddr("97.155.132.1") //nolint:gochecknoglobals
var addrIPv6, _ = netip.ParseAddr("2001:fff:8987:4000:3e18:ffff:fe03:ffff") //nolint:gochecknoglobals
var t1, _ = time.Parse("2006-Jan-02", "2013-Feb-03") //nolint:gochecknoglobals
var t2, _ = time.Parse("2006-Jan-02", "2013-Feb-13") //nolint:gochecknoglobals

func generateDB() (Database) {
return Database {
func generateDB() Database {
return Database{
data: dataModel{
Version: "",
Records: []record{
{
Domain: "my.domain",
Host: "@",
Domain: "my.domain",
Host: "@",
IPVersion: "",
Events: []models.HistoryEvent{
{IP: IPV4_ADDR, Time: T1},
{IP: IPV6_ADDR, Time: T2},
{IP: addrIPv4, Time: t1},
{IP: addrIPv6, Time: t2},
},
},
},
Expand All @@ -84,7 +84,7 @@ func generateDB() (Database) {
func Test_MigrateToV1_SingleIPVersion(t *testing.T) {
t.Parallel()

ipVersions := []ipversion.IPVersion {
ipVersions := []ipversion.IPVersion{
ipversion.IP4, ipversion.IP4or6, ipversion.IP6,
}

Expand All @@ -94,32 +94,32 @@ func Test_MigrateToV1_SingleIPVersion(t *testing.T) {

providers := []provider.Provider{
&MockProvider{
domain: "my.domain",
host: "@",
domain: "my.domain",
host: "@",
ipVersion: ipVersion,
},
}

database.MigrateToV1(providers)
database.MigrateToV1(providers)

expected_database := Database {
expectedDatabase := Database{
data: dataModel{
Version: "1",
Records: []record{
{
Domain: "my.domain",
Host: "@",
Domain: "my.domain",
Host: "@",
IPVersion: ipVersionStr,
Events: []models.HistoryEvent{
{IP: IPV4_ADDR, Time: T1},
{IP: IPV6_ADDR, Time: T2},
{IP: addrIPv4, Time: t1},
{IP: addrIPv6, Time: t2},
},
},
},
},
}

require.Equal(t, database.data, expected_database.data)
require.Equal(t, database.data, expectedDatabase.data)
}
}

Expand All @@ -130,13 +130,13 @@ func Test_MigrateToV1_IP4and6(t *testing.T) {

providers := []provider.Provider{
&MockProvider{
domain: "my.domain",
host: "@",
domain: "my.domain",
host: "@",
ipVersion: ipversion.IP4,
},
&MockProvider{
domain: "my.domain",
host: "@",
domain: "my.domain",
host: "@",
ipVersion: ipversion.IP6,
},
}
Expand All @@ -147,31 +147,31 @@ func Test_MigrateToV1_IP4and6(t *testing.T) {
return database.data.Records[i].IPVersion < database.data.Records[j].IPVersion
})

expected_database := Database {
expectedDatabase := Database{
data: dataModel{
Version: "1",
Records: []record{
{
Domain: "my.domain",
Host: "@",
Domain: "my.domain",
Host: "@",
IPVersion: "ipv4",
Events: []models.HistoryEvent{
{IP: IPV4_ADDR, Time: T1},
{IP: addrIPv4, Time: t1},
},
},
{
Domain: "my.domain",
Host: "@",
Domain: "my.domain",
Host: "@",
IPVersion: "ipv6",
Events: []models.HistoryEvent{
{IP: IPV6_ADDR, Time: T2},
{IP: addrIPv6, Time: t2},
},
},
},
},
}

require.Equal(t, database.data, expected_database.data)
require.Equal(t, database.data, expectedDatabase.data)
}

func Test_MigrateToV1_NoProvider(t *testing.T) {
Expand All @@ -183,22 +183,22 @@ func Test_MigrateToV1_NoProvider(t *testing.T) {

database.MigrateToV1(providers)

expected_database := Database {
expectedDatabase := Database{
data: dataModel{
Version: "1",
Records: []record{
{
Domain: "my.domain",
Host: "@",
Domain: "my.domain",
Host: "@",
IPVersion: "ipv4 or ipv6",
Events: []models.HistoryEvent{
{IP: IPV4_ADDR, Time: T1},
{IP: IPV6_ADDR, Time: T2},
{IP: addrIPv4, Time: t1},
{IP: addrIPv6, Time: t2},
},
},
},
},
}

require.Equal(t, database.data, expected_database.data)
}
require.Equal(t, database.data, expectedDatabase.data)
}

0 comments on commit 8e2f19f

Please sign in to comment.