Fix tests for latest provider version

GoogleCloudPlatform · Jan 3, 2023 · 0013fc2 · 0013fc2
1 parent 6c7b15c
commit 0013fc2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/modules/net-vpc/README.md b/modules/net-vpc/README.md
@@ -76,8 +76,8 @@ module "vpc-spoke-1" {
 locals {
   service_project_1 = {
     project_id                     = "project1"
-    gke_service_account            = "gke"
-    cloud_services_service_account = "cloudsvc"
+    gke_service_account            = "serviceAccount:gke"
+    cloud_services_service_account = "serviceAccount:cloudsvc"
   }
   service_project_2 = {
     project_id = "project2"

diff --git a/tests/modules/logging_bucket/test_plan.py b/tests/modules/logging_bucket/test_plan.py
@@ -12,16 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 def test_project_logging_bucket(plan_runner):
   "Test project logging bucket."
-  _, resources = plan_runner(parent_type="project",
-                             parent="myproject")
+  _, resources = plan_runner(parent_type="project", parent="myproject")
   assert len(resources) == 1
 
   resource = resources[0]
   assert resource["type"] == "google_logging_project_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "project": "myproject",
       "location": "global",
       "retention_days": 30,
@@ -30,15 +31,14 @@ def test_project_logging_bucket(plan_runner):
 
 def test_folder_logging_bucket(plan_runner):
   "Test project logging bucket."
-  _, resources = plan_runner(
-      parent_type="folder", parent="folders/0123456789"
-  )
+  _, resources = plan_runner(parent_type="folder", parent="folders/0123456789")
   assert len(resources) == 1
 
   resource = resources[0]
   assert resource["type"] == "google_logging_folder_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "folder": "folders/0123456789",
       "location": "global",
       "retention_days": 30,
@@ -47,15 +47,15 @@ def test_folder_logging_bucket(plan_runner):
 
 def test_organization_logging_bucket(plan_runner):
   "Test project logging bucket."
-  _, resources = plan_runner(
-      parent_type="organization", parent="organizations/0123456789"
-  )
+  _, resources = plan_runner(parent_type="organization",
+                             parent="organizations/0123456789")
   assert len(resources) == 1
 
   resource = resources[0]
   assert resource["type"] == "google_logging_organization_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "organization": "organizations/0123456789",
       "location": "global",
       "retention_days": 30,
@@ -64,15 +64,14 @@ def test_organization_logging_bucket(plan_runner):
 
 def test_billing_account_logging_bucket(plan_runner):
   "Test project logging bucket."
-  _, resources = plan_runner(
-      parent_type="billing_account", parent="0123456789"
-  )
+  _, resources = plan_runner(parent_type="billing_account", parent="0123456789")
   assert len(resources) == 1
 
   resource = resources[0]
   assert resource["type"] == "google_logging_billing_account_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "billing_account": "0123456789",
       "location": "global",
       "retention_days": 30,