Merge pull request #1610 from k8s-infra-cherrypick-robot/cherry-pick-1606-to-release-1.13

k8s-ci-robot · web-flow · commit 19900332670e · 2024-02-16T18:04:56.000-08:00
[release-1.13] Map UNSUPPORTED_OPERATION GCE operation error codes to InvalidArgument
diff --git a/pkg/gce-cloud-provider/compute/gce-compute.go b/pkg/gce-cloud-provider/compute/gce-compute.go
@@ -978,6 +978,7 @@ func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {
 		"REGION_QUOTA_EXCEEDED":                     codes.ResourceExhausted,
 		"RATE_LIMIT_EXCEEDED":                       codes.ResourceExhausted,
 		"INVALID_USAGE":                             codes.InvalidArgument,
+		"UNSUPPORTED_OPERATION":                     codes.InvalidArgument,
 	}
 	if code, ok := userErrors[err.Code]; ok {
 		return code
diff --git a/pkg/gce-cloud-provider/compute/gce-compute_test.go b/pkg/gce-cloud-provider/compute/gce-compute_test.go
@@ -162,7 +162,7 @@ func TestCodeForGCEOpError(t *testing.T) {
 		{
 			name:     "UNSUPPORTED_OPERATION error",
 			inputErr: computev1.OperationErrorErrors{Code: "UNSUPPORTED_OPERATION"},
-			expCode:  codes.Internal,
+			expCode:  codes.InvalidArgument,
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,7 @@ func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {`
`978`	`978`	`"REGION_QUOTA_EXCEEDED": codes.ResourceExhausted,`
`979`	`979`	`"RATE_LIMIT_EXCEEDED": codes.ResourceExhausted,`
`980`	`980`	`"INVALID_USAGE": codes.InvalidArgument,`
	`981`	`+ "UNSUPPORTED_OPERATION": codes.InvalidArgument,`
`981`	`982`	`}`
`982`	`983`	`if code, ok := userErrors[err.Code]; ok {`
`983`	`984`	`return code`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func TestCodeForGCEOpError(t *testing.T) {`
`162`	`162`	`{`
`163`	`163`	`name: "UNSUPPORTED_OPERATION error",`
`164`	`164`	`inputErr: computev1.OperationErrorErrors{Code: "UNSUPPORTED_OPERATION"},`
`165`		`- expCode: codes.Internal,`
	`165`	`+ expCode: codes.InvalidArgument,`
`166`	`166`	`},`
`167`	`167`	`}`
`168`	`168`