Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
torgiren
External Dns
Commits
6c5cc736
Unverified
Commit
6c5cc736
authored
4 years ago
by
Kushal Bhandari
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #5 from aliasgharmhowwala/feature/ultradns_provider
Incorporated Review comments
parents
49b41423
67207c0f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
provider/ultradns/ultradns.go
+11
-11
provider/ultradns/ultradns.go
provider/ultradns/ultradns_test.go
+1
-1
provider/ultradns/ultradns_test.go
with
12 additions
and
12 deletions
+12
-12
provider/ultradns/ultradns.go
+
11
-
11
View file @
6c5cc736
...
...
@@ -42,7 +42,7 @@ const (
var
sbPoolRunProbes
=
true
var
sbPoolActOnProbes
=
true
var
ultradnsPoolType
=
"rdpool"
var
A
ccountName
string
var
a
ccountName
string
//Setting custom headers for ultradns api calls
var
customHeader
=
[]
udnssdk
.
CustomHeader
{
...
...
@@ -57,7 +57,7 @@ type UltraDNSProvider struct {
provider
.
BaseProvider
client
udnssdk
.
Client
domainFilter
endpoint
.
DomainFilter
D
ryRun
bool
d
ryRun
bool
}
// UltraDNSChanges struct
...
...
@@ -90,9 +90,9 @@ func NewUltraDNSProvider(domainFilter endpoint.DomainFilter, dryRun bool) (*Ultr
if
!
ok
{
return
nil
,
fmt
.
Errorf
(
"no baseurl found"
)
}
A
ccountName
,
ok
=
os
.
LookupEnv
(
"ULTRADNS_ACCOUNTNAME"
)
a
ccountName
,
ok
=
os
.
LookupEnv
(
"ULTRADNS_ACCOUNTNAME"
)
if
!
ok
{
A
ccountName
=
""
a
ccountName
=
""
}
probeValue
,
ok
:=
os
.
LookupEnv
(
"ULTRADNS_ENABLE_PROBING"
)
...
...
@@ -127,7 +127,7 @@ func NewUltraDNSProvider(domainFilter endpoint.DomainFilter, dryRun bool) (*Ultr
provider
:=
&
UltraDNSProvider
{
client
:
*
client
,
domainFilter
:
domainFilter
,
D
ryRun
:
dryRun
,
d
ryRun
:
dryRun
,
}
return
provider
,
nil
...
...
@@ -142,7 +142,7 @@ func (p *UltraDNSProvider) Zones(ctx context.Context) ([]udnssdk.Zone, error) {
zonesAppender
:=
[]
udnssdk
.
Zone
{}
for
_
,
zone
:=
range
p
.
domainFilter
.
Filters
{
zoneKey
.
Zone
=
zone
zoneKey
.
AccountName
=
A
ccountName
zoneKey
.
AccountName
=
a
ccountName
zones
,
err
:=
p
.
fetchZones
(
ctx
,
zoneKey
)
if
err
!=
nil
{
...
...
@@ -153,7 +153,7 @@ func (p *UltraDNSProvider) Zones(ctx context.Context) ([]udnssdk.Zone, error) {
}
return
zonesAppender
,
nil
}
zoneKey
.
AccountName
=
A
ccountName
zoneKey
.
AccountName
=
a
ccountName
zones
,
err
:=
p
.
fetchZones
(
ctx
,
zoneKey
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -305,7 +305,7 @@ func (p *UltraDNSProvider) submitChanges(ctx context.Context, changes []*UltraDN
if
err
!=
nil
{
return
err
}
if
!
p
.
D
ryRun
{
if
!
p
.
d
ryRun
{
_
,
err
=
p
.
client
.
RRSets
.
Delete
(
rrsetKey
)
if
err
!=
nil
{
return
err
...
...
@@ -361,7 +361,7 @@ func (p *UltraDNSProvider) submitChanges(ctx context.Context, changes []*UltraDN
switch
change
.
Action
{
case
ultradnsCreate
:
if
!
p
.
D
ryRun
{
if
!
p
.
d
ryRun
{
res
,
err
:=
p
.
client
.
RRSets
.
Create
(
rrsetKey
,
record
)
_
=
res
if
err
!=
nil
{
...
...
@@ -375,7 +375,7 @@ func (p *UltraDNSProvider) submitChanges(ctx context.Context, changes []*UltraDN
return
err
}
if
!
p
.
D
ryRun
{
if
!
p
.
d
ryRun
{
_
,
err
=
p
.
client
.
RRSets
.
Delete
(
rrsetKey
)
if
err
!=
nil
{
return
err
...
...
@@ -387,7 +387,7 @@ func (p *UltraDNSProvider) submitChanges(ctx context.Context, changes []*UltraDN
return
err
}
if
!
p
.
D
ryRun
{
if
!
p
.
d
ryRun
{
_
,
err
=
p
.
client
.
RRSets
.
Update
(
rrsetKey
,
record
)
if
err
!=
nil
{
return
err
...
...
This diff is collapsed.
Click to expand it.
provider/ultradns/ultradns_test.go
+
1
-
1
View file @
6c5cc736
...
...
@@ -736,7 +736,7 @@ func TestUltraDNSProvider_DomainFilterZonesMocked(t *testing.T) {
zones
,
err
:=
provider
.
Zones
(
context
.
Background
())
assert
.
Nil
(
t
,
err
)
assert
.
Equal
(
t
,
reflect
.
DeepEqual
(
expected
,
zones
),
true
)
A
ccountName
=
"teamrest"
a
ccountName
=
"teamrest"
// When AccountName is set
provider
=
&
UltraDNSProvider
{
client
:
udnssdk
.
Client
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help