Skip to content

Commit b31405f

Browse files
Fix iam3 tests by adding delay before using boundary policy (#13074) (#21411)
[upstream:c21c5e982932eababf150291980fba2ec8804599] Signed-off-by: Modular Magician <[email protected]>
1 parent 95bab69 commit b31405f

7 files changed

+67
-2
lines changed

.changelog/13074.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/iam3/resource_iam_organizations_policy_binding_generated_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ func TestAccIAM3OrganizationsPolicyBinding_iamOrganizationsPolicyBindingExample(
4242
acctest.VcrTest(t, resource.TestCase{
4343
PreCheck: func() { acctest.AccTestPreCheck(t) },
4444
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
45-
CheckDestroy: testAccCheckIAM3OrganizationsPolicyBindingDestroyProducer(t),
45+
ExternalProviders: map[string]resource.ExternalProvider{
46+
"time": {},
47+
},
48+
CheckDestroy: testAccCheckIAM3OrganizationsPolicyBindingDestroyProducer(t),
4649
Steps: []resource.TestStep{
4750
{
4851
Config: testAccIAM3OrganizationsPolicyBinding_iamOrganizationsPolicyBindingExample(context),
@@ -66,7 +69,13 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
6669
principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
6770
}
6871
72+
resource "time_sleep" "wait_60_seconds" {
73+
create_duration = "60s"
74+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
75+
}
76+
6977
resource "google_iam_organizations_policy_binding" "my-org-binding" {
78+
depends_on = [time_sleep.wait_60_seconds]
7079
organization = "%{org_id}"
7180
location = "global"
7281
display_name = "test org binding%{random_suffix}"

google/services/iam3/resource_iam_organizations_policy_binding_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ func TestAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample
2323
PreCheck: func() { acctest.AccTestPreCheck(t) },
2424
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2525
CheckDestroy: testAccCheckIAM3OrganizationsPolicyBindingDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
2629
Steps: []resource.TestStep{
2730
{
2831
Config: testAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample_full(context),
@@ -56,7 +59,14 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
5659
principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
5760
}
5861
62+
resource "time_sleep" "wait_60_seconds" {
63+
create_duration = "60s"
64+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
65+
}
66+
67+
5968
resource "google_iam_organizations_policy_binding" "my_org_binding" {
69+
depends_on = [time_sleep.wait_60_seconds]
6070
organization = "%{org_id}"
6171
location = "global"
6272
display_name = "test org binding%{random_suffix}"
@@ -79,7 +89,13 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
7989
principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
8090
}
8191
92+
resource "time_sleep" "wait_60_seconds" {
93+
create_duration = "60s"
94+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
95+
}
96+
8297
resource "google_iam_organizations_policy_binding" "my_org_binding" {
98+
depends_on = [time_sleep.wait_60_seconds]
8399
organization = "%{org_id}"
84100
location = "global"
85101
display_name = "test org binding%{random_suffix}"

google/services/iam3/resource_iam_projects_policy_binding_generated_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample(t *testing
4242
acctest.VcrTest(t, resource.TestCase{
4343
PreCheck: func() { acctest.AccTestPreCheck(t) },
4444
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
45-
CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t),
45+
ExternalProviders: map[string]resource.ExternalProvider{
46+
"time": {},
47+
},
48+
CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t),
4649
Steps: []resource.TestStep{
4750
{
4851
Config: testAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample(context),
@@ -70,7 +73,13 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
7073
principal_access_boundary_policy_id = "tf-test-my-pab-policy%{random_suffix}"
7174
}
7275
76+
resource "time_sleep" "wait_60_seconds" {
77+
create_duration = "60s"
78+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
79+
}
80+
7381
resource "google_iam_projects_policy_binding" "my-project-binding" {
82+
depends_on = [time_sleep.wait_60_seconds]
7483
project = data.google_project.project.project_id
7584
location = "global"
7685
display_name = "test project binding%{random_suffix}"

google/services/iam3/resource_iam_projects_policy_binding_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(t *
2323
PreCheck: func() { acctest.AccTestPreCheck(t) },
2424
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2525
CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
2629
Steps: []resource.TestStep{
2730
{
2831
Config: testAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_full(context),
@@ -68,7 +71,13 @@ data "google_project" "project" {
6871
provider = google
6972
}
7073
74+
resource "time_sleep" "wait_60_seconds" {
75+
create_duration = "60s"
76+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
77+
}
78+
7179
resource "google_iam_projects_policy_binding" "my-project-binding" {
80+
depends_on = [time_sleep.wait_60_seconds]
7281
project = data.google_project.project.project_id
7382
location = "global"
7483
display_name = "test project binding%{random_suffix}"
@@ -95,7 +104,14 @@ data "google_project" "project" {
95104
provider = google
96105
}
97106
107+
resource "time_sleep" "wait_60_seconds" {
108+
create_duration = "60s"
109+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
110+
}
111+
112+
98113
resource "google_iam_projects_policy_binding" "my-project-binding" {
114+
depends_on = [time_sleep.wait_60_seconds]
99115
project = data.google_project.project.project_id
100116
location = "global"
101117
display_name = "test project binding%{random_suffix}"

website/docs/r/iam_organizations_policy_binding.html.markdown

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
3939
principal_access_boundary_policy_id = "my-pab-policy"
4040
}
4141
42+
resource "time_sleep" "wait_60_seconds" {
43+
create_duration = "60s"
44+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
45+
}
46+
4247
resource "google_iam_organizations_policy_binding" "my-org-binding" {
48+
depends_on = [time_sleep.wait_60_seconds]
4349
organization = "123456789"
4450
location = "global"
4551
display_name = "test org binding"

website/docs/r/iam_projects_policy_binding.html.markdown

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" {
4343
principal_access_boundary_policy_id = "my-pab-policy"
4444
}
4545
46+
resource "time_sleep" "wait_60_seconds" {
47+
create_duration = "60s"
48+
depends_on = [google_iam_principal_access_boundary_policy.pab_policy]
49+
}
50+
4651
resource "google_iam_projects_policy_binding" "my-project-binding" {
52+
depends_on = [time_sleep.wait_60_seconds]
4753
project = data.google_project.project.project_id
4854
location = "global"
4955
display_name = "test project binding"

0 commit comments

Comments
 (0)