Merge pull request #2208 from mattcary/no-cmek

Return failed precondition googleapi errors

Author: k8s-ci-robot

pkg/common/utils.go

@@ -97,11 +97,12 @@ var (
 
 	// userErrorCodeMap tells how API error types are translated to error codes.
 	userErrorCodeMap = map[int]codes.Code{
-		http.StatusForbidden:       codes.PermissionDenied,
-		http.StatusBadRequest:      codes.InvalidArgument,
-		http.StatusTooManyRequests: codes.ResourceExhausted,
-		http.StatusNotFound:        codes.NotFound,
-		http.StatusConflict:        codes.FailedPrecondition,
+		http.StatusForbidden:          codes.PermissionDenied,
+		http.StatusBadRequest:         codes.InvalidArgument,
+		http.StatusTooManyRequests:    codes.ResourceExhausted,
+		http.StatusNotFound:           codes.NotFound,
+		http.StatusConflict:           codes.FailedPrecondition,
+		http.StatusPreconditionFailed: codes.FailedPrecondition,
 	}
 
 	csiRetryableErrorCodes = []codes.Code{codes.Canceled, codes.DeadlineExceeded, codes.Unavailable, codes.Aborted, codes.ResourceExhausted}

pkg/common/utils_test.go

@@ -554,6 +554,11 @@ func TestCodeForError(t *testing.T) {
 			inputErr: &TemporaryError{code: codes.Aborted, err: context.Canceled},
 			expCode:  codes.Aborted,
 		},
+		{
+			name:     "CMEK precondition failed error, under layers of wrapping",
+			inputErr: fmt.Errorf("unknown Insert disk error: %w", &googleapi.Error{Code: http.StatusPreconditionFailed, Message: "CMEK policy violated"}),
+			expCode:  codes.FailedPrecondition,
+		},
 	}
 
 	for _, tc := range testCases {