chore(logs): refactor instance create

Author: j1n-o9r

internal/cmd/logs/instance/create/create.go

@@ -3,6 +3,7 @@ package create
 import (
 	"context"
 	"fmt"
+	"math"
 
 	logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api"
 
@@ -87,7 +88,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			// Call API
-			req := buildRequest(ctx, model, apiClient)
+			req, err := buildRequest(ctx, model, apiClient)
 			if err != nil {
 				return err
 			}
@@ -98,15 +99,15 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if resp == nil {
 				return fmt.Errorf("create Logs instance: empty response from API")
 			}
-			if resp.Id == nil {
+			if len(resp.Id) == 0 {
 				return fmt.Errorf("create Logs instance: instance id missing in response")
 			}
-			instanceId := *resp.Id
+			instanceId := resp.Id
 
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				err := spinner.Run(params.Printer, "Creating instance", func() error {
-					_, err = wait.CreateLogsInstanceWaitHandler(ctx, apiClient, model.ProjectId, model.Region, instanceId).WaitWithContext(ctx)
+					_, err = wait.CreateLogsInstanceWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, instanceId).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {
@@ -149,16 +150,25 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	return &model, nil
 }
 
-func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiCreateLogsInstanceRequest {
-	req := apiClient.CreateLogsInstance(ctx, model.ProjectId, model.Region)
+func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) (logs.ApiCreateLogsInstanceRequest, error) {
+	req := apiClient.DefaultAPI.CreateLogsInstance(ctx, model.ProjectId, model.Region)
+
+	var retentionDays int32
+	if model.RetentionDays != nil {
+		val := *model.RetentionDays
+		if val < 0 || val > math.MaxInt32 {
+			return req, fmt.Errorf("metrics frequency value %d overflows int32", val)
+		}
+		retentionDays = int32(val)
+	}
 
 	req = req.CreateLogsInstancePayload(logs.CreateLogsInstancePayload{
-		DisplayName:   model.DisplayName,
+		DisplayName:   utils.PtrString(model.DisplayName),
 		Description:   model.Description,
-		RetentionDays: model.RetentionDays,
-		Acl:           model.ACL,
+		RetentionDays: retentionDays,
+		Acl:           utils.PtrValue(model.ACL),
 	})
-	return req
+	return req, nil
 }
 
 func outputResult(p *print.Printer, model *inputModel, projectLabel string, resp *logs.LogsInstance) error {
@@ -173,7 +183,7 @@ func outputResult(p *print.Printer, model *inputModel, projectLabel string, resp
 		if model.Async {
 			operationState = "Triggered creation of"
 		}
-		p.Outputf("%s instance for project %q. Instance ID: %s\n", operationState, projectLabel, utils.PtrString(resp.Id))
+		p.Outputf("%s instance for project %q. Instance ID: %s\n", operationState, projectLabel, resp.Id)
 		return nil
 	})
 }

internal/cmd/logs/instance/create/create_test.go

@@ -31,7 +31,7 @@ type testCtxKey struct{}
 
 var (
 	testCtx       = context.WithValue(context.Background(), testCtxKey{}, "foo")
-	testClient    = &logs.APIClient{}
+	testClient    = &logs.APIClient{DefaultAPI: &logs.DefaultAPIService{}}
 	testProjectId = uuid.NewString()
 )
 
@@ -72,12 +72,12 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 
 // Request
 func fixtureRequest(mods ...func(request *logs.ApiCreateLogsInstanceRequest)) logs.ApiCreateLogsInstanceRequest {
-	request := testClient.CreateLogsInstance(testCtx, testProjectId, testRegion)
+	request := testClient.DefaultAPI.CreateLogsInstance(testCtx, testProjectId, testRegion)
 	request = request.CreateLogsInstancePayload(logs.CreateLogsInstancePayload{
-		DisplayName:   utils.Ptr(testDisplayName),
+		DisplayName:   testDisplayName,
 		Description:   utils.Ptr(testDescription),
-		RetentionDays: utils.Ptr(int64(testRetentionDays)),
-		Acl:           utils.Ptr([]string{testAcl}),
+		RetentionDays: testRetentionDays,
+		Acl:           []string{testAcl},
 	})
 
 	for _, mod := range mods {
@@ -166,11 +166,13 @@ func TestBuildRequest(t *testing.T) {
 		description     string
 		model           *inputModel
 		expectedRequest logs.ApiCreateLogsInstanceRequest
+		isValid         bool
 	}{
 		{
 			description:     "base case",
 			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
+			isValid:         true,
 		},
 		{
 			description: "no optional values",
@@ -179,20 +181,38 @@ func TestBuildRequest(t *testing.T) {
 				model.ACL = nil
 			}),
 			expectedRequest: fixtureRequest().CreateLogsInstancePayload(logs.CreateLogsInstancePayload{
-				DisplayName:   utils.Ptr(testDisplayName),
-				RetentionDays: utils.Ptr(int64(testRetentionDays)),
+				DisplayName:   testDisplayName,
+				RetentionDays: int32(testRetentionDays),
 				Description:   nil,
 				Acl:           nil,
 			}),
+			isValid: true,
+		},
+		{
+			description: "retention days not valid",
+			model: fixtureInputModel(func(model *inputModel) {
+				model.RetentionDays = utils.Int64Ptr(1 << 31)
+			}),
+			expectedRequest: fixtureRequest(),
+			isValid:         false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			request := buildRequest(testCtx, tt.model, testClient)
+			request, err := buildRequest(testCtx, tt.model, testClient)
+
+			if err != nil {
+				if !tt.isValid {
+					return
+				}
+				t.Fatalf("error building request: %v", err)
+			}
+
 			diff := cmp.Diff(tt.expectedRequest, request,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
+				cmpopts.IgnoreFields(logs.ApiCreateLogsInstanceRequest{}, "ApiService"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)