fix lint issues

Author: Pushkar Acharya

Diff for: internal/instances/instances.go

@@ -101,23 +101,10 @@ func (i *Instances) InstanceShutdownByProviderID(ctx context.Context, providerID
 		defer responseBody.Body.Close()
 	}
 	if err != nil {
-		if err == client.ErrInstanceNotFound {
-			attempt, ok := i.nodeShutdown.Load(providerID)
-			if !ok {
-				attempt = 1
-				i.nodeShutdown.Store(providerID, attempt)
-
-				return false, err
-			}
-			if attempt.(int) >= 3 {
-
-				return true, nil
-			}
-			intAttempt := attempt.(int)
-			i.nodeShutdown.Store(providerID, (intAttempt + 1))
-
-			return false, err
+		if errors.Is(err, client.ErrInstanceNotFound) {
+			return i.handleInstanceNotFoundErr(providerID, err)
 		}
+
 		return false, fmt.Errorf("failed to get instance by provider ID %s: %w", providerID, err)
 	}
 	if currInstance == nil || currInstance.State == "STATE_SHUTOFF" || currInstance.State == "STATE_SHUTDOWN" {
@@ -286,3 +273,25 @@ func getNodeAddress(currInstance *crusoeapi.InstanceV1Alpha5) ([]v1.NodeAddress,
 
 	return nodeAddress, nil
 }
+
+func (i *Instances) handleInstanceNotFoundErr(providerID string, orignalErr error) (instanceShutdown bool, err error) {
+	attempt, ok := i.nodeShutdown.Load(providerID)
+	if !ok {
+		i.nodeShutdown.Store(providerID, 1)
+
+		return false, orignalErr
+	}
+	intAttempt, ok := attempt.(int)
+	if !ok {
+		// store correct data in case to avoid conversion issues in next iteration
+		i.nodeShutdown.Store(providerID, 1)
+
+		return false, orignalErr
+	}
+	if intAttempt >= 3 {
+		return true, nil
+	}
+	i.nodeShutdown.Store(providerID, (intAttempt + 1))
+
+	return false, orignalErr
+}

Diff for: internal/instances/instances_test.go

@@ -116,7 +116,8 @@ func TestInstanceShutdownByProviderIDInstanceMissingFromCloudProvider(t *testing
 	defer ctrl.Finish()
 
 	mockClient := mock_client.NewMockApiClient(ctrl)
-	mockClient.EXPECT().GetInstanceByID(gomock.Any(), TESTInstanceID).Return(nil, nil, client.ErrInstanceNotFound).AnyTimes()
+	mockClient.EXPECT().GetInstanceByID(gomock.Any(), TESTInstanceID).Return(nil,
+		nil, client.ErrInstanceNotFound).AnyTimes()
 	instanceService := instances.NewCrusoeInstances(mockClient)
 
 	// Instance shutdown by ID should return true on third attempt