@@ -18,16 +18,17 @@ limitations under the License.
1818package client
1919
2020import (
21+ "context"
2122 "net"
2223 "net/http"
2324 "os"
2425 "time"
2526
26- "github.com/gophercloud/gophercloud"
27- "github.com/gophercloud/gophercloud/openstack"
28- "github.com/gophercloud/gophercloud/openstack/dns/v2/recordsets"
29- "github.com/gophercloud/gophercloud/openstack/dns/v2/zones"
30- "github.com/gophercloud/gophercloud/pagination"
27+ "github.com/gophercloud/gophercloud/v2 "
28+ "github.com/gophercloud/gophercloud/v2/ openstack"
29+ "github.com/gophercloud/gophercloud/v2/ openstack/dns/v2/recordsets"
30+ "github.com/gophercloud/gophercloud/v2/ openstack/dns/v2/zones"
31+ "github.com/gophercloud/gophercloud/v2/ pagination"
3132 log "github.com/sirupsen/logrus"
3233
3334 "sigs.k8s.io/external-dns/pkg/tlsutils"
@@ -36,19 +37,19 @@ import (
3637// interface between provider and OpenStack DNS API
3738type DesignateClientInterface interface {
3839 // ForEachZone calls handler for each zone managed by the Designate
39- ForEachZone (handler func (zone * zones.Zone ) error ) error
40+ ForEachZone (ctx context. Context , handler func (zone * zones.Zone ) error ) error
4041
4142 // ForEachRecordSet calls handler for each recordset in the given DNS zone
42- ForEachRecordSet (zoneID string , handler func (recordSet * recordsets.RecordSet ) error ) error
43+ ForEachRecordSet (ctx context. Context , zoneID string , handler func (recordSet * recordsets.RecordSet ) error ) error
4344
4445 // CreateRecordSet creates recordset in the given DNS zone
45- CreateRecordSet (zoneID string , opts recordsets.CreateOpts ) (string , error )
46+ CreateRecordSet (ctx context. Context , zoneID string , opts recordsets.CreateOpts ) (string , error )
4647
4748 // UpdateRecordSet updates recordset in the given DNS zone
48- UpdateRecordSet (zoneID , recordSetID string , opts recordsets.UpdateOpts ) error
49+ UpdateRecordSet (ctx context. Context , zoneID , recordSetID string , opts recordsets.UpdateOpts ) error
4950
5051 // DeleteRecordSet deletes recordset in the given DNS zone
51- DeleteRecordSet (zoneID , recordSetID string ) error
52+ DeleteRecordSet (ctx context. Context , zoneID , recordSetID string ) error
5253}
5354
5455// implementation of the DesignateClientInterface
@@ -126,7 +127,8 @@ func createDesignateServiceClient() (*gophercloud.ServiceClient, error) {
126127 }
127128 authProvider .HTTPClient .Transport = transport
128129
129- if err = openstack .Authenticate (authProvider , opts ); err != nil {
130+ ctx := context .Background ()
131+ if err = openstack .Authenticate (ctx , authProvider , opts ); err != nil {
130132 return nil , err
131133 }
132134
@@ -143,10 +145,10 @@ func createDesignateServiceClient() (*gophercloud.ServiceClient, error) {
143145}
144146
145147// ForEachZone calls handler for each zone managed by the Designate
146- func (c designateClient ) ForEachZone (handler func (zone * zones.Zone ) error ) error {
148+ func (c designateClient ) ForEachZone (ctx context. Context , handler func (zone * zones.Zone ) error ) error {
147149 pager := zones .List (c .serviceClient , zones.ListOpts {})
148- return pager .EachPage (
149- func (page pagination.Page ) (bool , error ) {
150+ return pager .EachPage (ctx ,
151+ func (ctx context. Context , page pagination.Page ) (bool , error ) {
150152 list , err := zones .ExtractZones (page )
151153 if err != nil {
152154 return false , err
@@ -163,10 +165,10 @@ func (c designateClient) ForEachZone(handler func(zone *zones.Zone) error) error
163165}
164166
165167// ForEachRecordSet calls handler for each recordset in the given DNS zone
166- func (c designateClient ) ForEachRecordSet (zoneID string , handler func (recordSet * recordsets.RecordSet ) error ) error {
168+ func (c designateClient ) ForEachRecordSet (ctx context. Context , zoneID string , handler func (recordSet * recordsets.RecordSet ) error ) error {
167169 pager := recordsets .ListByZone (c .serviceClient , zoneID , recordsets.ListOpts {})
168- return pager .EachPage (
169- func (page pagination.Page ) (bool , error ) {
170+ return pager .EachPage (ctx ,
171+ func (ctx context. Context , page pagination.Page ) (bool , error ) {
170172 list , err := recordsets .ExtractRecordSets (page )
171173 if err != nil {
172174 return false , err
@@ -183,21 +185,21 @@ func (c designateClient) ForEachRecordSet(zoneID string, handler func(recordSet
183185}
184186
185187// CreateRecordSet creates recordset in the given DNS zone
186- func (c designateClient ) CreateRecordSet (zoneID string , opts recordsets.CreateOpts ) (string , error ) {
187- r , err := recordsets .Create (c .serviceClient , zoneID , opts ).Extract ()
188+ func (c designateClient ) CreateRecordSet (ctx context. Context , zoneID string , opts recordsets.CreateOpts ) (string , error ) {
189+ r , err := recordsets .Create (ctx , c .serviceClient , zoneID , opts ).Extract ()
188190 if err != nil {
189191 return "" , err
190192 }
191193 return r .ID , nil
192194}
193195
194196// UpdateRecordSet updates recordset in the given DNS zone
195- func (c designateClient ) UpdateRecordSet (zoneID , recordSetID string , opts recordsets.UpdateOpts ) error {
196- _ , err := recordsets .Update (c .serviceClient , zoneID , recordSetID , opts ).Extract ()
197+ func (c designateClient ) UpdateRecordSet (ctx context. Context , zoneID , recordSetID string , opts recordsets.UpdateOpts ) error {
198+ _ , err := recordsets .Update (ctx , c .serviceClient , zoneID , recordSetID , opts ).Extract ()
197199 return err
198200}
199201
200202// DeleteRecordSet deletes recordset in the given DNS zone
201- func (c designateClient ) DeleteRecordSet (zoneID , recordSetID string ) error {
202- return recordsets .Delete (c .serviceClient , zoneID , recordSetID ).ExtractErr ()
203+ func (c designateClient ) DeleteRecordSet (ctx context. Context , zoneID , recordSetID string ) error {
204+ return recordsets .Delete (ctx , c .serviceClient , zoneID , recordSetID ).ExtractErr ()
203205}
0 commit comments