Skip to content

Commit 6d1758a

Browse files
committed
fix: test
1 parent e81b7a1 commit 6d1758a

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

examples/setup/main.tf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,14 @@ resource "bytebase_user" "project_developer" {
110110
title = "Developer"
111111
112112

113-
# Grant workspace level roles, will grant projectViewer for this user in all projects.
113+
# Grant workspace level roles, will grant projectViewer for this user in all
114114
roles = ["roles/projectViewer"]
115115
}
116116

117117
# Create a new project
118118
resource "bytebase_project" "sample_project" {
119119
depends_on = [
120+
bytebase_user.workspace_dba,
120121
bytebase_user.project_developer
121122
]
122123

@@ -125,8 +126,8 @@ resource "bytebase_project" "sample_project" {
125126
key = "SAMM"
126127

127128
members {
128-
member = format("user:%s", bytebase_user.project_developer.email)
129-
role = "roles/projectDeveloper"
129+
member = format("user:%s", bytebase_user.workspace_dba.email)
130+
role = "roles/projectOwner"
130131
}
131132

132133
members {
@@ -270,5 +271,3 @@ resource "bytebase_vcs_connector" "github" {
270271
repository_branch = "main"
271272
repository_url = "https://github.com/ed-bytebase/gitops"
272273
}
273-
274-

provider/resource_project.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,7 @@ func updateMembersInProject(ctx context.Context, d *schema.ResourceData, client
485485
}
486486

487487
if !existProjectOwner {
488-
// Make sure we have the project owner.
489-
iamPolicy.Bindings = append(iamPolicy.Bindings, &v1pb.Binding{
490-
Role: "roles/projectOwner",
491-
Members: []string{
492-
fmt.Sprintf("user:%s", client.GetCaller().Email),
493-
},
494-
})
488+
return diag.Errorf("require at least 1 member with roles/projectOwner role")
495489
}
496490

497491
if len(iamPolicy.Bindings) > 0 {

provider/resource_project_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ func testAccCheckProjectResource(identifier, resourceID, title, key string) stri
7676
resource_id = "%s"
7777
title = "%s"
7878
key = "%s"
79+
80+
members {
81+
member = "user:[email protected]"
82+
role = "roles/projectOwner"
83+
}
7984
}
8085
`, identifier, resourceID, title, key)
8186
}

0 commit comments

Comments
 (0)