chore(logs): refactor instance describe

Author: j1n-o9r

internal/cmd/logs/instance/describe/describe.go

@@ -84,7 +84,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiGetLogsInstanceRequest {
-	return apiClient.GetLogsInstance(ctx, model.ProjectId, model.Region, model.InstanceID)
+	return apiClient.DefaultAPI.GetLogsInstance(ctx, model.ProjectId, model.Region, model.InstanceID)
 }
 
 func outputResult(p *print.Printer, outputFormat string, instance *logs.LogsInstance) error {
@@ -93,13 +93,13 @@ func outputResult(p *print.Printer, outputFormat string, instance *logs.LogsInst
 	}
 	return p.OutputResult(outputFormat, instance, func() error {
 		table := tables.NewTable()
-		table.AddRow("ID", utils.PtrString(instance.Id))
+		table.AddRow("ID", instance.Id)
 		table.AddSeparator()
-		table.AddRow("DISPLAY NAME", utils.PtrString(instance.DisplayName))
+		table.AddRow("DISPLAY NAME", instance.DisplayName)
 		table.AddSeparator()
-		table.AddRow("RETENTION DAYS", utils.PtrString(instance.RetentionDays))
+		table.AddRow("RETENTION DAYS", instance.RetentionDays)
 		table.AddSeparator()
-		table.AddRow("ACL IP RANGES", utils.PtrString(instance.Acl))
+		table.AddRow("ACL IP RANGES", instance.Acl)
 		table.AddSeparator()
 		table.AddRow("DATA SOURCE", utils.PtrString(instance.DatasourceUrl))
 		table.AddSeparator()

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

@@ -18,7 +18,7 @@ import (
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &logs.APIClient{}
+var testClient = &logs.APIClient{DefaultAPI: &logs.DefaultAPIService{}}
 var testProjectId = uuid.NewString()
 var testInstanceId = uuid.NewString()
 
@@ -51,7 +51,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *logs.ApiGetLogsInstanceRequest)) logs.ApiGetLogsInstanceRequest {
-	request := testClient.GetLogsInstance(testCtx, testProjectId, testRegion, testInstanceId)
+	request := testClient.DefaultAPI.GetLogsInstance(testCtx, testProjectId, testRegion, testInstanceId)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -140,7 +140,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)