Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[CTX-601] chore: fix some Google acceptance tests #1665

Merged
merged 1 commit into from
Jun 1, 2023
Merged

[CTX-601] chore: fix some Google acceptance tests #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pkg/resource/google/testdata/acc/google_compute_ssl_certificate/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 9 additions & 12 deletions pkg/resource/google/testdata/acc/google_compute_ssl_certificate/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
provider "google" {}

terraform {
required_version = "~> 0.15.0"
required_providers {
google = {
version = "3.78.0"
}
required_version = "~> 0.15.0"
required_providers {
google = {
version = "3.78.0"
}
}
}

resource "random_string" "postfix" {
length = 6
upper = false
special = false
length = 6
upper = false
special = false
}

resource "google_compute_ssl_certificate" "default" {
name = random_id.certificate.hex
private_key = file("host.key")
Expand All @@ -24,10 +25,6 @@ resource "google_compute_ssl_certificate" "default" {
}
}

provider "google" {
project = "driftctl"
}

resource "random_id" "certificate" {
byte_length = 4
prefix = "my-certificate-"
Expand Down
4 changes: 2 additions & 2 deletions pkg/resource/google/testdata/acc/google_project_iam_member/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ terraform {

resource "google_project_iam_member" "elie1" {
role = "roles/editor"
member = "user:cloud-context-team@snyk.io"
member = "group:cloud-context-team@snyk.io"
}

resource "google_project_iam_member" "will1" {
role = "roles/viewer"
member = "user:cloud-context-team@snyk.io"
member = "group:cloud-context-team@snyk.io"
}
6 changes: 3 additions & 3 deletions pkg/resource/google/testdata/acc/google_storage_bucket_iam_binding/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ resource "google_storage_bucket_iam_binding" "binding_admin_1" {
bucket = google_storage_bucket.driftctl-unittest.name
role = "roles/storage.admin"
members = [
"user:team-cloud-context@snyk.io",
"group:cloud-context-team@snyk.io",
]
}

resource "google_storage_bucket_iam_binding" "binding_viewer_1" {
bucket = google_storage_bucket.driftctl-unittest.name
role = "roles/storage.objectViewer"
members = [
"user:team-cloud-context@snyk.io",
"group:cloud-context-team@snyk.io",
]
}

Expand All @@ -45,6 +45,6 @@ resource "google_storage_bucket_iam_binding" "binding_admin_2" {
bucket = google_storage_bucket.driftctl-unittest2.name
role = "roles/storage.admin"
members = [
"user:team-cloud-context@snyk.io",
"group:cloud-context-team@snyk.io",
]
}
8 changes: 4 additions & 4 deletions pkg/resource/google/testdata/acc/google_storage_bucket_iam_member/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ resource "google_storage_bucket" "driftctl-unittest" {
resource "google_storage_bucket_iam_member" "elie1" {
bucket = google_storage_bucket.driftctl-unittest.name
role = "roles/storage.admin"
member = "user:team-cloud-context@snyk.io"
member = "group:cloud-context-team@snyk.io"
}

resource "google_storage_bucket_iam_member" "will1" {
bucket = google_storage_bucket.driftctl-unittest.name
role = "roles/storage.objectViewer"
member = "user:team-cloud-context@snyk.io"
member = "group:cloud-context-team@snyk.io"
}

resource "google_storage_bucket" "driftctl-unittest2" {
Expand All @@ -40,11 +40,11 @@ resource "google_storage_bucket" "driftctl-unittest2" {
resource "google_storage_bucket_iam_member" "eli2" {
bucket = google_storage_bucket.driftctl-unittest2.name
role = "roles/storage.objectViewer"
member = "user:team-cloud-context@snyk.io"
member = "group:cloud-context-team@snyk.io"
}

resource "google_storage_bucket_iam_member" "will2" {
bucket = google_storage_bucket.driftctl-unittest2.name
role = "roles/storage.admin"
member = "user:team-cloud-context@snyk.io"
member = "group:cloud-context-team@snyk.io"
}