refactor(utils): improve the status code checker

The responseCodeChecker method now takes raw parameters
and does more work: convert them and check the values

The resulting code is easier to use

Signed-off-by: Alexandre Bruyelles <git@jack.fr.eu.org>

Author: JackSlateur

internal/provider/curl_data_source.go

@@ -256,14 +256,7 @@ func (d *CurlDataSource) Read(ctx context.Context, req datasource.ReadRequest, r
 			bodyString = "{}"
 		}
 
-		var responseCodes []string
-		for _, v := range data.ResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				responseCodes = append(responseCodes, strVal.ValueString())
-			}
-		}
-
-		if responseCodeChecker(responseCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(data.ResponseCodes, statusCode) {
 			break
 		}
 

internal/provider/curl_ephemeral_resource.go

@@ -483,14 +483,7 @@ func (e *EphemeralCurlResource) Open(ctx context.Context, req ephemeral.OpenRequ
 			bodyString = "{}"
 		}
 
-		var responseCodes []string
-		for _, v := range data.ResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				responseCodes = append(responseCodes, strVal.ValueString())
-			}
-		}
-
-		if responseCodeChecker(responseCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(data.ResponseCodes, statusCode) {
 			break
 		}
 
@@ -1143,14 +1136,7 @@ func (e *EphemeralCurlResource) Renew(ctx context.Context, req ephemeral.RenewRe
 			bodyString = "{}"
 		}
 
-		var responseCodes []string
-		for _, v := range privateData.RenewResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				responseCodes = append(responseCodes, strVal.ValueString())
-			}
-		}
-
-		if responseCodeChecker(responseCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(privateData.RenewResponseCodes, statusCode) {
 			break
 		}
 
@@ -1497,19 +1483,10 @@ func (e *EphemeralCurlResource) Close(ctx context.Context, req ephemeral.CloseRe
 			return
 		}
 
-		var expectedCodes []string
 		tflog.Debug(ctx, fmt.Sprintf("private data response code list: %v", privateData.CloseResponseCodes.Elements()))
-		for _, v := range privateData.CloseResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				expectedCodes = append(expectedCodes, strVal.ValueString())
-			}
-		}
-
-		tflog.Debug(ctx, fmt.Sprintf("response code received: %v", statusCode))
-		tflog.Debug(ctx, fmt.Sprintf("expected response code received: %v", expectedCodes))
 
 		// Validate Response Code
-		if responseCodeChecker(expectedCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(privateData.CloseResponseCodes, statusCode) {
 			tflog.Debug(ctx, "Close request completed successfully")
 			break
 		} else {

internal/provider/curl_resource.go

@@ -574,14 +574,7 @@ func (r *CurlResource) Create(ctx context.Context, req resource.CreateRequest, r
 			bodyString = "{}"
 		}
 
-		var responseCodes []string
-		for _, v := range data.ResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				responseCodes = append(responseCodes, strVal.ValueString())
-			}
-		}
-
-		if responseCodeChecker(responseCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(data.ResponseCodes, statusCode) {
 			break
 		}
 
@@ -875,15 +868,8 @@ func (r *CurlResource) Delete(ctx context.Context, req resource.DeleteRequest, r
 			return
 		}
 
-		var expectedCodes []string
-		for _, v := range data.DestroyResponseCodes.Elements() {
-			if strVal, ok := v.(types.String); ok {
-				expectedCodes = append(expectedCodes, strVal.ValueString())
-			}
-		}
-
 		// Validate Response Code
-		if responseCodeChecker(expectedCodes, strconv.Itoa(statusCode)) {
+		if responseCodeChecker(data.DestroyResponseCodes, statusCode) {
 			tflog.Debug(ctx, "Destroy request completed successfully")
 			break
 		} else {

internal/provider/utilities.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"net/http"
 	"os"
+	"strconv"
 	"time"
 )
 
@@ -39,9 +40,18 @@ func sanitizeResponse(response string, fieldsToIgnore []string) (string, error)
 	return string(filteredBytes), nil
 }
 
-func responseCodeChecker(s []string, str string) bool {
-	for _, v := range s {
-		if v == str {
+func responseCodeChecker(expectedStatusCodes types.List, receivedStatusCode int) bool {
+	var responseStatusCodes []string
+	for _, v := range expectedStatusCodes.Elements() {
+		if strVal, ok := v.(types.String); ok {
+			responseStatusCodes = append(responseStatusCodes, strVal.ValueString())
+		}
+	}
+
+	var receivedStatusCodeAsInt = strconv.Itoa(receivedStatusCode)
+
+	for _, v := range responseStatusCodes {
+		if v == receivedStatusCodeAsInt {
 			return true
 		}
 	}

internal/provider/utilities_test.go

@@ -1,6 +1,8 @@
 package provider
 
 import (
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -51,17 +53,19 @@ func TestSanitizeResponse(t *testing.T) {
 func TestResponseCodeChecker(t *testing.T) {
 	tests := []struct {
 		name     string
-		codes    []string
-		input    string
+		codes    []attr.Value
+		input    int
 		expected bool
 	}{
-		{"Value Present", []string{"200", "404", "500"}, "404", true},
-		{"Value Absent", []string{"200", "500"}, "404", false},
+		{"Value Present", []attr.Value{types.StringValue("200"), types.StringValue("404"), types.StringValue("500")}, 404, true},
+		{"Value Absent", []attr.Value{types.StringValue("200"), types.StringValue("500")}, 404, false},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := responseCodeChecker(tt.codes, tt.input)
+			var listValue types.List
+			listValue, _ = types.ListValue(types.StringType, tt.codes)
+			result := responseCodeChecker(listValue, tt.input)
 			if result != tt.expected {
 				t.Errorf("Expected %v, got %v", tt.expected, result)
 			}