chore(logs): refactored access token create

Author: j1n-o9r

internal/cmd/logs/access_token/create/create.go

@@ -35,7 +35,7 @@ type inputModel struct {
 	InstanceId  string
 	Description *string
 	DisplayName string
-	Lifetime    *int64
+	Lifetime    *int32
 	Permissions []string
 }
 
@@ -80,7 +80,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				projectLabel = model.ProjectId
 			}
 
-			instanceLabel, err := logsUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId)
+			instanceLabel, err := logsUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.InstanceId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
 				instanceLabel = model.InstanceId
@@ -110,7 +110,7 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance")
 	cmd.Flags().String(displayNameFlag, "", "Display name for the access token")
 	cmd.Flags().String(descriptionFlag, "", "Description of the access token")
-	cmd.Flags().Int64(lifetimeFlag, 0, "Lifetime of the access token in days [1 - 180]")
+	cmd.Flags().Int32(lifetimeFlag, 0, "Lifetime of the access token in days [1 - 180]")
 	cmd.Flags().StringSlice(permissionsFlag, []string{}, `Permissions of the access token ["read" "write"]`)
 
 	err := flags.MarkFlagsRequired(cmd, instanceIdFlag, displayNameFlag, permissionsFlag)
@@ -128,7 +128,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		DisplayName:     flags.FlagToStringValue(p, cmd, displayNameFlag),
 		InstanceId:      flags.FlagToStringValue(p, cmd, instanceIdFlag),
 		Description:     flags.FlagToStringPointer(p, cmd, descriptionFlag),
-		Lifetime:        flags.FlagToInt64Pointer(p, cmd, lifetimeFlag),
+		Lifetime:        flags.FlagToInt32Pointer(p, cmd, lifetimeFlag),
 		Permissions:     flags.FlagToStringSliceValue(p, cmd, permissionsFlag),
 	}
 
@@ -137,13 +137,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiCreateAccessTokenRequest {
-	req := apiClient.CreateAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId)
-
+	req := apiClient.DefaultAPI.CreateAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId)
+	permissions := make([]logs.PermissionsInner, len(model.Permissions))
+	for i, permission := range model.Permissions {
+		permissions[i] = logs.PermissionsInner(permission)
+	}
 	return req.CreateAccessTokenPayload(logs.CreateAccessTokenPayload{
 		Description: model.Description,
-		DisplayName: &model.DisplayName,
+		DisplayName: model.DisplayName,
 		Lifetime:    model.Lifetime,
-		Permissions: &model.Permissions,
+		Permissions: permissions,
 	})
 }
 
@@ -152,7 +155,7 @@ func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessTo
 		return fmt.Errorf("access token cannot be nil")
 	}
 	return p.OutputResult(outputFormat, accessToken, func() error {
-		p.Outputf("Created access token for Logs instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken))
+		p.Outputf("Created access token for Logs instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, accessToken.Id, utils.PtrValue(accessToken.AccessToken))
 		return nil
 	})
 }

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

@@ -26,7 +26,7 @@ type testCtxKey struct{}
 
 var (
 	testCtx        = context.WithValue(context.Background(), testCtxKey{}, "foo")
-	testClient     = &logs.APIClient{}
+	testClient     = &logs.APIClient{DefaultAPI: &logs.DefaultAPIService{}}
 	testProjectId  = uuid.NewString()
 	testInstanceId = uuid.NewString()
 )
@@ -59,7 +59,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		InstanceId:  testInstanceId,
 		Description: utils.Ptr(testDescription),
 		DisplayName: testDisplayName,
-		Lifetime:    utils.Ptr(int64(0)),
+		Lifetime:    utils.Ptr(int32(0)),
 		Permissions: []string{
 			"read",
 			"write",
@@ -72,7 +72,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *logs.ApiCreateAccessTokenRequest)) logs.ApiCreateAccessTokenRequest {
-	request := testClient.CreateAccessToken(testCtx, testProjectId, testRegion, testInstanceId)
+	request := testClient.DefaultAPI.CreateAccessToken(testCtx, testProjectId, testRegion, testInstanceId)
 	request = request.CreateAccessTokenPayload(fixturePayload())
 	for _, mod := range mods {
 		mod(&request)
@@ -82,13 +82,13 @@ func fixtureRequest(mods ...func(request *logs.ApiCreateAccessTokenRequest)) log
 
 func fixturePayload(mods ...func(payload *logs.CreateAccessTokenPayload)) logs.CreateAccessTokenPayload {
 	payload := logs.CreateAccessTokenPayload{
-		DisplayName: utils.Ptr(testDisplayName),
+		DisplayName: testDisplayName,
 		Description: utils.Ptr(testDescription),
-		Lifetime:    utils.Ptr(int64(0)),
-		Permissions: utils.Ptr([]string{
+		Lifetime:    utils.Ptr(int32(0)),
+		Permissions: []logs.PermissionsInner{
 			"read",
 			"write",
-		}),
+		},
 	}
 	for _, mod := range mods {
 		mod(&payload)
@@ -192,7 +192,9 @@ func TestParseInput(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
+			testutils.TestParseInputWithOptions(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, nil, tt.isValid, []testutils.TestingOption{
+				testutils.WithCmpOptions(cmpopts.EquateEmpty()),
+			})
 		})
 	}
 }
@@ -216,6 +218,8 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(tt.expectedRequest, request,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
+				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
+				cmpopts.EquateEmpty(),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
@@ -240,16 +244,16 @@ func TestOutputResult(t *testing.T) {
 			args: args{
 				instanceLabel: "",
 				accessToken: utils.Ptr(logs.AccessToken{
-					Id: utils.Ptr(uuid.NewString()),
-					Permissions: utils.Ptr([]string{
+					Id: uuid.NewString(),
+					Permissions: []logs.PermissionsInner{
 						"read",
 						"write",
-					}),
-					DisplayName: utils.Ptr("Token"),
+					},
+					DisplayName: "Token",
 					AccessToken: utils.Ptr("Secret access token"),
-					Creator:     utils.Ptr(uuid.NewString()),
-					Expires:     utils.Ptr(false),
-					Status:      utils.Ptr(logs.ACCESSTOKENSTATUS_ACTIVE),
+					Creator:     uuid.NewString(),
+					Expires:     false,
+					Status:      logs.ACCESSTOKENSTATUS_ACTIVE,
 				}),
 			},
 			wantErr: false,