chore(dns): migrate to new SDK structure (#1438)

relates to STACKITCLI-362

Author: GokceGK

docs/stackit_dns_record-set_create.md

@@ -24,7 +24,7 @@ stackit dns record-set create [flags]
   -h, --help             Help for "stackit dns record-set create"
       --name string      Name of the record, should be compliant with RFC1035, Section 2.3.4
       --record strings   Records belonging to the record set
-      --ttl int          Time to live, if not provided defaults to the zone's default TTL
+      --ttl int32        Time to live, if not provided defaults to the zone's default TTL
       --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")
       --zone-id string   Zone ID
 ```

docs/stackit_dns_record-set_update.md

@@ -24,7 +24,7 @@ stackit dns record-set update RECORD_SET_ID [flags]
   -h, --help             Help for "stackit dns record-set update"
       --name string      Name of the record, should be compliant with RFC1035, Section 2.3.4
       --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
-      --ttl int          Time to live, if not provided defaults to the zone's default TTL
+      --ttl int32        Time to live, if not provided defaults to the zone's default TTL
       --zone-id string   Zone ID
 ```
 

docs/stackit_dns_zone_create.md

@@ -25,17 +25,17 @@ stackit dns zone create [flags]
 ```
       --acl string             Access control list
       --contact-email string   Contact email for the zone
-      --default-ttl int        Default time to live (default 1000)
+      --default-ttl int32      Default time to live (default 1000)
       --description string     Description of the zone
       --dns-name string        Fully qualified domain name of the DNS zone
-      --expire-time int        Expire time
+      --expire-time int32      Expire time
   -h, --help                   Help for "stackit dns zone create"
       --is-reverse-zone        Is reverse zone
       --name string            User given name of the zone
-      --negative-cache int     Negative cache
+      --negative-cache int32   Negative cache
       --primary strings        Primary name server for secondary zone
-      --refresh-time int       Refresh time
-      --retry-time int         Retry time
+      --refresh-time int32     Refresh time
+      --retry-time int32       Retry time
       --type string            Zone type, one of: ["primary" "secondary"]
 ```
 

docs/stackit_dns_zone_update.md

@@ -22,15 +22,15 @@ stackit dns zone update ZONE_ID [flags]
 ```
       --acl string             Access control list
       --contact-email string   Contact email for the zone
-      --default-ttl int        Default time to live (default 1000)
+      --default-ttl int32      Default time to live (default 1000)
       --description string     Description of the zone
-      --expire-time int        Expire time
+      --expire-time int32      Expire time
   -h, --help                   Help for "stackit dns zone update"
       --name string            User given name of the zone
-      --negative-cache int     Negative cache
+      --negative-cache int32   Negative cache
       --primary strings        Primary name server for secondary zone
-      --refresh-time int       Refresh time
-      --retry-time int         Retry time
+      --refresh-time int32     Refresh time
+      --retry-time int32       Retry time
 ```
 
 ### Options inherited from parent commands

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2
 	github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0
 	github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0
-	github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6
+	github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0
 	github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3
 	github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0
 	github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0

go.sum

@@ -602,8 +602,8 @@ github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0 h1:HxPgBu0
 github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0/go.mod h1:uYI9pHAA2g84jJN25ejFUxa0/JtfpPZqMDkctQ1BzJk=
 github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0 h1:Wqxx0PDTL2F5gqI5jjznuJY0TdqECltjA0aa/rHY63U=
 github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
-github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6 h1:GBRb49x5Nax/oQQaaf2F3kKwv8DQQOL0TQOC0C/v/Ew=
-github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6/go.mod h1:IX9iL3MigDZUmzwswTJMfYvyi118KAHrFMfjJUy5NYk=
+github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 h1:ZVkptfVCAqpaPWkE+WIopM9XdzqgbVcwmX5L1jZqqx8=
+github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U=
 github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3 h1:TxChb2qbO82JiQEBYClSSD5HZxqKeKJ6dIvkEUCJmbs=
 github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3/go.mod h1:KVWvQHb7CQLD9DzA4Np3WmakiCCsrHaCXvFEnOQ7nPk=
 github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 h1:VZBneGprCmHqckcSMPs3puBlK8rBpLMtYKmBktwdoVE=

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

@@ -4,12 +4,15 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
+	sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
+	"github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait"
+
+	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/dns"
+	dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -20,7 +23,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	dnsUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 )
 
 const (
@@ -41,8 +43,8 @@ type inputModel struct {
 	Comment *string
 	Name    *string
 	Records []string
-	TTL     *int64
-	Type    dns.CreateRecordSetPayloadTypes
+	TTL     *int32
+	Type    dns.CreateRecordSetPayloadType
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -69,7 +71,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return err
 			}
 
-			zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient, model.ProjectId, model.ZoneId)
+			zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get zone name: %v", err)
 				zoneLabel = model.ZoneId
@@ -87,12 +89,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create DNS record set: %w", err)
 			}
-			recordSetId := *resp.Rrset.Id
+			recordSetId := resp.Rrset.Id
 
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				err := spinner.Run(params.Printer, "Creating record set", func() error {
-					_, err = wait.CreateRecordSetWaitHandler(ctx, apiClient, model.ProjectId, model.ZoneId, recordSetId).WaitWithContext(ctx)
+					_, err = wait.CreateRecordSetWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, recordSetId).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {
@@ -108,17 +110,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 }
 
 func configureFlags(cmd *cobra.Command) {
-	var typeFlagOptions []string
-	for _, val := range dns.AllowedCreateRecordSetPayloadTypesEnumValues {
-		typeFlagOptions = append(typeFlagOptions, string(val))
-	}
-
 	cmd.Flags().Var(flags.UUIDFlag(), zoneIdFlag, "Zone ID")
 	cmd.Flags().String(commentFlag, "", "User comment")
 	cmd.Flags().String(nameFlag, "", "Name of the record, should be compliant with RFC1035, Section 2.3.4")
-	cmd.Flags().Int64(ttlFlag, 0, "Time to live, if not provided defaults to the zone's default TTL")
+	cmd.Flags().Int32(ttlFlag, 0, "Time to live, if not provided defaults to the zone's default TTL")
 	cmd.Flags().StringSlice(recordFlag, []string{}, "Records belonging to the record set")
-	cmd.Flags().Var(flags.EnumFlag(false, string(defaultType), typeFlagOptions...), typeFlag, fmt.Sprintf("Record type, one of %q", typeFlagOptions))
+	cmd.Flags().Var(flags.EnumFlag(false, string(defaultType), sdkUtils.EnumSliceToStringSlice(dns.AllowedCreateRecordSetPayloadTypeEnumValues)...), typeFlag, fmt.Sprintf("Record type, one of %q", utils.FormatPossibleValues(sdkUtils.EnumSliceToStringSlice(dns.AllowedCreateRecordSetPayloadTypeEnumValues)...)))
 
 	err := flags.MarkFlagsRequired(cmd, zoneIdFlag, nameFlag, recordFlag)
 	cobra.CheckErr(err)
@@ -138,8 +135,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		Comment:         flags.FlagToStringPointer(p, cmd, commentFlag),
 		Name:            flags.FlagToStringPointer(p, cmd, nameFlag),
 		Records:         flags.FlagToStringSliceValue(p, cmd, recordFlag),
-		TTL:             flags.FlagToInt64Pointer(p, cmd, ttlFlag),
-		Type:            dns.CreateRecordSetPayloadTypes(recordType),
+		TTL:             flags.FlagToInt32Pointer(p, cmd, ttlFlag),
+		Type:            dns.CreateRecordSetPayloadType(recordType),
 	}
 
 	if model.Type == txtType {
@@ -163,16 +160,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClient) dns.ApiCreateRecordSetRequest {
 	records := make([]dns.RecordPayload, 0)
 	for _, r := range model.Records {
-		records = append(records, dns.RecordPayload{Content: utils.Ptr(r)})
+		records = append(records, dns.RecordPayload{Content: r})
 	}
 
-	req := apiClient.CreateRecordSet(ctx, model.ProjectId, model.ZoneId)
+	req := apiClient.DefaultAPI.CreateRecordSet(ctx, model.ProjectId, model.ZoneId)
 	req = req.CreateRecordSetPayload(dns.CreateRecordSetPayload{
 		Comment: model.Comment,
-		Name:    model.Name,
-		Records: &records,
+		Name:    *model.Name,
+		Records: records,
 		Ttl:     model.TTL,
-		Type:    &model.Type,
+		Type:    model.Type,
 	})
 	return req
 }
@@ -186,7 +183,7 @@ func outputResult(p *print.Printer, model *inputModel, zoneLabel string, resp *d
 		if model.Async {
 			operationState = "Triggered creation of"
 		}
-		p.Outputf("%s record set for zone %s. Record set ID: %s\n", operationState, zoneLabel, utils.PtrString(resp.Rrset.Id))
+		p.Outputf("%s record set for zone %s. Record set ID: %s\n", operationState, zoneLabel, resp.Rrset.Id)
 		return nil
 	})
 }

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

@@ -9,7 +9,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	"github.com/stackitcloud/stackit-sdk-go/services/dns"
+	dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
@@ -20,7 +20,7 @@ import (
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &dns.APIClient{}
+var testClient = &dns.APIClient{DefaultAPI: &dns.DefaultAPIService{}}
 var testProjectId = uuid.NewString()
 var testZoneId = uuid.NewString()
 
@@ -56,7 +56,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		Name:    utils.Ptr("example.com"),
 		Comment: utils.Ptr("comment"),
 		Records: []string{"1.1.1.1"},
-		TTL:     utils.Ptr(int64(3600)),
+		TTL:     utils.Ptr(int32(3600)),
 		Type:    "SOA",
 	}
 	for _, mod := range mods {
@@ -66,15 +66,15 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *dns.ApiCreateRecordSetRequest)) dns.ApiCreateRecordSetRequest {
-	request := testClient.CreateRecordSet(testCtx, testProjectId, testZoneId)
+	request := testClient.DefaultAPI.CreateRecordSet(testCtx, testProjectId, testZoneId)
 	request = request.CreateRecordSetPayload(dns.CreateRecordSetPayload{
-		Name:    utils.Ptr("example.com"),
+		Name:    "example.com",
 		Comment: utils.Ptr("comment"),
-		Records: &[]dns.RecordPayload{
-			{Content: utils.Ptr("1.1.1.1")},
+		Records: []dns.RecordPayload{
+			{Content: "1.1.1.1"},
 		},
-		Ttl:  utils.Ptr(int64(3600)),
-		Type: dns.CREATERECORDSETPAYLOADTYPE_SOA.Ptr(),
+		Ttl:  utils.Ptr(int32(3600)),
+		Type: dns.CREATERECORDSETPAYLOADTYPE_SOA,
 	})
 	for _, mod := range mods {
 		mod(&request)
@@ -142,7 +142,7 @@ func TestParseInput(t *testing.T) {
 				Name:    utils.Ptr(""),
 				Comment: utils.Ptr(""),
 				Records: []string{"1.1.1.1"},
-				TTL:     utils.Ptr(int64(0)),
+				TTL:     utils.Ptr(int32(0)),
 				Type:    defaultType,
 			},
 		},
@@ -297,13 +297,13 @@ func TestBuildRequest(t *testing.T) {
 				Records: []string{"1.1.1.1"},
 				Type:    defaultType,
 			},
-			expectedRequest: testClient.CreateRecordSet(testCtx, testProjectId, testZoneId).
+			expectedRequest: testClient.DefaultAPI.CreateRecordSet(testCtx, testProjectId, testZoneId).
 				CreateRecordSetPayload(dns.CreateRecordSetPayload{
-					Name: utils.Ptr("example.com"),
-					Records: &[]dns.RecordPayload{
-						{Content: utils.Ptr("1.1.1.1")},
+					Name: "example.com",
+					Records: []dns.RecordPayload{
+						{Content: "1.1.1.1"},
 					},
-					Type: utils.Ptr(defaultType),
+					Type: defaultType,
 				}),
 		},
 	}
@@ -313,7 +313,7 @@ func TestBuildRequest(t *testing.T) {
 			request := buildRequest(testCtx, tt.model, testClient)
 
 			diff := cmp.Diff(request, tt.expectedRequest,
-				cmp.AllowUnexported(tt.expectedRequest),
+				cmp.AllowUnexported(tt.expectedRequest, dns.DefaultAPIService{}),
 				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {
@@ -343,7 +343,7 @@ func TestOutputResult(t *testing.T) {
 			name: "only record set as argument",
 			args: args{
 				model: fixtureInputModel(),
-				resp:  &dns.RecordSetResponse{Rrset: &dns.RecordSet{}},
+				resp:  &dns.RecordSetResponse{Rrset: dns.RecordSet{}},
 			},
 			wantErr: false,
 		},

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

@@ -18,8 +18,8 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/dns"
-	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
+	dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
+	"github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait"
 )
 
 const (
@@ -58,13 +58,13 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return err
 			}
 
-			zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient, model.ProjectId, model.ZoneId)
+			zoneLabel, err := dnsUtils.GetZoneName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get zone name: %v", err)
 				zoneLabel = model.ZoneId
 			}
 
-			recordSetLabel, err := dnsUtils.GetRecordSetName(ctx, apiClient, model.ProjectId, model.ZoneId, model.RecordSetId)
+			recordSetLabel, err := dnsUtils.GetRecordSetName(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, model.RecordSetId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get record set name: %v", err)
 				recordSetLabel = model.RecordSetId
@@ -89,7 +89,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				err := spinner.Run(params.Printer, "Deleting record set", func() error {
-					_, err = wait.DeleteRecordSetWaitHandler(ctx, apiClient, model.ProjectId, model.ZoneId, model.RecordSetId).WaitWithContext(ctx)
+					_, err = wait.DeleteRecordSetWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.ZoneId, model.RecordSetId).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {
@@ -135,6 +135,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *dns.APIClient) dns.ApiDeleteRecordSetRequest {
-	req := apiClient.DeleteRecordSet(ctx, model.ProjectId, model.ZoneId, model.RecordSetId)
+	req := apiClient.DefaultAPI.DeleteRecordSet(ctx, model.ProjectId, model.ZoneId, model.RecordSetId)
 	return req
 }

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

@@ -10,13 +10,13 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	"github.com/stackitcloud/stackit-sdk-go/services/dns"
+	dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api"
 )
 
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &dns.APIClient{}
+var testClient = &dns.APIClient{DefaultAPI: &dns.DefaultAPIService{}}
 var testProjectId = uuid.NewString()
 var testZoneId = uuid.NewString()
 var testRecordSetId = uuid.NewString()
@@ -58,7 +58,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *dns.ApiDeleteRecordSetRequest)) dns.ApiDeleteRecordSetRequest {
-	request := testClient.DeleteRecordSet(testCtx, testProjectId, testZoneId, testRecordSetId)
+	request := testClient.DefaultAPI.DeleteRecordSet(testCtx, testProjectId, testZoneId, testRecordSetId)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -187,7 +187,7 @@ func TestBuildRequest(t *testing.T) {
 			request := buildRequest(testCtx, tt.model, testClient)
 
 			diff := cmp.Diff(request, tt.expectedRequest,
-				cmp.AllowUnexported(tt.expectedRequest),
+				cmp.AllowUnexported(tt.expectedRequest, dns.DefaultAPIService{}),
 				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {