Merge pull request #1847 from amacaskill/more-op-err-codes

k8s-ci-robot · web-flow · commit b906a2a75813 · 2024-10-22T22:50:52.000+01:00
Map RESOURCE_OPERATION_RATE_EXCEEDED to ResourceExhausted
diff --git a/pkg/gce-cloud-provider/compute/gce-compute.go b/pkg/gce-cloud-provider/compute/gce-compute.go
@@ -1244,6 +1244,7 @@ func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {
 		"RATE_LIMIT_EXCEEDED":                       codes.ResourceExhausted,
 		"INVALID_USAGE":                             codes.InvalidArgument,
 		"UNSUPPORTED_OPERATION":                     codes.InvalidArgument,
+		"RESOURCE_OPERATION_RATE_EXCEEDED":          codes.ResourceExhausted,
 	}
 	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
@@ -164,6 +164,11 @@ func TestCodeForGCEOpError(t *testing.T) {
 			inputErr: computev1.OperationErrorErrors{Code: "UNSUPPORTED_OPERATION"},
 			expCode:  codes.InvalidArgument,
 		},
+		{
+			name:     "RESOURCE_OPERATION_RATE_EXCEEDED error",
+			inputErr: computev1.OperationErrorErrors{Code: "RESOURCE_OPERATION_RATE_EXCEEDED"},
+			expCode:  codes.ResourceExhausted,
+		},
 	}
 
 	for _, tc := range testCases {

Original file line number	Diff line number	Diff line change
`@@ -1244,6 +1244,7 @@ func codeForGCEOpError(err computev1.OperationErrorErrors) codes.Code {`
`1244`	`1244`	`"RATE_LIMIT_EXCEEDED": codes.ResourceExhausted,`
`1245`	`1245`	`"INVALID_USAGE": codes.InvalidArgument,`
`1246`	`1246`	`"UNSUPPORTED_OPERATION": codes.InvalidArgument,`
	`1247`	`+ "RESOURCE_OPERATION_RATE_EXCEEDED": codes.ResourceExhausted,`
`1247`	`1248`	`}`
`1248`	`1249`	`if code, ok := userErrors[err.Code]; ok {`
`1249`	`1250`	`return code`