Merge pull request #1850 from k8s-infra-cherrypick-robot/cherry-pick-1846-to-release-1.15

[release-1.15] Add StatusConflict http kind to userErrorCodeMap.

Author: amacaskill

pkg/common/utils.go

@@ -98,6 +98,7 @@ var (
 		http.StatusBadRequest:      codes.InvalidArgument,
 		http.StatusTooManyRequests: codes.ResourceExhausted,
 		http.StatusNotFound:        codes.NotFound,
+		http.StatusConflict:        codes.FailedPrecondition,
 	}
 
 	// Regular expressions for validating parent_id, key and value of a resource tag.

pkg/common/utils_test.go

@@ -1241,6 +1241,14 @@ func TestCodeForError(t *testing.T) {
 			}),
 			expCode: codes.NotFound,
 		},
+		{
+			name: "googleapi.Error that wraps apierror.APIError of http kind status conflict",
+			inputErr: getGoogleAPIWrappedError(&googleapi.Error{
+				Code:    409,
+				Message: "status conflict error",
+			}),
+			expCode: codes.FailedPrecondition,
+		},
 		{
 			name: "googleapi.Error that wraps apierror.APIError of status kind",
 			inputErr: getGoogleAPIWrappedError(status.New(