chore(logme): refactor logme pkg

Author: j1n-o9r

internal/pkg/services/logme/client/client.go

@@ -10,5 +10,5 @@ import (
 )
 
 func ConfigureClient(p *print.Printer, cliVersion string) (*logme.APIClient, error) {
-	return genericclient.ConfigureClientGeneric(p, cliVersion, viper.GetString(config.LogMeCustomEndpointKey), true, genericclient.CreateApiClient[*logme.APIClient](logme.NewAPIClient))
+	return genericclient.ConfigureClientGeneric(p, cliVersion, viper.GetString(config.LogMeCustomEndpointKey), true, logme.NewAPIClient)
 }

internal/pkg/services/logme/utils/utils.go

@@ -15,9 +15,9 @@ const (
 )
 
 func ValidatePlanId(planId string, offerings *logme.ListOfferingsResponse) error {
-	for _, offer := range *offerings.Offerings {
-		for _, plan := range *offer.Plans {
-			if plan.Id != nil && strings.EqualFold(*plan.Id, planId) {
+	for _, offer := range offerings.Offerings {
+		for _, plan := range offer.Plans {
+			if strings.EqualFold(plan.Id, planId) {
 				return nil
 			}
 		}
@@ -33,21 +33,18 @@ func LoadPlanId(planName, version string, offerings *logme.ListOfferingsResponse
 	availableVersions := ""
 	availablePlanNames := ""
 	isValidVersion := false
-	for _, offer := range *offerings.Offerings {
-		if !strings.EqualFold(*offer.Version, version) {
-			availableVersions = fmt.Sprintf("%s\n- %s", availableVersions, *offer.Version)
+	for _, offer := range offerings.Offerings {
+		if !strings.EqualFold(offer.Version, version) {
+			availableVersions = fmt.Sprintf("%s\n- %s", availableVersions, offer.Version)
 			continue
 		}
 		isValidVersion = true
 
-		for _, plan := range *offer.Plans {
-			if plan.Name == nil {
-				continue
+		for _, plan := range offer.Plans {
+			if strings.EqualFold(plan.Name, planName) {
+				return &plan.Id, nil
 			}
-			if strings.EqualFold(*plan.Name, planName) && plan.Id != nil {
-				return plan.Id, nil
-			}
-			availablePlanNames = fmt.Sprintf("%s\n- %s", availablePlanNames, *plan.Name)
+			availablePlanNames = fmt.Sprintf("%s\n- %s", availablePlanNames, plan.Name)
 		}
 	}
 
@@ -65,23 +62,18 @@ func LoadPlanId(planName, version string, offerings *logme.ListOfferingsResponse
 	}
 }
 
-type LogMeClient interface {
-	GetInstanceExecute(ctx context.Context, projectId, instanceId string) (*logme.Instance, error)
-	GetCredentialsExecute(ctx context.Context, projectId, instanceId, credentialsId string) (*logme.CredentialsResponse, error)
-}
-
-func GetInstanceName(ctx context.Context, apiClient LogMeClient, projectId, instanceId string) (string, error) {
-	resp, err := apiClient.GetInstanceExecute(ctx, projectId, instanceId)
+func GetInstanceName(ctx context.Context, apiClient logme.DefaultAPI, projectId, instanceId, region string) (string, error) {
+	resp, err := apiClient.GetInstance(ctx, projectId, region, instanceId).Execute()
 	if err != nil {
 		return "", fmt.Errorf("get LogMe instance: %w", err)
 	}
-	return *resp.Name, nil
+	return resp.Name, nil
 }
 
-func GetCredentialsUsername(ctx context.Context, apiClient LogMeClient, projectId, instanceId, credentialsId string) (string, error) {
-	resp, err := apiClient.GetCredentialsExecute(ctx, projectId, instanceId, credentialsId)
+func GetCredentialsUsername(ctx context.Context, apiClient logme.DefaultAPI, projectId, instanceId, credentialsId, region string) (string, error) {
+	resp, err := apiClient.GetCredentials(ctx, projectId, instanceId, region, credentialsId).Execute()
 	if err != nil {
 		return "", fmt.Errorf("get LogMe credentials: %w", err)
 	}
-	return *resp.Raw.Credentials.Username, nil
+	return resp.Raw.Credentials.Username, nil
 }

internal/pkg/services/logme/utils/utils_test.go

@@ -20,27 +20,31 @@ var (
 const (
 	testInstanceName        = "instance"
 	testCredentialsUsername = "username"
+	testRegion              = "region"
 )
 
-type logMeClientMocked struct {
+type mockSettings struct {
 	getInstanceFails    bool
 	getInstanceResp     *logme.Instance
 	getCredentialsFails bool
 	getCredentialsResp  *logme.CredentialsResponse
 }
 
-func (m *logMeClientMocked) GetInstanceExecute(_ context.Context, _, _ string) (*logme.Instance, error) {
-	if m.getInstanceFails {
-		return nil, fmt.Errorf("could not get instance")
-	}
-	return m.getInstanceResp, nil
-}
-
-func (m *logMeClientMocked) GetCredentialsExecute(_ context.Context, _, _, _ string) (*logme.CredentialsResponse, error) {
-	if m.getCredentialsFails {
-		return nil, fmt.Errorf("could not get user")
+func newAPIMock(s mockSettings) logme.DefaultAPI {
+	return &logme.DefaultAPIServiceMock{
+		GetInstanceExecuteMock: utils.Ptr(func(r logme.ApiGetInstanceRequest) (*logme.Instance, error) {
+			if s.getInstanceFails {
+				return nil, fmt.Errorf("could not get instance")
+			}
+			return s.getInstanceResp, nil
+		}),
+		GetCredentialsExecuteMock: utils.Ptr(func(r logme.ApiGetCredentialsRequest) (*logme.CredentialsResponse, error) {
+			if s.getCredentialsFails {
+				return nil, fmt.Errorf("could not get user")
+			}
+			return s.getCredentialsResp, nil
+		}),
 	}
-	return m.getCredentialsResp, nil
 }
 
 func TestGetInstanceName(t *testing.T) {
@@ -54,7 +58,7 @@ func TestGetInstanceName(t *testing.T) {
 		{
 			description: "base",
 			getInstanceResp: &logme.Instance{
-				Name: utils.Ptr(testInstanceName),
+				Name: testInstanceName,
 			},
 			isValid:        true,
 			expectedOutput: testInstanceName,
@@ -68,12 +72,12 @@ func TestGetInstanceName(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			client := &logMeClientMocked{
+			client := mockSettings{
 				getInstanceFails: tt.getInstanceFails,
 				getInstanceResp:  tt.getInstanceResp,
 			}
 
-			output, err := GetInstanceName(context.Background(), client, testProjectId, testInstanceId)
+			output, err := GetInstanceName(context.Background(), newAPIMock(client), testProjectId, testInstanceId, testRegion)
 
 			if tt.isValid && err != nil {
 				t.Errorf("failed on valid input")
@@ -103,8 +107,8 @@ func TestGetCredentialsUsername(t *testing.T) {
 			description: "base",
 			getCredentialsResp: &logme.CredentialsResponse{
 				Raw: &logme.RawCredentials{
-					Credentials: &logme.Credentials{
-						Username: utils.Ptr(testCredentialsUsername),
+					Credentials: logme.Credentials{
+						Username: testCredentialsUsername,
 					},
 				},
 			},
@@ -120,12 +124,12 @@ func TestGetCredentialsUsername(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			client := &logMeClientMocked{
+			client := mockSettings{
 				getCredentialsFails: tt.getCredentialsFails,
 				getCredentialsResp:  tt.getCredentialsResp,
 			}
 
-			output, err := GetCredentialsUsername(context.Background(), client, testProjectId, testInstanceId, testCredentialsId)
+			output, err := GetCredentialsUsername(context.Background(), newAPIMock(client), testProjectId, testInstanceId, testCredentialsId, testRegion)
 
 			if tt.isValid && err != nil {
 				t.Errorf("failed on valid input")