Draft statusCode fixes

Author: josvazg

internal/controller/atlasproject/network_peering.go

@@ -30,6 +30,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compare"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/httputil"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/paging"
 )
@@ -185,7 +186,8 @@ func deleteUnusedContainers(context context.Context, containerService admin.Netw
 		}
 		if !compare.Contains(doNotDelete, container.GetId()) {
 			response, errDelete := containerService.DeleteGroupContainer(context, groupID, container.GetId()).Execute()
-			if errDelete != nil && response.StatusCode != http.StatusConflict { // AWS peer does not contain container id
+			statusCode := httputil.StatusCode(response)
+			if errDelete != nil && statusCode != http.StatusConflict { // AWS peer does not contain container id
 				return errDelete
 			}
 		}

internal/httputil/code.go

@@ -0,0 +1,14 @@
+package httputil
+
+import "net/http"
+
+const (
+	HTTP_CODE_UNSET = 0
+)
+
+func StatusCode(rsp *http.Response) int {
+	if rsp == nil {
+		return HTTP_CODE_UNSET
+	}
+	return rsp.StatusCode
+}

internal/translation/atlasorgsettings/service.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/httputil"
 	"go.mongodb.org/atlas-sdk/v20250312009/admin"
 )
 
@@ -41,8 +42,9 @@ func (a *AtlasOrgSettingsServiceImpl) Get(ctx context.Context, orgID string) (*A
 	if err != nil {
 		return nil, fmt.Errorf("failed to get AtlasOrgSettings: %w", err)
 	}
-	if httpResp.StatusCode != 200 {
-		return nil, fmt.Errorf("failed to get AtlasOrgSettings: expected status code 200. Got: %d", httpResp.StatusCode)
+	statusCode := httputil.StatusCode(httpResp)
+	if statusCode != 200 {
+		return nil, fmt.Errorf("failed to get AtlasOrgSettings: expected status code 200. Got: %d", statusCode)
 	}
 
 	return NewFromAtlas(orgID, resp), nil
@@ -58,8 +60,9 @@ func (a *AtlasOrgSettingsServiceImpl) Update(ctx context.Context, orgID string,
 	if err != nil {
 		return nil, fmt.Errorf("failed to update AtlasOrgSettings: %w", err)
 	}
-	if httpResp.StatusCode != 201 && httpResp.StatusCode != 200 {
-		return nil, fmt.Errorf("failed to update AtlasOrgSettings: expected status code 200 or 201. Got: %d", httpResp.StatusCode)
+	statusCode := httputil.StatusCode(httpResp)
+	if statusCode != 201 && statusCode != 200 {
+		return nil, fmt.Errorf("failed to update AtlasOrgSettings: expected status code 200 or 201. Got: %d", statusCode)
 	}
 
 	return NewFromAtlas(orgID, resp), nil

internal/translation/customroles/custom_roles.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/httputil"
 	"go.mongodb.org/atlas-sdk/v20250312009/admin"
 )
 
@@ -41,7 +42,7 @@ func NewCustomRoles(api admin.CustomDatabaseRolesApi) *CustomRoles {
 func (s *CustomRoles) Get(ctx context.Context, projectID string, roleName string) (CustomRole, error) {
 	customRole, httpResp, err := s.roleAPI.GetCustomDbRole(ctx, projectID, roleName).Execute()
 	// handle RoleNotFound error
-	if httpResp != nil && httpResp.StatusCode == http.StatusNotFound {
+	if httputil.StatusCode(httpResp) == http.StatusNotFound {
 		return CustomRole{}, nil
 	}
 	if err != nil {

internal/translation/searchindex/searchIndexsvc.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/httputil"
 	"go.mongodb.org/atlas-sdk/v20250312009/admin"
 )
 
@@ -45,15 +46,16 @@ func NewSearchIndexes(api admin.AtlasSearchApi) *SearchIndexes {
 
 func (si *SearchIndexes) GetIndex(ctx context.Context, projectID, clusterName, indexName, indexID string) (*SearchIndex, error) {
 	resp, httpResp, err := si.searchAPI.GetClusterSearchIndex(ctx, projectID, clusterName, indexID).Execute()
+	statusCode := httputil.StatusCode(httpResp)
 	if err != nil {
-		if httpResp.StatusCode == http.StatusNotFound {
+		if statusCode == http.StatusNotFound {
 			return nil, errors.Join(err, ErrNotFound)
 		}
 		return nil, err
 	}
 	if resp == nil {
 		return nil, fmt.Errorf("got empty index %s(%s), status code %d: %w",
-			indexName, indexID, httpResp.StatusCode, err)
+			indexName, indexID, statusCode, err)
 	}
 	stateInAtlas, err := fromAtlas(*resp)
 	if err != nil {
@@ -69,8 +71,10 @@ func (si *SearchIndexes) CreateIndex(ctx context.Context, projectID, clusterName
 		return nil, err
 	}
 	resp, httpResp, err := si.searchAPI.CreateClusterSearchIndex(ctx, projectID, clusterName, atlasIndex).Execute()
-	if err != nil || httpResp.StatusCode != http.StatusCreated && httpResp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("failed to create index, status code %d: %w", httpResp.StatusCode, err)
+	statusCode := httputil.StatusCode(httpResp)
+	respNotOK := (statusCode != http.StatusCreated && statusCode != http.StatusOK)
+	if err != nil || respNotOK {
+		return nil, fmt.Errorf("failed to create index, status code %d: %w", statusCode, err)
 	}
 	if resp == nil {
 		return nil, errors.New("empty response when creating index")
@@ -96,8 +100,10 @@ func (si *SearchIndexes) UpdateIndex(ctx context.Context, projectID, clusterName
 		return nil, fmt.Errorf("error converting index: %w", err)
 	}
 	resp, httpResp, err := si.searchAPI.UpdateClusterSearchIndex(ctx, projectID, clusterName, index.GetID(), atlasIndex).Execute()
-	if httpResp.StatusCode != http.StatusCreated && httpResp.StatusCode != http.StatusOK || err != nil {
-		return nil, fmt.Errorf("error updating index, status code %d: %w", httpResp.StatusCode, err)
+	statusCode := httputil.StatusCode(httpResp)
+	respNotOK := statusCode != http.StatusCreated && statusCode != http.StatusOK
+	if respNotOK || err != nil {
+		return nil, fmt.Errorf("error updating index, status code %d: %w", statusCode, err)
 	}
 	if resp == nil {
 		return nil, fmt.Errorf("update returned an empty index: %w", err)