Merge pull request #1665 from snyk/fix-google-acc-tests

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

Author: craigfurman

pkg/resource/google/testdata/acc/google_compute_ssl_certificate/.terraform.lock.hcl

@@ -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")
@@ -24,10 +25,6 @@ resource "google_compute_ssl_certificate" "default" {
   }
 }
 
-provider "google" {
-  project = "driftctl"
-}
-
 resource "random_id" "certificate" {
   byte_length = 4
   prefix      = "my-certificate-"

pkg/resource/google/testdata/acc/google_compute_ssl_certificate/terraform.tf

@@ -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"
 }

pkg/resource/google/testdata/acc/google_project_iam_member/terraform.tf

@@ -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",
   ]
 }
 
@@ -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",
   ]
 }

pkg/resource/google/testdata/acc/google_storage_bucket_iam_binding/terraform.tf

@@ -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" {
@@ -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"
 }