Skip to content

Commit 146ffa5

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3033 from abursavich/plural-copyright
Add missing copyright header and gofumpt
2 parents a763843 + 74ffff6 commit 146ffa5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+346
-425
lines changed

‎docs/scripts/docs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func removeLinkPrefixInIndex() {
3131
updatedContent := strings.ReplaceAll(string(content), "](./docs/", "](")
3232
updatedContent = strings.ReplaceAll(updatedContent, "](docs/", "](")
3333

34-
f, err := os.OpenFile("./docs/index.md", os.O_RDWR, 0644)
34+
f, err := os.OpenFile("./docs/index.md", os.O_RDWR, 0o644)
3535
if err != nil {
3636
log.Fatalf("Could not open index.md file to update content. Original error: %s", err)
3737
}

‎endpoint/labels.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ import (
2323
"strings"
2424
)
2525

26-
var (
27-
// ErrInvalidHeritage is returned when heritage was not found, or different heritage is found
28-
ErrInvalidHeritage = errors.New("heritage is unknown or not found")
29-
)
26+
// ErrInvalidHeritage is returned when heritage was not found, or different heritage is found
27+
var ErrInvalidHeritage = errors.New("heritage is unknown or not found")
3028

3129
const (
3230
heritage = "external-dns"

‎endpoint/labels_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type LabelsSuite struct {
3232
barTextAsMap Labels
3333
noHeritageText string
3434
wrongHeritageText string
35-
multipleHeritageText string //considered invalid
35+
multipleHeritageText string // considered invalid
3636
}
3737

3838
func (suite *LabelsSuite) SetupTest() {
@@ -48,7 +48,7 @@ func (suite *LabelsSuite) SetupTest() {
4848
"resource": "bar-resource",
4949
"new-key": "bar-new-key",
5050
}
51-
suite.barText = "heritage=external-dns,,external-dns/owner=bar-owner,external-dns/resource=bar-resource,external-dns/new-key=bar-new-key,random=stuff,no-equal-sign,," //also has some random gibberish
51+
suite.barText = "heritage=external-dns,,external-dns/owner=bar-owner,external-dns/resource=bar-resource,external-dns/new-key=bar-new-key,random=stuff,no-equal-sign,," // also has some random gibberish
5252

5353
suite.noHeritageText = "external-dns/owner=random-owner"
5454
suite.wrongHeritageText = "heritage=mate,external-dns/owner=random-owner"

‎endpoint/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ func main() {
338338
p, err = safedns.NewSafeDNSProvider(domainFilter, cfg.DryRun)
339339
case "plural":
340340
p, err = plural.NewPluralProvider(cfg.PluralCluster, cfg.PluralProvider)
341-
case "tencentcloud":
341+
case "tencentcloud":
342342
p, err = tencentcloud.NewTencentCloudProvider(domainFilter, zoneIDFilter, cfg.TencentCloudConfigFile, cfg.TencentCloudZoneType, cfg.DryRun)
343343
default:
344344
log.Fatalf("unknown dns provider: %s", cfg.Provider)

‎pkg/apis/externaldns/types.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ const (
3737
passwordMask = "******"
3838
)
3939

40-
var (
41-
// Version is the current version of the app, generated at build time
42-
Version = "unknown"
43-
)
40+
// Version is the current version of the app, generated at build time
41+
var Version = "unknown"
4442

4543
// Config is a project-wide configuration
4644
type Config struct {

‎pkg/apis/externaldns/validation/validation_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func TestValidateGoodRfc2136Config(t *testing.T) {
168168
}
169169

170170
func TestValidateBadRfc2136GssTsigConfig(t *testing.T) {
171-
var invalidRfc2136GssTsigConfigs = []*externaldns.Config{
171+
invalidRfc2136GssTsigConfigs := []*externaldns.Config{
172172
{
173173
LogFormat: "json",
174174
Sources: []string{"test-source"},
@@ -258,7 +258,7 @@ func TestValidateBadRfc2136GssTsigConfig(t *testing.T) {
258258
}
259259

260260
func TestValidateGoodRfc2136GssTsigConfig(t *testing.T) {
261-
var validRfc2136GssTsigConfigs = []*externaldns.Config{
261+
validRfc2136GssTsigConfigs := []*externaldns.Config{
262262
{
263263
LogFormat: "json",
264264
Sources: []string{"test-source"},

‎plan/conflict_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (suite *ResolverSuite) SetupTest() {
8484
endpoint.ResourceLabelKey: "ingress/default/bar-127",
8585
},
8686
}
87-
suite.bar127AAnother = &endpoint.Endpoint{ //TODO: remove this once we move to multiple targets under same endpoint
87+
suite.bar127AAnother = &endpoint.Endpoint{ // TODO: remove this once we move to multiple targets under same endpoint
8888
DNSName: "bar",
8989
Targets: endpoint.Targets{"8.8.8.8"},
9090
RecordType: "A",
@@ -113,7 +113,7 @@ func (suite *ResolverSuite) TestStrictResolver() {
113113
suite.Equal(suite.fooA5, suite.perResource.ResolveCreate([]*endpoint.Endpoint{suite.fooA5, suite.fooV1Cname}), "should pick min one")
114114
suite.Equal(suite.fooV1Cname, suite.perResource.ResolveCreate([]*endpoint.Endpoint{suite.fooV2Cname, suite.fooV1Cname}), "should pick min one")
115115

116-
//test that perResource resolver preserves resource if it still exists
116+
// test that perResource resolver preserves resource if it still exists
117117
suite.Equal(suite.bar127AAnother, suite.perResource.ResolveUpdate(suite.bar127A, []*endpoint.Endpoint{suite.bar127AAnother, suite.bar127A}), "should pick min for update when same resource endpoint occurs multiple times (remove after multiple-target support") // TODO:remove this test
118118
suite.Equal(suite.bar127A, suite.perResource.ResolveUpdate(suite.bar127A, []*endpoint.Endpoint{suite.bar192A, suite.bar127A}), "should pick existing resource")
119119
suite.Equal(suite.fooV2Cname, suite.perResource.ResolveUpdate(suite.fooV2Cname, []*endpoint.Endpoint{suite.fooV2Cname, suite.fooV2CnameDuplicate}), "should pick existing resource even if targets are same")

‎plan/plan.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ type planTable struct {
8282
resolver ConflictResolver
8383
}
8484

85-
func newPlanTable() planTable { //TODO: make resolver configurable
85+
func newPlanTable() planTable { // TODO: make resolver configurable
8686
return planTable{map[string]map[string]*planTableRow{}, PerResource{}}
8787
}
8888

@@ -148,15 +148,15 @@ func (p *Plan) Calculate() *Plan {
148148

149149
for _, topRow := range t.rows {
150150
for _, row := range topRow {
151-
if row.current == nil { //dns name not taken
151+
if row.current == nil { // dns name not taken
152152
changes.Create = append(changes.Create, t.resolver.ResolveCreate(row.candidates))
153153
}
154154
if row.current != nil && len(row.candidates) == 0 {
155155
changes.Delete = append(changes.Delete, row.current)
156156
}
157157

158158
// TODO: allows record type change, which might not be supported by all dns providers
159-
if row.current != nil && len(row.candidates) > 0 { //dns name is taken
159+
if row.current != nil && len(row.candidates) > 0 { // dns name is taken
160160
update := t.resolver.ResolveUpdate(row.current, row.candidates)
161161
// compare "update" to "current" to figure out if actual update is required
162162
if shouldUpdateTTL(update, row.current) || targetChanged(update, row.current) || p.shouldUpdateProviderSpecific(update, row.current) {

‎plan/plan_test.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func (suite *PlanTestSuite) SetupTest() {
226226
func (suite *PlanTestSuite) TestSyncFirstRound() {
227227
current := []*endpoint.Endpoint{}
228228
desired := []*endpoint.Endpoint{suite.fooV1Cname, suite.fooV2Cname, suite.bar127A}
229-
expectedCreate := []*endpoint.Endpoint{suite.fooV1Cname, suite.bar127A} //v1 is chosen because of resolver taking "min"
229+
expectedCreate := []*endpoint.Endpoint{suite.fooV1Cname, suite.bar127A} // v1 is chosen because of resolver taking "min"
230230
expectedUpdateOld := []*endpoint.Endpoint{}
231231
expectedUpdateNew := []*endpoint.Endpoint{}
232232
expectedDelete := []*endpoint.Endpoint{}
@@ -544,7 +544,7 @@ func (suite *PlanTestSuite) TestRemoveEndpointWithUpsert() {
544544
validateEntries(suite.T(), changes.Delete, expectedDelete)
545545
}
546546

547-
//TODO: remove once multiple-target per endpoint is supported
547+
// TODO: remove once multiple-target per endpoint is supported
548548
func (suite *PlanTestSuite) TestDuplicatedEndpointsForSameResourceReplace() {
549549
current := []*endpoint.Endpoint{suite.fooV3CnameSameResource, suite.bar192A}
550550
desired := []*endpoint.Endpoint{suite.fooV1Cname, suite.fooV3CnameSameResource}
@@ -567,9 +567,8 @@ func (suite *PlanTestSuite) TestDuplicatedEndpointsForSameResourceReplace() {
567567
validateEntries(suite.T(), changes.Delete, expectedDelete)
568568
}
569569

570-
//TODO: remove once multiple-target per endpoint is supported
570+
// TODO: remove once multiple-target per endpoint is supported
571571
func (suite *PlanTestSuite) TestDuplicatedEndpointsForSameResourceRetain() {
572-
573572
current := []*endpoint.Endpoint{suite.fooV1Cname, suite.bar192A}
574573
desired := []*endpoint.Endpoint{suite.fooV1Cname, suite.fooV3CnameSameResource}
575574
expectedCreate := []*endpoint.Endpoint{}
@@ -592,7 +591,6 @@ func (suite *PlanTestSuite) TestDuplicatedEndpointsForSameResourceRetain() {
592591
}
593592

594593
func (suite *PlanTestSuite) TestMultipleRecordsSameNameDifferentSetIdentifier() {
595-
596594
current := []*endpoint.Endpoint{suite.multiple1}
597595
desired := []*endpoint.Endpoint{suite.multiple2, suite.multiple3}
598596
expectedCreate := []*endpoint.Endpoint{suite.multiple3}
@@ -615,7 +613,6 @@ func (suite *PlanTestSuite) TestMultipleRecordsSameNameDifferentSetIdentifier()
615613
}
616614

617615
func (suite *PlanTestSuite) TestSetIdentifierUpdateCreatesAndDeletes() {
618-
619616
current := []*endpoint.Endpoint{suite.multiple2}
620617
desired := []*endpoint.Endpoint{suite.multiple3}
621618
expectedCreate := []*endpoint.Endpoint{suite.multiple3}
@@ -638,7 +635,6 @@ func (suite *PlanTestSuite) TestSetIdentifierUpdateCreatesAndDeletes() {
638635
}
639636

640637
func (suite *PlanTestSuite) TestDomainFiltersInitial() {
641-
642638
current := []*endpoint.Endpoint{suite.domainFilterExcluded}
643639
desired := []*endpoint.Endpoint{suite.domainFilterExcluded, suite.domainFilterFiltered1, suite.domainFilterFiltered2, suite.domainFilterFiltered3}
644640
expectedCreate := []*endpoint.Endpoint{suite.domainFilterFiltered1, suite.domainFilterFiltered2, suite.domainFilterFiltered3}
@@ -662,7 +658,6 @@ func (suite *PlanTestSuite) TestDomainFiltersInitial() {
662658
}
663659

664660
func (suite *PlanTestSuite) TestDomainFiltersUpdate() {
665-
666661
current := []*endpoint.Endpoint{suite.domainFilterExcluded, suite.domainFilterFiltered1, suite.domainFilterFiltered2}
667662
desired := []*endpoint.Endpoint{suite.domainFilterExcluded, suite.domainFilterFiltered1, suite.domainFilterFiltered2, suite.domainFilterFiltered3}
668663
expectedCreate := []*endpoint.Endpoint{suite.domainFilterFiltered3}
@@ -686,7 +681,6 @@ func (suite *PlanTestSuite) TestDomainFiltersUpdate() {
686681
}
687682

688683
func (suite *PlanTestSuite) TestMissing() {
689-
690684
missing := []*endpoint.Endpoint{suite.domainFilterFilteredTXT1, suite.domainFilterFilteredTXT2, suite.domainFilterExcludedTXT}
691685
expectedCreate := []*endpoint.Endpoint{suite.domainFilterFilteredTXT1, suite.domainFilterFilteredTXT2}
692686

@@ -893,7 +887,6 @@ func TestShouldUpdateProviderSpecific(tt *testing.T) {
893887
}
894888
b := plan.shouldUpdateProviderSpecific(test.desired, test.current)
895889
assert.Equal(t, test.shouldUpdate, b)
896-
897890
})
898891
}
899892
}

‎provider/akamai/akamai.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ func (p AkamaiProvider) fetchZones() (akamaiZones, error) {
193193
queryArgs.ContractIds = strings.Join(p.zoneIDFilter.ZoneIDs, ",")
194194
}
195195
resp, err := p.client.ListZones(queryArgs) // retrieve all primary zones filtered by contract ids
196-
197196
if err != nil {
198197
log.Errorf("Failed to fetch zones from Akamai")
199198
return filteredZones, err
@@ -215,7 +214,7 @@ func (p AkamaiProvider) fetchZones() (akamaiZones, error) {
215214
return filteredZones, nil
216215
}
217216

218-
//Records returns the list of records in a given zone.
217+
// Records returns the list of records in a given zone.
219218
func (p AkamaiProvider) Records(context.Context) (endpoints []*endpoint.Endpoint, err error) {
220219
zones, err := p.fetchZones() // returns a filtered set of zones
221220
if err != nil {
@@ -242,7 +241,7 @@ func (p AkamaiProvider) Records(context.Context) (endpoints []*endpoint.Endpoint
242241
continue
243242
}
244243
var temp interface{} = int64(recordset.TTL)
245-
var ttl = endpoint.TTL(temp.(int64))
244+
ttl := endpoint.TTL(temp.(int64))
246245
endpoints = append(endpoints, endpoint.NewEndpointWithTTL(recordset.Name,
247246
recordset.Type,
248247
ttl,
@@ -359,7 +358,7 @@ func trimTxtRdata(rdata []string, rtype string) []string {
359358

360359
func ttlAsInt(src endpoint.TTL) int {
361360
var temp interface{} = int64(src)
362-
var temp64 = temp.(int64)
361+
temp64 := temp.(int64)
363362
var ttl int = edgeDNSRecordTTL
364363
if temp64 > 0 && temp64 <= int64(maxInt) {
365364
ttl = int(temp64)

0 commit comments

Comments
 (0)