dnsprovider/pkg/dnsprovider - fix static check

This commit is contained in:
Ciprian Hacman 2019-12-18 13:53:39 +02:00
parent 4fedf8122f
commit deadeaed1e
7 changed files with 7 additions and 42 deletions

View File

@ -128,11 +128,6 @@ func getExampleRrs(zone dnsprovider.Zone) dnsprovider.ResourceRecordSet {
return rrsets.New("www11."+zone.Name(), []string{"10.10.10.10", "169.20.20.20"}, 180, rrstype.A) return rrsets.New("www11."+zone.Name(), []string{"10.10.10.10", "169.20.20.20"}, 180, rrstype.A)
} }
func getInvalidRrs(zone dnsprovider.Zone) dnsprovider.ResourceRecordSet {
rrsets, _ := zone.ResourceRecordSets()
return rrsets.New("www12."+zone.Name(), []string{"rubbish", "rubbish"}, 180, rrstype.A)
}
func addRrsetOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, rrset dnsprovider.ResourceRecordSet) { func addRrsetOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, rrset dnsprovider.ResourceRecordSet) {
err := rrsets.StartChangeset().Add(rrset).Apply() err := rrsets.StartChangeset().Add(rrset).Apply()
if err != nil { if err != nil {

View File

@ -108,20 +108,6 @@ func rrs(t *testing.T, zone dnsprovider.Zone) (r dnsprovider.ResourceRecordSets)
return rrsets return rrsets
} }
func listRrsOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets) []dnsprovider.ResourceRecordSet {
rrset, err := rrsets.List()
if err != nil {
t.Fatalf("Failed to list recordsets: %v", err)
} else {
if len(rrset) < 0 {
t.Fatalf("Record set length=%d, expected >=0", len(rrset))
} else {
t.Logf("Got %d recordsets: %v", len(rrset), rrset)
}
}
return rrset
}
func getRrOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, name string) []dnsprovider.ResourceRecordSet { func getRrOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, name string) []dnsprovider.ResourceRecordSet {
rrsetList, err := rrsets.Get(name) rrsetList, err := rrsets.Get(name)
if err != nil { if err != nil {

View File

@ -106,11 +106,6 @@ func getExampleRrs(zone dnsprovider.Zone) dnsprovider.ResourceRecordSet {
return rrsets.New("www11."+zone.Name(), []string{"10.10.10.10", "169.20.20.20"}, 180, rrstype.A) return rrsets.New("www11."+zone.Name(), []string{"10.10.10.10", "169.20.20.20"}, 180, rrstype.A)
} }
func getInvalidRrs(zone dnsprovider.Zone) dnsprovider.ResourceRecordSet {
rrsets, _ := zone.ResourceRecordSets()
return rrsets.New("www12."+zone.Name(), []string{"rubbish", "rubbish"}, 180, rrstype.A)
}
func addRrsetOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, rrset dnsprovider.ResourceRecordSet) { func addRrsetOrFail(t *testing.T, rrsets dnsprovider.ResourceRecordSets, rrset dnsprovider.ResourceRecordSet) {
err := rrsets.StartChangeset().Add(rrset).Apply() err := rrsets.StartChangeset().Add(rrset).Apply()
if err != nil { if err != nil {

View File

@ -25,11 +25,8 @@ package internal
import dns "google.golang.org/api/dns/v1" import dns "google.golang.org/api/dns/v1"
type ( type (
Project struct{ impl *dns.Project } Project struct{}
ProjectsGetCall struct{}
ProjectsGetCall struct{ impl *dns.ProjectsGetCall }
ProjectsService struct{ impl *dns.ProjectsService } ProjectsService struct{ impl *dns.ProjectsService }
Quota struct{}
Quota struct{ impl *dns.Quota }
) )

View File

@ -25,7 +25,6 @@ go_library(
deps = [ deps = [
"//dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/interfaces:go_default_library", "//dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/interfaces:go_default_library",
"//dnsprovider/pkg/dnsprovider/rrstype:go_default_library", "//dnsprovider/pkg/dnsprovider/rrstype:go_default_library",
"//vendor/google.golang.org/api/dns/v1:go_default_library",
"//vendor/google.golang.org/api/googleapi:go_default_library", "//vendor/google.golang.org/api/googleapi:go_default_library",
], ],
) )

View File

@ -22,12 +22,10 @@ package stubs
// Only the parts of the API that we use are included. // Only the parts of the API that we use are included.
// Others can be added as needed. // Others can be added as needed.
import dns "google.golang.org/api/dns/v1"
type ( type (
// TODO: We don't need these yet, so they remain unimplemented. Add later as required. // TODO: We don't need these yet, so they remain unimplemented. Add later as required.
Project struct{ impl *dns.Project } Project struct{}
ProjectsGetCall struct{ impl *dns.ProjectsGetCall } ProjectsGetCall struct{}
ProjectsService struct{ impl *dns.ProjectsService } ProjectsService struct{}
Quota struct{ impl *dns.Quota } Quota struct{}
) )

View File

@ -1,10 +1,5 @@
cloudmock/aws/mockelbv2 cloudmock/aws/mockelbv2
cmd/kops cmd/kops
dnsprovider/pkg/dnsprovider/providers/aws/route53
dnsprovider/pkg/dnsprovider/providers/coredns
dnsprovider/pkg/dnsprovider/providers/google/clouddns
dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal
dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/stubs
node-authorizer/pkg/authorizers/aws node-authorizer/pkg/authorizers/aws
node-authorizer/pkg/server node-authorizer/pkg/server
pkg/instancegroups pkg/instancegroups