mirror of
https://github.com/kubernetes-sigs/external-dns.git
synced 2025-08-06 09:36:58 +02:00
Set Linode user agent and change to linode/linodego package
This commit is contained in:
parent
fd3bed1f87
commit
ba6c82e043
18
Gopkg.lock
generated
18
Gopkg.lock
generated
@ -107,14 +107,6 @@
|
||||
pruneopts = ""
|
||||
revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:e62a9159a86473538057a322c49b65824cc32da865ace6cfc5ef1cacf3245226"
|
||||
name = "github.com/chiefy/linodego"
|
||||
packages = ["."]
|
||||
pruneopts = ""
|
||||
revision = "e7bd44d89fc5db41b43b8bce7278550a589d7ab6"
|
||||
version = "v0.2.0"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:85fd00554a6ed5b33687684b76635d532c74141508b5bce2843d85e8a3c9dc91"
|
||||
name = "github.com/cloudflare/cloudflare-go"
|
||||
@ -367,6 +359,14 @@
|
||||
revision = "508103cfb3b315fa9752b5bcd4fb2d97bbc26d89"
|
||||
version = "v0.2.0"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:1c41354ef11c9dbae2fe1ceee8369fcb2634977ba07e701e19ea53e8742c5420"
|
||||
name = "github.com/linode/linodego"
|
||||
packages = ["."]
|
||||
pruneopts = ""
|
||||
revision = "7edbc87f0140b7561dbc20458877a56bdded5eb8"
|
||||
version = "v0.3.0"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28"
|
||||
@ -838,7 +838,6 @@
|
||||
"github.com/aws/aws-sdk-go/aws/session",
|
||||
"github.com/aws/aws-sdk-go/service/route53",
|
||||
"github.com/aws/aws-sdk-go/service/servicediscovery",
|
||||
"github.com/chiefy/linodego",
|
||||
"github.com/cloudflare/cloudflare-go",
|
||||
"github.com/coreos/etcd/client",
|
||||
"github.com/digitalocean/godo",
|
||||
@ -854,6 +853,7 @@
|
||||
"github.com/infobloxopen/infoblox-go-client",
|
||||
"github.com/kubernetes/repo-infra/verify/boilerplate/test",
|
||||
"github.com/linki/instrumented_http",
|
||||
"github.com/linode/linodego",
|
||||
"github.com/nesv/go-dynect/dynect",
|
||||
"github.com/oracle/oci-go-sdk/common",
|
||||
"github.com/oracle/oci-go-sdk/dns",
|
||||
|
@ -77,5 +77,5 @@ ignored = ["github.com/kubernetes/repo-infra/kazel"]
|
||||
version = "1.8.0"
|
||||
|
||||
[[constraint]]
|
||||
name = "github.com/chiefy/linodego"
|
||||
version = "0.2.0"
|
||||
name = "github.com/linode/linodego"
|
||||
version = "0.3.0"
|
2
main.go
2
main.go
@ -122,7 +122,7 @@ func main() {
|
||||
case "digitalocean":
|
||||
p, err = provider.NewDigitalOceanProvider(domainFilter, cfg.DryRun)
|
||||
case "linode":
|
||||
p, err = provider.NewLinodeProvider(domainFilter, cfg.DryRun)
|
||||
p, err = provider.NewLinodeProvider(domainFilter, cfg.DryRun, externaldns.Version)
|
||||
case "dnsimple":
|
||||
p, err = provider.NewDnsimpleProvider(domainFilter, zoneIDFilter, cfg.DryRun)
|
||||
case "infoblox":
|
||||
|
@ -23,7 +23,7 @@ import (
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/chiefy/linodego"
|
||||
"github.com/linode/linodego"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.org/x/oauth2"
|
||||
|
||||
@ -76,7 +76,7 @@ type LinodeChangeDelete struct {
|
||||
}
|
||||
|
||||
// NewLinodeProvider initializes a new Linode DNS based Provider.
|
||||
func NewLinodeProvider(domainFilter DomainFilter, dryRun bool) (*LinodeProvider, error) {
|
||||
func NewLinodeProvider(domainFilter DomainFilter, dryRun bool, appVersion string) (*LinodeProvider, error) {
|
||||
token, ok := os.LookupEnv("LINODE_TOKEN")
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("no token found")
|
||||
@ -91,6 +91,7 @@ func NewLinodeProvider(domainFilter DomainFilter, dryRun bool) (*LinodeProvider,
|
||||
}
|
||||
|
||||
linodeClient := linodego.NewClient(oauth2Client)
|
||||
linodeClient.SetUserAgent(fmt.Sprintf("ExternalDNS/%s linodego/%s", appVersion, linodego.Version))
|
||||
|
||||
provider := &LinodeProvider{
|
||||
Client: &linodeClient,
|
||||
|
@ -21,9 +21,9 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/chiefy/linodego"
|
||||
"github.com/kubernetes-incubator/external-dns/endpoint"
|
||||
"github.com/kubernetes-incubator/external-dns/plan"
|
||||
"github.com/linode/linodego"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
"github.com/stretchr/testify/require"
|
||||
@ -137,11 +137,11 @@ func TestLinodeConvertRecordType(t *testing.T) {
|
||||
|
||||
func TestNewLinodeProvider(t *testing.T) {
|
||||
_ = os.Setenv("LINODE_TOKEN", "xxxxxxxxxxxxxxxxx")
|
||||
_, err := NewLinodeProvider(NewDomainFilter([]string{"ext-dns-test.zalando.to."}), true)
|
||||
_, err := NewLinodeProvider(NewDomainFilter([]string{"ext-dns-test.zalando.to."}), true, "1.0")
|
||||
require.NoError(t, err)
|
||||
|
||||
_ = os.Unsetenv("LINODE_TOKEN")
|
||||
_, err = NewLinodeProvider(NewDomainFilter([]string{"ext-dns-test.zalando.to."}), true)
|
||||
_, err = NewLinodeProvider(NewDomainFilter([]string{"ext-dns-test.zalando.to."}), true, "1.0")
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user