From c657e4b9fc45c6811d6eaa487e05f742b9d05a0b Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Fri, 10 Jul 2020 18:59:39 -0400
Subject: [PATCH] Fix test broken through various merges (#186)

Co-authored-by: Jim Lambert <jlambert@hashicorp.com>
---
 internal/db/migrations/postgres/06_iam.up.sql |  3 ++-
 internal/iam/role_test.go                     | 23 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/internal/db/migrations/postgres/06_iam.up.sql b/internal/db/migrations/postgres/06_iam.up.sql
index 956a4fffc5..4b40abc433 100644
--- a/internal/db/migrations/postgres/06_iam.up.sql
+++ b/internal/db/migrations/postgres/06_iam.up.sql
@@ -398,7 +398,8 @@ before
 insert on iam_role_grant
   for each row execute procedure default_create_time();
 
-create trigger immutable_scope_id
+-- prefix a_ to make this trigger run before ensure_grant_scope_id_valid
+create trigger a_immutable_scope_id
 before
 update on iam_role
   for each row execute procedure iam_immutable_scope_id_func();
diff --git a/internal/iam/role_test.go b/internal/iam/role_test.go
index c1ec714c16..d25db18e25 100644
--- a/internal/iam/role_test.go
+++ b/internal/iam/role_test.go
@@ -386,18 +386,6 @@ func Test_RoleUpdate(t *testing.T) {
 			wantErr:    true,
 			wantErrMsg: "update: failed: pq: invalid to set grant_scope_id to non-same scope_id when role scope type is project",
 		},
-		{
-			name: "attempt scope id update",
-			args: args{
-				name:           "valid" + id,
-				fieldMaskPaths: []string{"ScopeId"},
-				scopeId:        proj.PublicId,
-				opts:           []db.Option{db.WithSkipVetForWrite(true)},
-			},
-			wantErr:        true,
-			wantErrMsg:     "update: failed pq: scope_id cannot be set to " + proj.PublicId,
-			wantRowsUpdate: 0,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -469,6 +457,17 @@ func Test_RoleUpdate(t *testing.T) {
 		require.NoError(err)
 		assert.Equal(id, projRole.Name)
 	})
+	t.Run("attempt scope id update", func(t *testing.T) {
+		assert, require := assert.New(t), require.New(t)
+		role := TestRole(t, conn, org.PublicId, WithDescription(id), WithName(id))
+		updateRole := allocRole()
+		updateRole.PublicId = role.PublicId
+		updateRole.ScopeId = proj.PublicId
+		updatedRows, err := rw.Update(context.Background(), &updateRole, []string{"ScopeId"}, nil, db.WithSkipVetForWrite(true))
+		require.Error(err)
+		assert.Equal(0, updatedRows)
+		assert.Equal("update: failed: pq: scope_id cannot be set to "+proj.PublicId, err.Error())
+	})
 }
 
 func Test_RoleDelete(t *testing.T) {