diff --git a/tests/alloydb/alloydb_integration_test.go b/tests/alloydb/alloydb_integration_test.go index 468af718f5..a89e1c23b0 100644 --- a/tests/alloydb/alloydb_integration_test.go +++ b/tests/alloydb/alloydb_integration_test.go @@ -1129,26 +1129,26 @@ func TestAlloyDBCreateCluster(t *testing.T) { { name: "api failure", body: `{"project": "p1", "location": "l1", "cluster": "c2-api-failure", "password": "p1"}`, - want: "internal api error", - wantStatusCode: http.StatusBadRequest, + want: `{"error":"error processing GCP request: error creating AlloyDB cluster: googleapi: Error 500: internal api error"}`, + wantStatusCode: http.StatusOK, }, { name: "missing project", body: `{"location": "l1", "cluster": "c1", "password": "p1"}`, - want: `parameter \"project\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"project\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing cluster", body: `{"project": "p1", "location": "l1", "password": "p1"}`, - want: `parameter \"cluster\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"cluster\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing password", body: `{"project": "p1", "location": "l1", "cluster": "c1"}`, - want: `parameter \"password\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"password\" is required"}`, + wantStatusCode: http.StatusOK, }, } @@ -1245,26 +1245,26 @@ func TestAlloyDBCreateInstance(t *testing.T) { { name: "missing project", body: `{"location": "l1", "cluster": "c1", "instance": "i1", "instanceType": "PRIMARY"}`, - want: `parameter \"project\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"project\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing cluster", body: `{"project": "p1", "location": "l1", "instance": "i1", "instanceType": "PRIMARY"}`, - want: `parameter \"cluster\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"cluster\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing location", body: `{"project": "p1", "cluster": "c1", "instance": "i1", "instanceType": "PRIMARY"}`, - want: `parameter \"location\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"location\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing instance", body: `{"project": "p1", "location": "l1", "cluster": "c1", "instanceType": "PRIMARY"}`, - want: `parameter \"instance\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"instance\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "invalid instanceType", @@ -1371,50 +1371,50 @@ func TestAlloyDBCreateUser(t *testing.T) { { name: "api failure", body: `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u3-api-failure", "userType": "ALLOYDB_IAM_USER"}`, - want: "user internal api error", - wantStatusCode: http.StatusBadRequest, + want: `{"error":"error processing GCP request: error creating AlloyDB user: googleapi: Error 500: user internal api error"}`, + wantStatusCode: http.StatusOK, }, { name: "missing project", body: `{"location": "l1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`, - want: `parameter \"project\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"project\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing cluster", body: `{"project": "p1", "location": "l1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`, - want: `parameter \"cluster\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"cluster\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing location", body: `{"project": "p1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`, - want: `parameter \"location\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"location\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing user", body: `{"project": "p1", "location": "l1", "cluster": "c1", "userType": "ALLOYDB_IAM_USER"}`, - want: `parameter \"user\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"user\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing userType", body: `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail"}`, - want: `parameter \"userType\" is required`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"parameter \"userType\" is required"}`, + wantStatusCode: http.StatusOK, }, { name: "missing password for builtin user", body: `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_BUILT_IN"}`, - want: `password is required when userType is ALLOYDB_BUILT_IN`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"password is required when userType is ALLOYDB_BUILT_IN"}`, + wantStatusCode: http.StatusOK, }, { name: "invalid userType", body: `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail", "userType": "invalid"}`, - want: `invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'`, - wantStatusCode: http.StatusBadRequest, + want: `{"error":"invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'"}`, + wantStatusCode: http.StatusOK, }, }