Skip to content

Commit 8405cc8

Browse files
marceljkmarceljk
committed
adjust waiters
1 parent 1304cfd commit 8405cc8

File tree

34 files changed

+609
-499
lines changed

34 files changed

+609
-499
lines changed

‎services/alb/wait/wait.go‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ import (
1313
)
1414

1515
const (
16+
// Deprecated: StatusUnspecified is deprecated and will be removed after 9th November 2025. Use [alb.LOADBALANCERSTATUS_UNSPECIFIED] instead.
1617
StatusUnspecified = "STATUS_UNSPECIFIED"
17-
StatusPending = "STATUS_PENDING"
18-
StatusReady = "STATUS_READY"
19-
StatusError = "STATUS_ERROR"
18+
// Deprecated: StatusPending is deprecated and will be removed after 9th November 2025. Use [alb.LOADBALANCERSTATUS_PENDING] instead.
19+
StatusPending = "STATUS_PENDING"
20+
// Deprecated: StatusReady is deprecated and will be removed after 9th November 2025. Use [alb.LOADBALANCERSTATUS_READY] instead.
21+
StatusReady = "STATUS_READY"
22+
// Deprecated: StatusError is deprecated and will be removed after 9th November 2025. Use [alb.LOADBALANCERSTATUS_ERROR] instead.
23+
StatusError = "STATUS_ERROR"
24+
// Deprecated: StatusTerminating is deprecated and will be removed after 9th November 2025. Use [alb.LOADBALANCERSTATUS_TERMINATING] instead.
2025
StatusTerminating = "STATUS_TERMINATING"
2126
)
2227

@@ -32,11 +37,11 @@ func CreateOrUpdateLoadbalancerWaitHandler(ctx context.Context, client APIClient
3237
}
3338
if response.HasStatus() {
3439
switch *response.Status {
35-
case StatusPending:
40+
case alb.LOADBALANCERSTATUS_PENDING:
3641
return false, nil, nil
37-
case StatusUnspecified:
42+
case alb.LOADBALANCERSTATUS_UNSPECIFIED:
3843
return false, nil, nil
39-
case StatusError:
44+
case alb.LOADBALANCERSTATUS_ERROR:
4045
return true, response, fmt.Errorf("loadbalancer in error: %s", *response.Status)
4146
default:
4247
return true, response, nil

‎services/alb/wait/wait_test.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -50,47 +50,47 @@ func TestCreateOrUpdateLoadbalancerWaitHandler(t *testing.T) {
5050
{
5151
"create succeeded immediately",
5252
[]response{
53-
{&alb.LoadBalancer{Status: alb.PtrString(StatusReady)}, nil},
53+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_READY)}, nil},
5454
},
55-
&alb.LoadBalancer{Status: utils.Ptr(StatusReady)},
55+
&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_READY)},
5656
false,
5757
},
5858
{
5959
"create succeeded delayed",
6060
[]response{
61-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
62-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
63-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
64-
{&alb.LoadBalancer{Status: alb.PtrString(StatusReady)}, nil},
61+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
62+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
63+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
64+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_READY)}, nil},
6565
},
66-
&alb.LoadBalancer{Status: utils.Ptr(StatusReady)},
66+
&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_READY)},
6767
false,
6868
},
6969
{
7070
"create failed delayed",
7171
[]response{
72-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
73-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
74-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
75-
{&alb.LoadBalancer{Status: alb.PtrString(StatusError)}, nil},
72+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
73+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
74+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
75+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_ERROR)}, nil},
7676
},
77-
&alb.LoadBalancer{Status: utils.Ptr(StatusError)},
77+
&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_ERROR)},
7878
true,
7979
},
8080
{
8181
"timeout",
8282
[]response{
83-
{&alb.LoadBalancer{Status: alb.PtrString(StatusPending)}, nil},
83+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
8484
},
8585
nil,
8686
true,
8787
},
8888
{
8989
"broken state",
9090
[]response{
91-
{&alb.LoadBalancer{Status: alb.PtrString("bogus")}, nil},
91+
{&alb.LoadBalancer{Status: alb.LoadBalancerGetStatusAttributeType(utils.Ptr("bogus"))}, nil},
9292
},
93-
&alb.LoadBalancer{Status: alb.PtrString("bogus")},
93+
&alb.LoadBalancer{Status: alb.LoadBalancerGetStatusAttributeType(utils.Ptr("bogus"))},
9494
false,
9595
},
9696
// no special update tests needed as the states are the same
@@ -133,9 +133,9 @@ func TestDeleteLoadbalancerWaitHandler(t *testing.T) {
133133
{
134134
"Delete with '404' delayed",
135135
[]response{
136-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
137-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
138-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
136+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
137+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
138+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
139139
{nil, oapierror.NewError(http.StatusNotFound, "not found")},
140140
},
141141
false,
@@ -150,30 +150,30 @@ func TestDeleteLoadbalancerWaitHandler(t *testing.T) {
150150
{
151151
"Delete with 'gone' delayed",
152152
[]response{
153-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
154-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
155-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
153+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
154+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
155+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
156156
{nil, oapierror.NewError(http.StatusGone, "not found")},
157157
},
158158
false,
159159
},
160160
{
161161
"Delete with error delayed",
162162
[]response{
163-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
164-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
165-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
166-
{&alb.LoadBalancer{Status: utils.Ptr(string(StatusError))}, oapierror.NewError(http.StatusInternalServerError, "kapow")},
163+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
164+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
165+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
166+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_ERROR)}, oapierror.NewError(http.StatusInternalServerError, "kapow")},
167167
},
168168
true,
169169
},
170170
{
171171
"Cannot delete",
172172
[]response{
173-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
174-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
175-
{&alb.LoadBalancer{Status: utils.Ptr(StatusPending)}, nil},
176-
{&alb.LoadBalancer{Status: utils.Ptr(string(StatusError))}, oapierror.NewError(http.StatusOK, "ok")},
173+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
174+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
175+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_PENDING)}, nil},
176+
{&alb.LoadBalancer{Status: utils.Ptr(alb.LOADBALANCERSTATUS_ERROR)}, oapierror.NewError(http.StatusOK, "ok")},
177177
},
178178
true,
179179
},

‎services/cdn/wait/wait.go‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ import (
1313
)
1414

1515
const (
16+
// Deprecated: DistributionStatusCreating is deprecated and will be removed after 9th November 2025. Use [cdn.DISTRIBUTIONSTATUS_CREATING] instead.
1617
DistributionStatusCreating = "CREATING"
17-
DistributionStatusActive = "ACTIVE"
18+
// Deprecated: DistributionStatusActive is deprecated and will be removed after 9th November 2025. Use [cdn.DISTRIBUTIONSTATUS_ACTIVE] instead.
19+
DistributionStatusActive = "ACTIVE"
20+
// Deprecated: DistributionStatusUpdating is deprecated and will be removed after 9th November 2025. Use [cdn.DISTRIBUTIONSTATUS_UPDATING] instead.
1821
DistributionStatusUpdating = "UPDATING"
22+
// Deprecated: DistributionStatusDeleting is deprecated and will be removed after 9th November 2025. Use [cdn.DISTRIBUTIONSTATUS_DELETING] instead.
1923
DistributionStatusDeleting = "DELETING"
20-
DistributionStatusError = "ERROR"
24+
// Deprecated: DistributionStatusError is deprecated and will be removed after 9th November 2025. Use [cdn.DISTRIBUTIONSTATUS_ERROR] instead.
25+
DistributionStatusError = "ERROR"
2126
)
2227

2328
// Interfaces needed for tests
@@ -40,13 +45,13 @@ func CreateDistributionPoolWaitHandler(ctx context.Context, api APIClientInterfa
4045
}
4146
if *distribution.Distribution.Id == distributionId {
4247
switch *distribution.Distribution.Status {
43-
case DistributionStatusActive:
48+
case cdn.DISTRIBUTIONSTATUS_ACTIVE:
4449
return true, distribution, nil
45-
case DistributionStatusCreating, DistributionStatusUpdating:
50+
case cdn.DISTRIBUTIONSTATUS_CREATING, cdn.DISTRIBUTIONSTATUS_UPDATING:
4651
return false, nil, nil
47-
case DistributionStatusDeleting:
52+
case cdn.DISTRIBUTIONSTATUS_DELETING:
4853
return true, nil, fmt.Errorf("creating CDN distribution failed")
49-
case DistributionStatusError:
54+
case cdn.DISTRIBUTIONSTATUS_ERROR:
5055
return true, nil, fmt.Errorf("creating CDN distribution failed")
5156
default:
5257
return true, nil, fmt.Errorf("CDNDistributionWaitHandler: unexpected status %s", *distribution.Distribution.Status)
@@ -72,13 +77,13 @@ func UpdateDistributionWaitHandler(ctx context.Context, api APIClientInterface,
7277
}
7378
if *distribution.Distribution.Id == distributionId {
7479
switch *distribution.Distribution.Status {
75-
case DistributionStatusActive:
80+
case cdn.DISTRIBUTIONSTATUS_ACTIVE:
7681
return true, distribution, err
77-
case DistributionStatusUpdating:
82+
case cdn.DISTRIBUTIONSTATUS_UPDATING:
7883
return false, nil, nil
79-
case DistributionStatusDeleting:
84+
case cdn.DISTRIBUTIONSTATUS_DELETING:
8085
return true, nil, fmt.Errorf("updating CDN distribution failed")
81-
case DistributionStatusError:
86+
case cdn.DISTRIBUTIONSTATUS_ERROR:
8287
return true, nil, fmt.Errorf("updating CDN distribution failed")
8388
default:
8489
return true, nil, fmt.Errorf("UpdateDistributionWaitHandler: unexpected status %s", *distribution.Distribution.Status)

‎services/cdn/wait/wait_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ func (m *mockApiClient) GetCustomDomainExecute(_ context.Context, projectId, dis
6565
func TestCreateDistributionWaitHandler(t *testing.T) {
6666
projectId := "test-project-id"
6767
distributionId := "test-distribution-id"
68-
statusActive := DistributionStatusActive
69-
statusUpdating := DistributionStatusUpdating
70-
statusCreating := DistributionStatusCreating
71-
statusError := DistributionStatusError
72-
statusDeleting := DistributionStatusDeleting
68+
statusActive := cdn.DISTRIBUTIONSTATUS_ACTIVE
69+
statusUpdating := cdn.DISTRIBUTIONSTATUS_UPDATING
70+
statusCreating := cdn.DISTRIBUTIONSTATUS_CREATING
71+
statusError := cdn.DISTRIBUTIONSTATUS_ERROR
72+
statusDeleting := cdn.DISTRIBUTIONSTATUS_DELETING
7373

7474
mockClientFixture := func(patches ...func(tc *mockApiClient)) *mockApiClient {
7575
client := &mockApiClient{
@@ -180,11 +180,11 @@ func TestCreateDistributionWaitHandler(t *testing.T) {
180180
func TestDeleteDistributionWaitHandler(t *testing.T) {
181181
projectId := "test-project-id"
182182
distributionId := "test-distribution-id"
183-
statusActive := DistributionStatusActive
184-
statusUpdating := DistributionStatusUpdating
185-
statusCreating := DistributionStatusCreating
186-
statusError := DistributionStatusError
187-
statusDeleting := DistributionStatusDeleting
183+
statusActive := cdn.DISTRIBUTIONSTATUS_ACTIVE
184+
statusUpdating := cdn.DISTRIBUTIONSTATUS_UPDATING
185+
statusCreating := cdn.DISTRIBUTIONSTATUS_CREATING
186+
statusError := cdn.DISTRIBUTIONSTATUS_ERROR
187+
statusDeleting := cdn.DISTRIBUTIONSTATUS_DELETING
188188

189189
mockClientFixture := func(patches ...func(tc *mockApiClient)) *mockApiClient {
190190
client := &mockApiClient{
@@ -310,11 +310,11 @@ func TestDeleteDistributionWaitHandler(t *testing.T) {
310310
func TestUpdateDistributionWaitHandler(t *testing.T) {
311311
projectId := "test-project-id"
312312
distributionId := "test-distribution-id"
313-
statusActive := DistributionStatusActive
314-
statusUpdating := DistributionStatusUpdating
315-
statusCreating := DistributionStatusCreating
316-
statusError := DistributionStatusError
317-
statusDeleting := DistributionStatusDeleting
313+
statusActive := cdn.DISTRIBUTIONSTATUS_ACTIVE
314+
statusUpdating := cdn.DISTRIBUTIONSTATUS_UPDATING
315+
statusCreating := cdn.DISTRIBUTIONSTATUS_CREATING
316+
statusError := cdn.DISTRIBUTIONSTATUS_ERROR
317+
statusDeleting := cdn.DISTRIBUTIONSTATUS_DELETING
318318

319319
mockClientFixture := func(patches ...func(tc *mockApiClient)) *mockApiClient {
320320
client := &mockApiClient{

‎services/dns/wait/wait.go‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@ import (
1010
)
1111

1212
const (
13+
// Deprecated: CreateSuccess is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_CREATE_SUCCEEDED] or [dns.RECORDSETSTATE_CREATE_SUCCEEDED] instead.
1314
CreateSuccess = "CREATE_SUCCEEDED"
14-
CreateFail = "CREATE_FAILED"
15+
// Deprecated: CreateFail is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_CREATE_FAILED] or [dns.RECORDSETSTATE_CREATE_FAILED] instead.
16+
CreateFail = "CREATE_FAILED"
17+
// Deprecated: UpdateSuccess is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_UPDATE_SUCCEEDED] or [dns.RECORDSETSTATE_UPDATE_SUCCEEDED] instead.
1518
UpdateSuccess = "UPDATE_SUCCEEDED"
16-
UpdateFail = "UPDATE_FAILED"
19+
// Deprecated: UpdateSuccess is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_UPDATE_FAILED] or [dns.RECORDSETSTATE_UPDATE_FAILED] instead.
20+
UpdateFail = "UPDATE_FAILED"
21+
// Deprecated: UpdateSuccess is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_DELETE_SUCCEEDED] or [dns.RECORDSETSTATE_DELETE_SUCCEEDED] instead.
1722
DeleteSuccess = "DELETE_SUCCEEDED"
18-
DeleteFail = "DELETE_FAILED"
23+
// Deprecated: UpdateSuccess is deprecated and will be removed after 9th November 2025. Use [dns.ZONESTATE_DELETE_FAILED] or [dns.RECORDSETSTATE_DELETE_FAILED] instead.
24+
DeleteFail = "DELETE_FAILED"
1925
)
2026

2127
// Interfaces needed for tests
@@ -34,10 +40,10 @@ func CreateZoneWaitHandler(ctx context.Context, a APIClientInterface, projectId,
3440
if s.Zone.Id == nil || s.Zone.State == nil {
3541
return false, nil, fmt.Errorf("create failed for instance with id %s. The response is not valid: the id or the state are missing", instanceId)
3642
}
37-
if *s.Zone.Id == instanceId && *s.Zone.State == CreateSuccess {
43+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_CREATE_SUCCEEDED {
3844
return true, s, nil
3945
}
40-
if *s.Zone.Id == instanceId && *s.Zone.State == CreateFail {
46+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_CREATE_FAILED {
4147
return true, s, fmt.Errorf("create failed for zone with id %s", instanceId)
4248
}
4349
return false, nil, nil
@@ -56,10 +62,10 @@ func PartialUpdateZoneWaitHandler(ctx context.Context, a APIClientInterface, pro
5662
if s.Zone.Id == nil || s.Zone.State == nil {
5763
return false, nil, fmt.Errorf("update failed for instance with id %s. The response is not valid: the id or the state are missing", instanceId)
5864
}
59-
if *s.Zone.Id == instanceId && *s.Zone.State == UpdateSuccess {
65+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_UPDATE_SUCCEEDED {
6066
return true, s, nil
6167
}
62-
if *s.Zone.Id == instanceId && *s.Zone.State == UpdateFail {
68+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_UPDATE_FAILED {
6369
return true, s, fmt.Errorf("update failed for zone with id %s", instanceId)
6470
}
6571
return false, nil, nil
@@ -79,10 +85,10 @@ func DeleteZoneWaitHandler(ctx context.Context, a APIClientInterface, projectId,
7985
if s.Zone.Id == nil || s.Zone.State == nil {
8086
return false, nil, fmt.Errorf("delete failed for instance with id %s. The response is not valid: the id or the state are missing", instanceId)
8187
}
82-
if *s.Zone.Id == instanceId && *s.Zone.State == DeleteSuccess {
88+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_DELETE_SUCCEEDED {
8389
return true, s, nil
8490
}
85-
if *s.Zone.Id == instanceId && *s.Zone.State == DeleteFail {
91+
if *s.Zone.Id == instanceId && *s.Zone.State == dns.ZONESTATE_DELETE_FAILED {
8692
return true, s, fmt.Errorf("delete failed for zone with id %s", instanceId)
8793
}
8894
return false, nil, nil
@@ -101,10 +107,10 @@ func CreateRecordSetWaitHandler(ctx context.Context, a APIClientInterface, proje
101107
if s.Rrset.Id == nil || s.Rrset.State == nil {
102108
return false, nil, fmt.Errorf("create failed for record set with id %s. The response is not valid: the id or the state are missing", instanceId)
103109
}
104-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == CreateSuccess {
110+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_CREATE_SUCCEEDED {
105111
return true, s, nil
106112
}
107-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == CreateFail {
113+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_CREATE_FAILED {
108114
return true, s, fmt.Errorf("create failed for record with id %s", rrSetId)
109115
}
110116
return false, nil, nil
@@ -123,10 +129,10 @@ func PartialUpdateRecordSetWaitHandler(ctx context.Context, a APIClientInterface
123129
if s.Rrset.Id == nil || s.Rrset.State == nil {
124130
return false, nil, fmt.Errorf("update failed for record set with id %s. The response is not valid: the id or the state are missing", rrSetId)
125131
}
126-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == UpdateSuccess {
132+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_UPDATE_SUCCEEDED {
127133
return true, s, nil
128134
}
129-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == UpdateFail {
135+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_UPDATE_FAILED {
130136
return true, s, fmt.Errorf("update failed for record with id %s", rrSetId)
131137
}
132138
return false, nil, nil
@@ -146,10 +152,10 @@ func DeleteRecordSetWaitHandler(ctx context.Context, a APIClientInterface, proje
146152
if s.Rrset.Id == nil || s.Rrset.State == nil {
147153
return false, nil, fmt.Errorf("delete failed for record set with id %s. The response is not valid: the id or the state are missing", rrSetId)
148154
}
149-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == DeleteSuccess {
155+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_DELETE_SUCCEEDED {
150156
return true, s, nil
151157
}
152-
if *s.Rrset.Id == rrSetId && *s.Rrset.State == DeleteFail {
158+
if *s.Rrset.Id == rrSetId && *s.Rrset.State == dns.RECORDSETSTATE_DELETE_FAILED {
153159
return true, s, fmt.Errorf("delete failed for record with id %s", rrSetId)
154160
}
155161
return false, nil, nil

0 commit comments

Comments
 (0)