chore(logs): refactor access token describe

Author: j1n-o9r

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

@@ -101,7 +101,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiGetAccessTokenRequest {
-	return apiClient.GetAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId)
+	return apiClient.DefaultAPI.GetAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId)
 }
 
 func outputResult(p *print.Printer, outputFormat string, token *logs.AccessToken) error {
@@ -110,21 +110,21 @@ func outputResult(p *print.Printer, outputFormat string, token *logs.AccessToken
 	}
 	return p.OutputResult(outputFormat, token, func() error {
 		table := tables.NewTable()
-		table.AddRow("ID", utils.PtrString(token.Id))
+		table.AddRow("ID", token.Id)
 		table.AddSeparator()
-		table.AddRow("DISPLAY NAME", utils.PtrString(token.DisplayName))
+		table.AddRow("DISPLAY NAME", token.DisplayName)
 		table.AddSeparator()
 		table.AddRow("DESCRIPTION", utils.PtrString(token.Description))
 		table.AddSeparator()
-		table.AddRow("PERMISSIONS", utils.PtrString(token.Permissions))
+		table.AddRow("PERMISSIONS", token.Permissions)
 		table.AddSeparator()
-		table.AddRow("CREATOR", utils.PtrString(token.Creator))
+		table.AddRow("CREATOR", token.Creator)
 		table.AddSeparator()
-		table.AddRow("STATE", utils.PtrString(token.Status))
+		table.AddRow("STATE", token.Status)
 		table.AddSeparator()
-		table.AddRow("EXPIRES", utils.PtrString(token.Expires))
+		table.AddRow("EXPIRES", token.Expires)
 		table.AddSeparator()
-		table.AddRow("VALID UNTIL", utils.PtrString(token.ValidUntil))
+		table.AddRow("VALID UNTIL", token.ValidUntil)
 		table.AddSeparator()
 
 		err := table.Display(p)

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

@@ -23,7 +23,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()
@@ -71,7 +71,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *logs.ApiGetAccessTokenRequest)) logs.ApiGetAccessTokenRequest {
-	request := testClient.GetAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId)
+	request := testClient.DefaultAPI.GetAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -199,7 +199,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
+				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
@@ -222,16 +222,16 @@ func TestOutputResult(t *testing.T) {
 			name: "base",
 			args: args{
 				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,