Skip to content

Commit

Permalink
Add sleeps to IAP tests. Need to wait for IAM permissions (#5188) (#1…
Browse files Browse the repository at this point in the history
…0070)

* Add sleeps to IAP tests. Need to wait for IAM permissions to propagate on new account

* Fix typo

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Sep 14, 2021
1 parent a6f2559 commit 1d1c2d9
Show file tree
Hide file tree
Showing 10 changed files with 251 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .changelog/5188.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
57 changes: 57 additions & 0 deletions google/iam_iap_tunnel_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ func TestAccIapTunnelIamBindingGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
Config: testAccIapTunnelIamBinding_basicGenerated(context),
Expand Down Expand Up @@ -69,6 +73,10 @@ func TestAccIapTunnelIamMemberGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
// Test Iam Member creation (no update for member, no need to test)
Expand Down Expand Up @@ -96,6 +104,10 @@ func TestAccIapTunnelIamPolicyGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
Config: testAccIapTunnelIamPolicy_basicGenerated(context),
Expand Down Expand Up @@ -127,9 +139,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_tunnel_iam_member" "foo" {
Expand All @@ -148,9 +169,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
data "google_iam_policy" "foo" {
Expand All @@ -175,9 +205,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
data "google_iam_policy" "foo" {
Expand All @@ -198,9 +237,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_tunnel_iam_binding" "foo" {
Expand All @@ -219,9 +267,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_tunnel_iam_binding" "foo" {
Expand Down
57 changes: 57 additions & 0 deletions google/iam_iap_web_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ func TestAccIapWebIamBindingGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
Config: testAccIapWebIamBinding_basicGenerated(context),
Expand Down Expand Up @@ -69,6 +73,10 @@ func TestAccIapWebIamMemberGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
// Test Iam Member creation (no update for member, no need to test)
Expand Down Expand Up @@ -96,6 +104,10 @@ func TestAccIapWebIamPolicyGenerated(t *testing.T) {
vcrTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"random": {},
"time": {},
},
Steps: []resource.TestStep{
{
Config: testAccIapWebIamPolicy_basicGenerated(context),
Expand Down Expand Up @@ -127,9 +139,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_web_iam_member" "foo" {
Expand All @@ -148,9 +169,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
data "google_iam_policy" "foo" {
Expand All @@ -175,9 +205,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
data "google_iam_policy" "foo" {
Expand All @@ -198,9 +237,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_web_iam_binding" "foo" {
Expand All @@ -219,9 +267,18 @@ resource "google_project" "project" {
org_id = "%{org_id}"
}
resource "time_sleep" "wait_60_seconds" {
depends_on = [google_project.project]
create_duration = "60s"
}
resource "google_project_service" "project_service" {
project = google_project.project.project_id
service = "iap.googleapis.com"
# Needed for CI tests for permissions to propagate, should not be needed for actual usage
depends_on = [time_sleep.wait_60_seconds]
}
resource "google_iap_web_iam_binding" "foo" {
Expand Down
Loading

0 comments on commit 1d1c2d9

Please sign in to comment.