mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-08 10:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reformat code to meet lint standards

Browse Source
This commit is contained in:
Rick Henry 2021-12-07 14:38:34 +00:00
parent 023eb23ef9
commit 6fc68a82db
No known key found for this signature in database
GPG Key ID: 07243CA36106218D
2 changed files with 456 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
provider/safedns/safedns.go
View File

@ -21,14 +21,14 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ukfast/sdk-go/pkg/service/safedns"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
ukf_client "github.com/ukfast/sdk-go/pkg/client" ukfClient "github.com/ukfast/sdk-go/pkg/client"
ukf_connection "github.com/ukfast/sdk-go/pkg/connection" ukfConnection "github.com/ukfast/sdk-go/pkg/connection"
"github.com/ukfast/sdk-go/pkg/service/safedns"
"sigs.k8s.io/external-dns/provider"
"sigs.k8s.io/external-dns/endpoint" "sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan" "sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/provider"
) )
// SafeDNS is an interface that is a subset of the SafeDNS service API that are actually used. // SafeDNS is an interface that is a subset of the SafeDNS service API that are actually used.
@ -38,8 +38,8 @@ type SafeDNS interface {
DeleteZoneRecord(zoneName string, recordID int) error DeleteZoneRecord(zoneName string, recordID int) error
GetZone(zoneName string) (safedns.Zone, error) GetZone(zoneName string) (safedns.Zone, error)
GetZoneRecord(zoneName string, recordID int) (safedns.Record, error) GetZoneRecord(zoneName string, recordID int) (safedns.Record, error)
GetZoneRecords(zoneName string, parameters ukf_connection.APIRequestParameters) ([]safedns.Record, error) GetZoneRecords(zoneName string, parameters ukfConnection.APIRequestParameters) ([]safedns.Record, error)
GetZones(parameters ukf_connection.APIRequestParameters) ([]safedns.Zone, error) GetZones(parameters ukfConnection.APIRequestParameters) ([]safedns.Zone, error)
PatchZoneRecord(zoneName string, recordID int, patch safedns.PatchRecordRequest) (int, error) PatchZoneRecord(zoneName string, recordID int, patch safedns.PatchRecordRequest) (int, error)
UpdateZoneRecord(zoneName string, record safedns.Record) (int, error) UpdateZoneRecord(zoneName string, record safedns.Record) (int, error)
} }
@ -51,7 +51,7 @@ type SafeDNSProvider struct {
// Only consider hosted zones managing domains ending in this suffix // Only consider hosted zones managing domains ending in this suffix
domainFilter endpoint.DomainFilter domainFilter endpoint.DomainFilter
DryRun bool DryRun bool
APIRequestParams ukf_connection.APIRequestParameters APIRequestParams ukfConnection.APIRequestParameters
} }
// ZoneRecord is a datatype to simplify management of a record in a zone. // ZoneRecord is a datatype to simplify management of a record in a zone.
@ -67,18 +67,18 @@ type ZoneRecord struct {
func NewSafeDNSProvider(domainFilter endpoint.DomainFilter, dryRun bool) (*SafeDNSProvider, error) { func NewSafeDNSProvider(domainFilter endpoint.DomainFilter, dryRun bool) (*SafeDNSProvider, error) {
token, ok := os.LookupEnv("SAFEDNS_TOKEN") token, ok := os.LookupEnv("SAFEDNS_TOKEN")
if !ok { if !ok {
return nil, fmt.Errorf("No SAFEDNS_TOKEN found in environment") return nil, fmt.Errorf("no SAFEDNS_TOKEN found in environment")
} }
ukfAPIConnection := ukf_connection.NewAPIKeyCredentialsAPIConnection(token) ukfAPIConnection := ukfConnection.NewAPIKeyCredentialsAPIConnection(token)
ukfClient := ukf_client.NewClient(ukfAPIConnection) ukfClient := ukfClient.NewClient(ukfAPIConnection)
safeDNS := ukfClient.SafeDNSService() safeDNS := ukfClient.SafeDNSService()
provider := &SafeDNSProvider{ provider := &SafeDNSProvider{
Client: safeDNS, Client: safeDNS,
domainFilter: domainFilter, domainFilter: domainFilter,
DryRun: dryRun, DryRun: dryRun,
APIRequestParams: *ukf_connection.NewAPIRequestParameters(), APIRequestParams: *ukfConnection.NewAPIRequestParameters(),
} }
return provider, nil return provider, nil
} }

7
provider/safedns/safedns_test.go
View File

@ -24,8 +24,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
ukfConnection "github.com/ukfast/sdk-go/pkg/connection"
"github.com/ukfast/sdk-go/pkg/service/safedns" "github.com/ukfast/sdk-go/pkg/service/safedns"
ukf_connection "github.com/ukfast/sdk-go/pkg/connection"
"sigs.k8s.io/external-dns/endpoint" "sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan" "sigs.k8s.io/external-dns/plan"
@ -56,12 +56,12 @@ func (m *MockSafeDNSService) GetZoneRecord(zoneName string, recordID int) (safed
return args.Get(0).(safedns.Record), args.Error(1) return args.Get(0).(safedns.Record), args.Error(1)
} }
func (m *MockSafeDNSService) GetZoneRecords(zoneName string, parameters ukf_connection.APIRequestParameters) ([]safedns.Record, error) { func (m *MockSafeDNSService) GetZoneRecords(zoneName string, parameters ukfConnection.APIRequestParameters) ([]safedns.Record, error) {
args := m.Called(zoneName, parameters) args := m.Called(zoneName, parameters)
return args.Get(0).([]safedns.Record), args.Error(1) return args.Get(0).([]safedns.Record), args.Error(1)
} }
func (m *MockSafeDNSService) GetZones(parameters ukf_connection.APIRequestParameters) ([]safedns.Zone, error) { func (m *MockSafeDNSService) GetZones(parameters ukfConnection.APIRequestParameters) ([]safedns.Zone, error) {
args := m.Called(parameters) args := m.Called(parameters)
return args.Get(0).([]safedns.Zone), args.Error(1) return args.Get(0).([]safedns.Zone), args.Error(1)
} }
@ -76,7 +76,6 @@ func (m *MockSafeDNSService) UpdateZoneRecord(zoneName string, record safedns.Re
return args.Int(0), args.Error(1) return args.Int(0), args.Error(1)
} }
// Utility functions // Utility functions
func createZones() []safedns.Zone { func createZones() []safedns.Zone {
return []safedns.Zone{ return []safedns.Zone{