Merge remote-tracking branch 'origin/main' into refac/NO-ISSUE-use-generic-enum-flags-for-string-backed-enums

Author: cgoetz-inovex

docs/stackit_beta_intake_runner_delete.md

@@ -15,12 +15,16 @@ stackit beta intake runner delete RUNNER_ID [flags]
 ```
   Delete an Intake Runner with ID "xxx"
   $ stackit beta intake runner delete xxx
+
+  Delete an Intake Runner with ID "xxx", along with all associated Intakes and Intake Users that would stop the removal of the Intake
+  $ stackit beta intake runner delete xxx --force
 ```
 
 ### Options
 
 ```
-  -h, --help   Help for "stackit beta intake runner delete"
+      --force   When true, also removes all associated Intakes and Intake Users that would stop the removal of the Intake
+  -h, --help    Help for "stackit beta intake runner delete"
 ```
 
 ### Options inherited from parent commands

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,18 +25,18 @@ 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
-      --type string            Zone type, (one of: [primary, secondary, ])
+      --refresh-time int32     Refresh time
+      --retry-time int32       Retry time
+      --type string            Zone type, (one of: [primary, secondary])
 ```
 
 ### Options inherited from parent commands

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/beta/intake/runner/delete/delete.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/spf13/cobra"
@@ -21,13 +22,15 @@ import (
 )
 
 const (
-	runnerIdArg = "RUNNER_ID"
+	runnerIdArg     = "RUNNER_ID"
+	forceDeleteFlag = "force"
 )
 
 // inputModel struct holds all the input parameters for the command
 type inputModel struct {
 	*globalflags.GlobalFlagModel
-	RunnerId string
+	RunnerId    string
+	ForceDelete bool
 }
 
 // NewCmd creates a new cobra command for deleting an Intake Runner
@@ -41,6 +44,9 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
 			examples.NewExample(
 				`Delete an Intake Runner with ID "xxx"`,
 				`$ stackit beta intake runner delete xxx`),
+			examples.NewExample(
+				`Delete an Intake Runner with ID "xxx", along with all associated Intakes and Intake Users that would stop the removal of the Intake`,
+				`$ stackit beta intake runner delete xxx --force`),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
@@ -56,6 +62,9 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
 			}
 
 			prompt := fmt.Sprintf("Are you sure you want to delete Intake Runner %q?", model.RunnerId)
+			if model.ForceDelete {
+				prompt = fmt.Sprintf("%s This will also remove all Intakes and Intake Users that would stop the removal of the Intake", prompt)
+			}
 			err = p.Printer.PromptForConfirmation(prompt)
 			if err != nil {
 				return err
@@ -87,9 +96,14 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
 			return nil
 		},
 	}
+	configureFlags(cmd)
 	return cmd
 }
 
+func configureFlags(cmd *cobra.Command) {
+	cmd.Flags().Bool(forceDeleteFlag, false, "When true, also removes all associated Intakes and Intake Users that would stop the removal of the Intake")
+}
+
 // parseInput parses the command arguments and flags into a standardized model
 func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
 	runnerId := inputArgs[0]
@@ -102,6 +116,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
 		RunnerId:        runnerId,
+		ForceDelete:     flags.FlagToBoolValue(p, cmd, forceDeleteFlag),
 	}
 
 	p.DebugInputModel(model)
@@ -111,5 +126,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 // buildRequest creates the API request to delete an Intake Runner
 func buildRequest(ctx context.Context, model *inputModel, apiClient *intake.APIClient) intake.ApiDeleteIntakeRunnerRequest {
 	req := apiClient.DefaultAPI.DeleteIntakeRunner(ctx, model.ProjectId, model.Region, model.RunnerId)
+	if model.ForceDelete {
+		return req.Force(true)
+	}
 	return req
 }

internal/cmd/beta/intake/runner/delete/delete_test.go

@@ -94,6 +94,17 @@ func TestParseInput(t *testing.T) {
 			isValid:       true,
 			expectedModel: fixtureInputModel(),
 		},
+		{
+			description: "with force",
+			argValues:   fixtureArgValues(),
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[forceDeleteFlag] = "true"
+			}),
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.ForceDelete = true
+			}),
+		},
 		{
 			description: "no arg values",
 			argValues:   []string{},
@@ -140,6 +151,13 @@ func TestBuildRequest(t *testing.T) {
 			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
 		},
+		{
+			description: "with force",
+			model: fixtureInputModel(func(model *inputModel) {
+				model.ForceDelete = true
+			}),
+			expectedRequest: fixtureRequest().Force(true),
+		},
 	}
 
 	for _, tt := range tests {

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

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
+	"github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait"
 
 	"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 +20,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 (
@@ -36,7 +35,7 @@ const (
 
 var typeFlag = flags.StringEnumFlag(
 	"type",
-	dns.AllowedCreateRecordSetPayloadTypesEnumValues,
+	dns.AllowedCreateRecordSetPayloadTypeEnumValues,
 	"Record type,",
 	flags.StringEnumDefaultValue(defaultType),
 )
@@ -47,8 +46,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 {
@@ -75,7 +74,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
@@ -93,12 +92,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 {
@@ -117,7 +116,7 @@ func configureFlags(cmd *cobra.Command) {
 	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")
 	typeFlag.Register(cmd.Flags())
 
@@ -137,7 +136,7 @@ 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),
+		TTL:             flags.FlagToInt32Pointer(p, cmd, ttlFlag),
 		Type:            typeFlag.Get(),
 	}
 
@@ -162,16 +161,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
 }
@@ -185,7 +184,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
 	})
 }