mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-09-06 17:16:44 +00:00
Merge pull request #11735 from hashicorp/paddy_11728_with_tests
Revert backwards incompatibility in google_project.policy_data
This commit is contained in:
commit
8107cce1f4
@ -196,20 +196,6 @@ func resourceGoogleProjectRead(d *schema.ResourceData, meta interface{}) error {
|
||||
d.Set("org_id", p.Parent.Id)
|
||||
}
|
||||
|
||||
// Read the IAM policy
|
||||
pol, err := getProjectIamPolicy(pid, config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
polBytes, err := json.Marshal(pol)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
d.Set("policy_etag", pol.Etag)
|
||||
d.Set("policy_data", string(polBytes))
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -48,6 +48,34 @@ func TestAccGoogleProject_create(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
// Test that a Project resource merges the IAM policies that already
|
||||
// exist, and won't lock people out.
|
||||
func TestAccGoogleProject_merge(t *testing.T) {
|
||||
pid := "terraform-" + acctest.RandString(10)
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
Steps: []resource.TestStep{
|
||||
// when policy_data is set, merge
|
||||
{
|
||||
Config: testAccGoogleProject_toMerge(pid, pname, org),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckGoogleProjectExists("google_project.acceptance", pid),
|
||||
testAccCheckGoogleProjectHasMoreBindingsThan(pid, 1),
|
||||
),
|
||||
},
|
||||
// when policy_data is unset, restore to what it was
|
||||
{
|
||||
Config: testAccGoogleProject_mergeEmpty(pid, pname, org),
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckGoogleProjectExists("google_project.acceptance", pid),
|
||||
testAccCheckGoogleProjectHasMoreBindingsThan(pid, 0),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func testAccCheckGoogleProjectExists(r, pid string) resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
rs, ok := s.RootModule().Resources[r]
|
||||
@ -67,6 +95,19 @@ func testAccCheckGoogleProjectExists(r, pid string) resource.TestCheckFunc {
|
||||
}
|
||||
}
|
||||
|
||||
func testAccCheckGoogleProjectHasMoreBindingsThan(pid string, count int) resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
policy, err := getProjectIamPolicy(pid, testAccProvider.Meta().(*Config))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(policy.Bindings) <= count {
|
||||
return fmt.Errorf("Expected more than %d bindings, got %d: %#v", count, len(policy.Bindings), policy.Bindings)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func testAccGoogleProjectImportExisting(pid string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_project" "acceptance" {
|
||||
@ -98,3 +139,31 @@ data "google_iam_policy" "admin" {
|
||||
}
|
||||
}`, pid)
|
||||
}
|
||||
|
||||
func testAccGoogleProject_toMerge(pid, name, org string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_project" "acceptance" {
|
||||
project_id = "%s"
|
||||
name = "%s"
|
||||
org_id = "%s"
|
||||
policy_data = "${data.google_iam_policy.acceptance.policy_data}"
|
||||
}
|
||||
|
||||
data "google_iam_policy" "acceptance" {
|
||||
binding {
|
||||
role = "roles/storage.objectViewer"
|
||||
members = [
|
||||
"user:evanbrown@google.com",
|
||||
]
|
||||
}
|
||||
}`, pid, name, org)
|
||||
}
|
||||
|
||||
func testAccGoogleProject_mergeEmpty(pid, name, org string) string {
|
||||
return fmt.Sprintf(`
|
||||
resource "google_project" "acceptance" {
|
||||
project_id = "%s"
|
||||
name = "%s"
|
||||
org_id = "%s"
|
||||
}`, pid, name, org)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user