Skip to content

Commit 4c9e8c8

Browse files
committed
chore(dns): migrate to new SDK structure
relates to STACKITCLI-362
1 parent 23b6292 commit 4c9e8c8

31 files changed

Lines changed: 345 additions & 351 deletions

docs/stackit_dns_record-set_create.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ stackit dns record-set create [flags]
2424
-h, --help Help for "stackit dns record-set create"
2525
--name string Name of the record, should be compliant with RFC1035, Section 2.3.4
2626
--record strings Records belonging to the record set
27-
--ttl int Time to live, if not provided defaults to the zone's default TTL
28-
--type string Record type, one of ["A" "AAAA" "SOA" "CNAME" "NS" "MX" "TXT" "SRV" "PTR" "ALIAS" "DNAME" "CAA" "DNSKEY" "DS" "LOC" "NAPTR" "SSHFP" "TLSA" "URI" "CERT" "SVCB" "TYPE" "CSYNC" "HINFO" "HTTPS"] (default "A")
27+
--ttl int32 Time to live, if not provided defaults to the zone's default TTL
28+
--type string Record type, one of ["A" "AAAA" "SOA" "CNAME" "NS" "MX" "TXT" "SRV" "PTR" "ALIAS" "DNAME" "CAA" "DNSKEY" "DS" "LOC" "NAPTR" "SSHFP" "TLSA" "URI" "CERT" "SVCB" "TYPE" "CSYNC" "HINFO" "HTTPS" "unknown_default_open_api"] (default "A")
2929
--zone-id string Zone ID
3030
```
3131

docs/stackit_dns_record-set_update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ stackit dns record-set update RECORD_SET_ID [flags]
2424
-h, --help Help for "stackit dns record-set update"
2525
--name string Name of the record, should be compliant with RFC1035, Section 2.3.4
2626
--record strings Records belonging to the record set. If this flag is used, records already created that aren't set when running the command will be deleted
27-
--ttl int Time to live, if not provided defaults to the zone's default TTL
27+
--ttl int32 Time to live, if not provided defaults to the zone's default TTL
2828
--zone-id string Zone ID
2929
```
3030

docs/stackit_dns_zone_create.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ stackit dns zone create [flags]
2525
```
2626
--acl string Access control list
2727
--contact-email string Contact email for the zone
28-
--default-ttl int Default time to live (default 1000)
28+
--default-ttl int32 Default time to live (default 1000)
2929
--description string Description of the zone
3030
--dns-name string Fully qualified domain name of the DNS zone
31-
--expire-time int Expire time
31+
--expire-time int32 Expire time
3232
-h, --help Help for "stackit dns zone create"
3333
--is-reverse-zone Is reverse zone
3434
--name string User given name of the zone
35-
--negative-cache int Negative cache
35+
--negative-cache int32 Negative cache
3636
--primary strings Primary name server for secondary zone
37-
--refresh-time int Refresh time
38-
--retry-time int Retry time
39-
--type string Zone type, one of: ["primary" "secondary"]
37+
--refresh-time int32 Refresh time
38+
--retry-time int32 Retry time
39+
--type string Zone type, one of: ["primary" "secondary" "unknown_default_open_api"]
4040
```
4141

4242
### Options inherited from parent commands

docs/stackit_dns_zone_update.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ stackit dns zone update ZONE_ID [flags]
2222
```
2323
--acl string Access control list
2424
--contact-email string Contact email for the zone
25-
--default-ttl int Default time to live (default 1000)
25+
--default-ttl int32 Default time to live (default 1000)
2626
--description string Description of the zone
27-
--expire-time int Expire time
27+
--expire-time int32 Expire time
2828
-h, --help Help for "stackit dns zone update"
2929
--name string User given name of the zone
30-
--negative-cache int Negative cache
30+
--negative-cache int32 Negative cache
3131
--primary strings Primary name server for secondary zone
32-
--refresh-time int Refresh time
33-
--retry-time int Retry time
32+
--refresh-time int32 Refresh time
33+
--retry-time int32 Retry time
3434
```
3535

3636
### Options inherited from parent commands

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2
2020
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0
2121
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0
22-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6
22+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0
2323
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3
2424
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0
2525
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0
@@ -36,8 +36,8 @@ require (
3636
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
3737
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7
3838
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0
39-
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
4039
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0
40+
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
4141
github.com/zalando/go-keyring v0.2.6
4242
golang.org/x/mod v0.34.0
4343
golang.org/x/oauth2 v0.35.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,8 @@ github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0 h1:HxPgBu0
602602
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0/go.mod h1:uYI9pHAA2g84jJN25ejFUxa0/JtfpPZqMDkctQ1BzJk=
603603
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0 h1:Wqxx0PDTL2F5gqI5jjznuJY0TdqECltjA0aa/rHY63U=
604604
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
605-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6 h1:GBRb49x5Nax/oQQaaf2F3kKwv8DQQOL0TQOC0C/v/Ew=
606-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6/go.mod h1:IX9iL3MigDZUmzwswTJMfYvyi118KAHrFMfjJUy5NYk=
605+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 h1:ZVkptfVCAqpaPWkE+WIopM9XdzqgbVcwmX5L1jZqqx8=
606+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U=
607607
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3 h1:TxChb2qbO82JiQEBYClSSD5HZxqKeKJ6dIvkEUCJmbs=
608608
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3/go.mod h1:KVWvQHb7CQLD9DzA4Np3WmakiCCsrHaCXvFEnOQ7nPk=
609609
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 h1:VZBneGprCmHqckcSMPs3puBlK8rBpLMtYKmBktwdoVE=
@@ -654,10 +654,10 @@ github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZ
654654
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
655655
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE5uRlZ/y1c1GUxjV1DDLu5QEBD8=
656656
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0/go.mod h1:KhVYCR58wETqdI7Quwhe3OR3BhB2T/b7DzaMsfDnr8g=
657-
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 h1:LMgbzhPunuelsIsfyEj/5O/aYfNcg/eGHsnZ7AZOhYg=
658-
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0/go.mod h1:toIjQk1dhxdUFVyCWJJja0w/0nFpDid8MWX0ukQfvfo=
659657
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU=
660658
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
659+
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 h1:LMgbzhPunuelsIsfyEj/5O/aYfNcg/eGHsnZ7AZOhYg=
660+
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0/go.mod h1:toIjQk1dhxdUFVyCWJJja0w/0nFpDid8MWX0ukQfvfo=
661661
github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=
662662
github.com/stbenjam/no-sprintf-host-port v0.3.1/go.mod h1:ODbZesTCHMVKthBHskvUUexdcNHAQRXk9NpSsL8p/HQ=
663663
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

internal/cmd/dns/record-set/create/create.go

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
7+
"github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait"
88

99
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1010

1111
"github.com/spf13/cobra"
12-
"github.com/stackitcloud/stackit-sdk-go/services/dns"
12+
dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
1313

1414
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -20,7 +20,6 @@ import (
2020
"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
2121
dnsUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/utils"
2222
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
23-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
2423
)
2524

2625
const (
@@ -41,8 +40,8 @@ type inputModel struct {
4140
Comment *string
4241
Name *string
4342
Records []string
44-
TTL *int64
45-
Type dns.CreateRecordSetPayloadTypes
43+
TTL *int32
44+
Type dns.CreateRecordSetPayloadType
4645
}
4746

4847
func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -69,7 +68,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6968
return err
7069
}
7170

72-
zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient, model.ProjectId, model.ZoneId)
71+
zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId)
7372
if err != nil {
7473
params.Printer.Debug(print.ErrorLevel, "get zone name: %v", err)
7574
zoneLabel = model.ZoneId
@@ -87,12 +86,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
8786
if err != nil {
8887
return fmt.Errorf("create DNS record set: %w", err)
8988
}
90-
recordSetId := *resp.Rrset.Id
89+
recordSetId := resp.Rrset.Id
9190

9291
// Wait for async operation, if async mode not enabled
9392
if !model.Async {
9493
err := spinner.Run(params.Printer, "Creating record set", func() error {
95-
_, err = wait.CreateRecordSetWaitHandler(ctx, apiClient, model.ProjectId, model.ZoneId, recordSetId).WaitWithContext(ctx)
94+
_, err = wait.CreateRecordSetWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, recordSetId).WaitWithContext(ctx)
9695
return err
9796
})
9897
if err != nil {
@@ -109,14 +108,14 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
109108

110109
func configureFlags(cmd *cobra.Command) {
111110
var typeFlagOptions []string
112-
for _, val := range dns.AllowedCreateRecordSetPayloadTypesEnumValues {
111+
for _, val := range dns.AllowedCreateRecordSetPayloadTypeEnumValues {
113112
typeFlagOptions = append(typeFlagOptions, string(val))
114113
}
115114

116115
cmd.Flags().Var(flags.UUIDFlag(), zoneIdFlag, "Zone ID")
117116
cmd.Flags().String(commentFlag, "", "User comment")
118117
cmd.Flags().String(nameFlag, "", "Name of the record, should be compliant with RFC1035, Section 2.3.4")
119-
cmd.Flags().Int64(ttlFlag, 0, "Time to live, if not provided defaults to the zone's default TTL")
118+
cmd.Flags().Int32(ttlFlag, 0, "Time to live, if not provided defaults to the zone's default TTL")
120119
cmd.Flags().StringSlice(recordFlag, []string{}, "Records belonging to the record set")
121120
cmd.Flags().Var(flags.EnumFlag(false, string(defaultType), typeFlagOptions...), typeFlag, fmt.Sprintf("Record type, one of %q", typeFlagOptions))
122121

@@ -138,8 +137,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
138137
Comment: flags.FlagToStringPointer(p, cmd, commentFlag),
139138
Name: flags.FlagToStringPointer(p, cmd, nameFlag),
140139
Records: flags.FlagToStringSliceValue(p, cmd, recordFlag),
141-
TTL: flags.FlagToInt64Pointer(p, cmd, ttlFlag),
142-
Type: dns.CreateRecordSetPayloadTypes(recordType),
140+
TTL: flags.FlagToInt32Pointer(p, cmd, ttlFlag),
141+
Type: dns.CreateRecordSetPayloadType(recordType),
143142
}
144143

145144
if model.Type == txtType {
@@ -163,16 +162,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
163162
func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClient) dns.ApiCreateRecordSetRequest {
164163
records := make([]dns.RecordPayload, 0)
165164
for _, r := range model.Records {
166-
records = append(records, dns.RecordPayload{Content: utils.Ptr(r)})
165+
records = append(records, dns.RecordPayload{Content: r})
167166
}
168167

169-
req := apiClient.CreateRecordSet(ctx, model.ProjectId, model.ZoneId)
168+
req := apiClient.DefaultAPI.CreateRecordSet(ctx, model.ProjectId, model.ZoneId)
170169
req = req.CreateRecordSetPayload(dns.CreateRecordSetPayload{
171170
Comment: model.Comment,
172-
Name: model.Name,
173-
Records: &records,
171+
Name: *model.Name,
172+
Records: records,
174173
Ttl: model.TTL,
175-
Type: &model.Type,
174+
Type: model.Type,
176175
})
177176
return req
178177
}
@@ -186,7 +185,7 @@ func outputResult(p *print.Printer, model *inputModel, zoneLabel string, resp *d
186185
if model.Async {
187186
operationState = "Triggered creation of"
188187
}
189-
p.Outputf("%s record set for zone %s. Record set ID: %s\n", operationState, zoneLabel, utils.PtrString(resp.Rrset.Id))
188+
p.Outputf("%s record set for zone %s. Record set ID: %s\n", operationState, zoneLabel, resp.Rrset.Id)
190189
return nil
191190
})
192191
}

internal/cmd/dns/record-set/create/create_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/google/go-cmp/cmp"
1010
"github.com/google/go-cmp/cmp/cmpopts"
1111
"github.com/google/uuid"
12-
"github.com/stackitcloud/stackit-sdk-go/services/dns"
12+
dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
1313

1414
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
@@ -20,7 +20,7 @@ import (
2020
type testCtxKey struct{}
2121

2222
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
23-
var testClient = &dns.APIClient{}
23+
var testClient = &dns.APIClient{DefaultAPI: &dns.DefaultAPIService{}}
2424
var testProjectId = uuid.NewString()
2525
var testZoneId = uuid.NewString()
2626

@@ -56,7 +56,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5656
Name: utils.Ptr("example.com"),
5757
Comment: utils.Ptr("comment"),
5858
Records: []string{"1.1.1.1"},
59-
TTL: utils.Ptr(int64(3600)),
59+
TTL: utils.Ptr(int32(3600)),
6060
Type: "SOA",
6161
}
6262
for _, mod := range mods {
@@ -66,15 +66,15 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6666
}
6767

6868
func fixtureRequest(mods ...func(request *dns.ApiCreateRecordSetRequest)) dns.ApiCreateRecordSetRequest {
69-
request := testClient.CreateRecordSet(testCtx, testProjectId, testZoneId)
69+
request := testClient.DefaultAPI.CreateRecordSet(testCtx, testProjectId, testZoneId)
7070
request = request.CreateRecordSetPayload(dns.CreateRecordSetPayload{
71-
Name: utils.Ptr("example.com"),
71+
Name: "example.com",
7272
Comment: utils.Ptr("comment"),
73-
Records: &[]dns.RecordPayload{
74-
{Content: utils.Ptr("1.1.1.1")},
73+
Records: []dns.RecordPayload{
74+
{Content: "1.1.1.1"},
7575
},
76-
Ttl: utils.Ptr(int64(3600)),
77-
Type: dns.CREATERECORDSETPAYLOADTYPE_SOA.Ptr(),
76+
Ttl: utils.Ptr(int32(3600)),
77+
Type: dns.CREATERECORDSETPAYLOADTYPE_SOA,
7878
})
7979
for _, mod := range mods {
8080
mod(&request)
@@ -142,7 +142,7 @@ func TestParseInput(t *testing.T) {
142142
Name: utils.Ptr(""),
143143
Comment: utils.Ptr(""),
144144
Records: []string{"1.1.1.1"},
145-
TTL: utils.Ptr(int64(0)),
145+
TTL: utils.Ptr(int32(0)),
146146
Type: defaultType,
147147
},
148148
},
@@ -297,13 +297,13 @@ func TestBuildRequest(t *testing.T) {
297297
Records: []string{"1.1.1.1"},
298298
Type: defaultType,
299299
},
300-
expectedRequest: testClient.CreateRecordSet(testCtx, testProjectId, testZoneId).
300+
expectedRequest: testClient.DefaultAPI.CreateRecordSet(testCtx, testProjectId, testZoneId).
301301
CreateRecordSetPayload(dns.CreateRecordSetPayload{
302-
Name: utils.Ptr("example.com"),
303-
Records: &[]dns.RecordPayload{
304-
{Content: utils.Ptr("1.1.1.1")},
302+
Name: "example.com",
303+
Records: []dns.RecordPayload{
304+
{Content: "1.1.1.1"},
305305
},
306-
Type: utils.Ptr(defaultType),
306+
Type: defaultType,
307307
}),
308308
},
309309
}
@@ -313,7 +313,7 @@ func TestBuildRequest(t *testing.T) {
313313
request := buildRequest(testCtx, tt.model, testClient)
314314

315315
diff := cmp.Diff(request, tt.expectedRequest,
316-
cmp.AllowUnexported(tt.expectedRequest),
316+
cmp.AllowUnexported(tt.expectedRequest, dns.DefaultAPIService{}),
317317
cmpopts.EquateComparable(testCtx),
318318
)
319319
if diff != "" {
@@ -343,7 +343,7 @@ func TestOutputResult(t *testing.T) {
343343
name: "only record set as argument",
344344
args: args{
345345
model: fixtureInputModel(),
346-
resp: &dns.RecordSetResponse{Rrset: &dns.RecordSet{}},
346+
resp: &dns.RecordSetResponse{Rrset: dns.RecordSet{}},
347347
},
348348
wantErr: false,
349349
},

internal/cmd/dns/record-set/delete/delete.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1919

2020
"github.com/spf13/cobra"
21-
"github.com/stackitcloud/stackit-sdk-go/services/dns"
22-
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
21+
dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
22+
"github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait"
2323
)
2424

2525
const (
@@ -58,13 +58,13 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5858
return err
5959
}
6060

61-
zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient, model.ProjectId, model.ZoneId)
61+
zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId)
6262
if err != nil {
6363
params.Printer.Debug(print.ErrorLevel, "get zone name: %v", err)
6464
zoneLabel = model.ZoneId
6565
}
6666

67-
recordSetLabel, err := dnsUtils.GetRecordSetName(ctx, apiClient, model.ProjectId, model.ZoneId, model.RecordSetId)
67+
recordSetLabel, err := dnsUtils.GetRecordSetName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, model.RecordSetId)
6868
if err != nil {
6969
params.Printer.Debug(print.ErrorLevel, "get record set name: %v", err)
7070
recordSetLabel = model.RecordSetId
@@ -89,7 +89,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
8989
// Wait for async operation, if async mode not enabled
9090
if !model.Async {
9191
err := spinner.Run(params.Printer, "Deleting record set", func() error {
92-
_, err = wait.DeleteRecordSetWaitHandler(ctx, apiClient, model.ProjectId, model.ZoneId, model.RecordSetId).WaitWithContext(ctx)
92+
_, err = wait.DeleteRecordSetWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, model.RecordSetId).WaitWithContext(ctx)
9393
return err
9494
})
9595
if err != nil {
@@ -135,6 +135,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
135135
}
136136

137137
func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClient) dns.ApiDeleteRecordSetRequest {
138-
req := apiClient.DeleteRecordSet(ctx, model.ProjectId, model.ZoneId, model.RecordSetId)
138+
req := apiClient.DefaultAPI.DeleteRecordSet(ctx, model.ProjectId, model.ZoneId, model.RecordSetId)
139139
return req
140140
}

internal/cmd/dns/record-set/delete/delete_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/google/go-cmp/cmp/cmpopts"
1212
"github.com/google/uuid"
13-
"github.com/stackitcloud/stackit-sdk-go/services/dns"
13+
dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
1414
)
1515

1616
type testCtxKey struct{}
1717

1818
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
19-
var testClient = &dns.APIClient{}
19+
var testClient = &dns.APIClient{DefaultAPI: &dns.DefaultAPIService{}}
2020
var testProjectId = uuid.NewString()
2121
var testZoneId = uuid.NewString()
2222
var testRecordSetId = uuid.NewString()
@@ -58,7 +58,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5858
}
5959

6060
func fixtureRequest(mods ...func(request *dns.ApiDeleteRecordSetRequest)) dns.ApiDeleteRecordSetRequest {
61-
request := testClient.DeleteRecordSet(testCtx, testProjectId, testZoneId, testRecordSetId)
61+
request := testClient.DefaultAPI.DeleteRecordSet(testCtx, testProjectId, testZoneId, testRecordSetId)
6262
for _, mod := range mods {
6363
mod(&request)
6464
}
@@ -187,7 +187,7 @@ func TestBuildRequest(t *testing.T) {
187187
request := buildRequest(testCtx, tt.model, testClient)
188188

189189
diff := cmp.Diff(request, tt.expectedRequest,
190-
cmp.AllowUnexported(tt.expectedRequest),
190+
cmp.AllowUnexported(tt.expectedRequest, dns.DefaultAPIService{}),
191191
cmpopts.EquateComparable(testCtx),
192192
)
193193
if diff != "" {

0 commit comments

Comments
 (0)