Merge pull request #3067 from 08volt/user-error

fix: categorize IP out of range error as UserError

Author: k8s-ci-robot

pkg/l4/resources/user_error.go

@@ -14,6 +14,7 @@ func IsUserError(err error) bool {
 
 	return utils.IsNetworkTierError(err) ||
 		utils.IsIPConfigurationError(err) ||
+		utils.IsIPOutOfRangeError(err) ||
 		utils.IsConflictingPortsConfigurationError(err) ||
 		utils.IsInvalidSubnetConfigurationError(err) ||
 		utils.IsInvalidLoadBalancerSourceRangesSpecError(err) ||

pkg/l4/resources/user_error_test.go

@@ -63,6 +63,11 @@ func TestIsUserError(t *testing.T) {
 			},
 			want: true,
 		},
+		{
+
+			err:  &googleapi.Error{Code: 400, Message: "Requested internal IP address is outside the network/subnetwork range"},
+			want: true,
+		},
 	}
 	for _, tC := range testCases {
 		tC := tC

pkg/utils/utils.go

@@ -279,6 +279,11 @@ func IsIPConfigurationError(err error) bool {
 	return errors.As(err, &ipConfigError)
 }
 
+// IsIPOutOfRangeError checks if error is a GCE IP out of range error.
+func IsIPOutOfRangeError(err error) bool {
+	return IsHTTPErrorCode(err, http.StatusBadRequest) && strings.Contains(err.Error(), "Requested internal IP address is outside the network/subnetwork range")
+}
+
 // IsConflictingPortsConfigurationError checks if wrapped error is an conflicting ports configuration error.
 func IsConflictingPortsConfigurationError(err error) bool {
 	var portsConflictConfigError *ConflictingPortsConfigurationError

pkg/utils/utils_test.go

@@ -1917,3 +1917,40 @@ func TestIsConstraintViolationError(t *testing.T) {
 		})
 	}
 }
+
+func TestIsIPOutOfRangeError(t *testing.T) {
+	testCases := []struct {
+		desc string
+		err  error
+		want bool
+	}{
+		{
+			desc: "nil error",
+			err:  nil,
+			want: false,
+		},
+		{
+			desc: "other googleapi error",
+			err:  &googleapi.Error{Code: http.StatusBadRequest, Message: "Some other error"},
+			want: false,
+		},
+		{
+			desc: "not a googleapi error",
+			err:  fmt.Errorf("Requested internal IP address is outside the network/subnetwork range"),
+			want: false,
+		},
+		{
+			desc: "correct googleapi error",
+			err:  &googleapi.Error{Code: http.StatusBadRequest, Message: "Invalid value for field 'resource.ipAddress': '10.24.120.53'. Requested internal IP address is outside the network/subnetwork range., invalid"},
+			want: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			if got := utils.IsIPOutOfRangeError(tc.err); got != tc.want {
+				t.Errorf("IsIPOutOfRangeError(%v) = %v, want %v", tc.err, got, tc.want)
+			}
+		})
+	}
+}