mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2026-05-05 14:46:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix review

Browse Source 
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
This commit is contained in:
Patrik Cyvoct 2020-07-07 20:51:41 +02:00
parent e18d75ca68
commit b0901690fa
No known key found for this signature in database
GPG Key ID: 4334D82B950FB63A
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
provider/scaleway/scaleway.go
View File

@ -19,7 +19,6 @@ package scaleway
import (
"context"
"fmt"
"os"
"strconv"
"strings"
@ -29,6 +28,8 @@ import (
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/provider"
"sigs.k8s.io/external-dns/pkg/apis/externaldns"
)
const (
@ -54,29 +55,26 @@ type ScalewayChange struct {
// NewScalewayProvider initializes a new Scaleway DNS provider
func NewScalewayProvider(ctx context.Context, domainFilter endpoint.DomainFilter, dryRun bool) (*ScalewayProvider, error) {
accessKey, ok := os.LookupEnv(scw.ScwAccessKeyEnv)
if !ok {
return nil, fmt.Errorf("environment variable %s not found", scw.ScwAccessKeyEnv)
}
secretKey, ok := os.LookupEnv(scw.ScwSecretKeyEnv)
if !ok {
return nil, fmt.Errorf("environment variable %s not found", scw.ScwSecretKeyEnv)
}
organizationID, ok := os.LookupEnv(scw.ScwDefaultOrganizationIDEnv)
if !ok {
return nil, fmt.Errorf("environment variable %s not found", scw.ScwDefaultOrganizationIDEnv)
}
scwClient, err := scw.NewClient(
scw.WithEnv(),
scw.WithAuth(accessKey, secretKey),
scw.WithDefaultOrganizationID(organizationID),
scw.WithUserAgent("ExternalDNS"),
scw.WithUserAgent("ExternalDNS/"+externaldns.Version),
)
if err != nil {
return nil, err
}
if _, ok := scwClient.GetDefaultOrganizationID(); !ok {
return nil, fmt.Errorf("default organization is not set")
}
if _, ok := scwClient.GetAccessKey(); !ok {
return nil, fmt.Errorf("access key no set")
}
if _, ok := scwClient.GetSecretKey(); !ok {
return nil, fmt.Errorf("secret key no set")
}
domainAPI := domain.NewAPI(scwClient)
return &ScalewayProvider{
@ -122,9 +120,7 @@ func (p *ScalewayProvider) Records(ctx context.Context) ([]*endpoint.Endpoint, e
for _, record := range recordsResp.Records {
name := record.Name + "."
if record.Name == "" {
name = ""
}
// trim any leading or ending dot
fullRecordName := strings.Trim(name+getCompleteZoneName(zone), ".")