chore(logs): refactor access token list

Author: j1n-o9r

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

@@ -82,7 +82,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			// Truncate output
-			items := utils.PtrValue(resp.Tokens)
+			items := resp.Tokens
 			if model.Limit != nil && len(items) > int(*model.Limit) {
 				items = items[:*model.Limit]
 			}
@@ -127,7 +127,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiListAccessTokensRequest {
-	return apiClient.ListAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId)
+	return apiClient.DefaultAPI.ListAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId)
 }
 
 func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken, projectLabel string) error {
@@ -142,12 +142,12 @@ func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessTok
 
 		for _, token := range tokens {
 			table.AddRow(
-				utils.PtrString(token.Id),
-				utils.PtrString(token.DisplayName),
+				token.Id,
+				token.DisplayName,
 				utils.PtrString(token.Description),
-				utils.PtrString(token.Permissions),
+				token.Permissions,
 				utils.PtrString(token.ValidUntil),
-				utils.PtrString(token.Status),
+				token.Status,
 			)
 			table.AddSeparator()
 		}

internal/cmd/logs/access_token/list/list_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()
@@ -61,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *logs.ApiListAccessTokensRequest)) logs.ApiListAccessTokensRequest {
-	request := testClient.ListAccessTokens(testCtx, testProjectId, testRegion, testInstanceId)
+	request := testClient.DefaultAPI.ListAccessTokens(testCtx, testProjectId, testRegion, testInstanceId)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -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, tt.expectedRequest),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
@@ -196,16 +196,16 @@ func TestOutputResult(t *testing.T) {
 			args: args{
 				accessTokens: []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,
 					},
 				},
 			},