chore(logs): further improvements

Author: j1n-o9r

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

@@ -138,14 +138,13 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiCreateAccessTokenRequest {
 	req := apiClient.DefaultAPI.CreateAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId)
-	permissions := utils.Map(model.Permissions, func(t string) logs.PermissionsInner {
-		return logs.PermissionsInner(t)
-	})
 	return req.CreateAccessTokenPayload(logs.CreateAccessTokenPayload{
 		Description: model.Description,
 		DisplayName: model.DisplayName,
 		Lifetime:    model.Lifetime,
-		Permissions: permissions,
+		Permissions: utils.Map(model.Permissions, func(t string) logs.PermissionsInner {
+			return logs.PermissionsInner(t)
+		}),
 	})
 }
 

internal/cmd/logs/access_token/describe/describe_test.go

@@ -224,8 +224,8 @@ func TestOutputResult(t *testing.T) {
 				accessToken: utils.Ptr(logs.AccessToken{
 					Id: uuid.NewString(),
 					Permissions: []logs.PermissionsInner{
-						"read",
-						"write",
+						logs.PERMISSIONSINNER_READ,
+						logs.PERMISSIONSINNER_WRITE,
 					},
 					DisplayName: "Token",
 					AccessToken: utils.Ptr("Secret access token"),

internal/cmd/logs/access_token/list/list_test.go

@@ -171,7 +171,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
@@ -198,8 +198,8 @@ func TestOutputResult(t *testing.T) {
 					{
 						Id: uuid.NewString(),
 						Permissions: []logs.PermissionsInner{
-							"read",
-							"write",
+							logs.PERMISSIONSINNER_READ,
+							logs.PERMISSIONSINNER_WRITE,
 						},
 						DisplayName: "Token",
 						AccessToken: utils.Ptr("Secret access token"),

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

@@ -95,12 +95,11 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if resp == nil {
 				return fmt.Errorf("create Logs instance: empty response from API")
 			}
-			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.DefaultAPI, model.ProjectId, model.Region, instanceId).WaitWithContext(ctx)
+					_, err = wait.CreateLogsInstanceWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, resp.Id).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {