Merge branch 'master' into yuryninog-patch-1

2022-01-03 10:47:27 -05:00
parent a22169dcd2 98ac4d8f02
commit a3da60bc71
765 changed files with 5038 additions and 3475 deletions
--- a/tests/init.py
+++ b/tests/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/asset_inventory_feed_remediation/init.py
+++ b/tests/cloud_operations/asset_inventory_feed_remediation/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/asset_inventory_feed_remediation/fixture/main.tf
+++ b/tests/cloud_operations/asset_inventory_feed_remediation/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/asset_inventory_feed_remediation/fixture/variables.tf
+++ b/tests/cloud_operations/asset_inventory_feed_remediation/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/asset_inventory_feed_remediation/test_plan.py
+++ b/tests/cloud_operations/asset_inventory_feed_remediation/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_fine_grained_iam/init.py
+++ b/tests/cloud_operations/dns_fine_grained_iam/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_fine_grained_iam/fixture/main.tf
+++ b/tests/cloud_operations/dns_fine_grained_iam/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_fine_grained_iam/fixture/variables.tf
+++ b/tests/cloud_operations/dns_fine_grained_iam/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_fine_grained_iam/test_plan.py
+++ b/tests/cloud_operations/dns_fine_grained_iam/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_shared_vpc/init.py
+++ b/tests/cloud_operations/dns_shared_vpc/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_shared_vpc/fixture/main.tf
+++ b/tests/cloud_operations/dns_shared_vpc/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_shared_vpc/fixture/variables.tf
+++ b/tests/cloud_operations/dns_shared_vpc/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/dns_shared_vpc/test_plan.py
+++ b/tests/cloud_operations/dns_shared_vpc/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/iam_delegated_role_grants/init.py
+++ b/tests/cloud_operations/iam_delegated_role_grants/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/iam_delegated_role_grants/fixture/main.tf
+++ b/tests/cloud_operations/iam_delegated_role_grants/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/iam_delegated_role_grants/fixture/variables.tf
+++ b/tests/cloud_operations/iam_delegated_role_grants/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/iam_delegated_role_grants/test_plan.py
+++ b/tests/cloud_operations/iam_delegated_role_grants/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "fixture")

 def test_resources(e2e_plan_runner):
  "Test that plan works and the numbers of resources is as expected."
-  modules, resources = e2e_plan_runner(FIXTURES_DIR, include_bare_resources=True)
+  modules, resources = e2e_plan_runner(
+      FIXTURES_DIR, include_bare_resources=True)
  assert len(modules) == 1
  assert len(resources) == 4

--- a/tests/cloud_operations/onprem_sa_key_management/init.py
+++ b/tests/cloud_operations/onprem_sa_key_management/init.py
@@ -0,0 +1,13 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
--- a/tests/cloud_operations/onprem_sa_key_management/fixture/main.tf
+++ b/tests/cloud_operations/onprem_sa_key_management/fixture/main.tf
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "test" {
+  source         = "../../../../cloud-operations/onprem-sa-key-management"
+  project_create = var.project_create
+  project_id     = var.project_id
+}
--- a/tests/cloud_operations/onprem_sa_key_management/fixture/variables.tf
+++ b/tests/cloud_operations/onprem_sa_key_management/fixture/variables.tf
@@ -0,0 +1,23 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+variable "project_create" {
+  type    = bool
+  default = true
+}
+
+variable "project_id" {
+  type    = string
+  default = "test"
+}
--- a/tests/cloud_operations/onprem_sa_key_management/test_plan.py
+++ b/tests/cloud_operations/onprem_sa_key_management/test_plan.py
@@ -0,0 +1,27 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import os
+import pytest
+
+
+FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixture')
+
+
+def test_resources(e2e_plan_runner):
+  "Test that plan works and the numbers of resources is as expected."
+  modules, resources = e2e_plan_runner(FIXTURES_DIR)
+  assert len(modules) == 3
+  assert len(resources) == 7
--- a/tests/cloud_operations/packer_image_builder/init.py
+++ b/tests/cloud_operations/packer_image_builder/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/packer_image_builder/fixture/main.tf
+++ b/tests/cloud_operations/packer_image_builder/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/packer_image_builder/fixture/variables.tf
+++ b/tests/cloud_operations/packer_image_builder/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/packer_image_builder/test_plan.py
+++ b/tests/cloud_operations/packer_image_builder/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,11 +22,13 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "fixture")

 def test_resources(e2e_plan_runner):
  "Test that plan works and the numbers of resources is as expected."
-  modules, resources = e2e_plan_runner(FIXTURES_DIR, include_bare_resources="true")
+  modules, resources = e2e_plan_runner(
+      FIXTURES_DIR, include_bare_resources="true")

  assert len(modules) == 6
  assert len(resources) == 16

-  modules, resources = e2e_plan_runner(FIXTURES_DIR, include_bare_resources="true", create_packer_vars="true")
+  modules, resources = e2e_plan_runner(
+      FIXTURES_DIR, include_bare_resources="true", create_packer_vars="true")
  assert len(modules) == 6
  assert len(resources) == 17
--- a/tests/cloud_operations/quota_monitoring/init.py
+++ b/tests/cloud_operations/quota_monitoring/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/quota_monitoring/fixture/main.tf
+++ b/tests/cloud_operations/quota_monitoring/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/quota_monitoring/fixture/variables.tf
+++ b/tests/cloud_operations/quota_monitoring/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/quota_monitoring/test_plan.py
+++ b/tests/cloud_operations/quota_monitoring/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/init.py
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/bundle_cffile.zip
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/bundle_cffile.zip
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/cffile/README
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/cffile/README
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/main.tf
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ module "test" {
  source          = "../../../../cloud-operations/scheduled-asset-inventory-export-bq"
  billing_account = var.billing_account
  cai_config      = var.cai_config
+  cai_gcs_export  = var.cai_gcs_export
+  file_config     = var.file_config
  project_create  = var.project_create
  project_id      = var.project_id
 }
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/variables.tf
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,17 +19,42 @@ variable "billing_account" {

 variable "cai_config" {
  type = object({
-    bq_dataset  = string
-    bq_table    = string
-    target_node = string
+    bq_dataset         = string
+    bq_table           = string
+    bq_table_overwrite = bool
+    target_node        = string
  })
  default = {
-    bq_dataset  = "my-dataset"
-    bq_table    = "my_table"
-    target_node = "organization/1234567890"
+    bq_dataset         = "my-dataset"
+    bq_table           = "my_table"
+    bq_table_overwrite = "true"
+    target_node        = "organization/1234567890"
  }
 }

+variable "cai_gcs_export" {
+  type    = bool
+  default = true
+}
+
+variable "file_config" {
+  type = object({
+    bucket     = string
+    filename   = string
+    format     = string
+    bq_dataset = string
+    bq_table   = string
+  })
+  default = {
+    bucket     = "my-bucket"
+    filename   = "my-folder/myfile.json"
+    format     = "NEWLINE_DELIMITED_JSON"
+    bq_dataset = "my-dataset"
+    bq_table   = "my_table"
+  }
+}
+
+
 variable "project_create" {
  type    = bool
  default = true
--- a/tests/cloud_operations/scheduled_asset_inventory_export_bq/test_plan.py
+++ b/tests/cloud_operations/scheduled_asset_inventory_export_bq/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,5 +23,5 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixture')
 def test_resources(e2e_plan_runner):
  "Test that plan works and the numbers of resources is as expected."
  modules, resources = e2e_plan_runner(FIXTURES_DIR)
-  assert len(modules) == 5
-  assert len(resources) == 23
+  assert len(modules) == 7
+  assert len(resources) == 29
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ def _plan_runner():
    "Runs Terraform plan and returns parsed output."
    tf = tftest.TerraformTest(fixture_path, BASEDIR,
                              os.environ.get('TERRAFORM', 'terraform'))
-    tf.setup()
+    tf.setup(upgrade=True)
    return tf.plan(output=True, refresh=refresh, tf_vars=tf_vars, targets=targets)

  return run_plan
@@ -57,7 +57,8 @@ def e2e_plan_runner(_plan_runner):
  def run_plan(fixture_path, targets=None, refresh=True,
               include_bare_resources=False, **tf_vars):
    "Runs Terraform plan on an end-to-end module using defaults, returns data."
-    plan = _plan_runner(fixture_path, targets=targets, refresh=refresh, **tf_vars)
+    plan = _plan_runner(fixture_path, targets=targets,
+                        refresh=refresh, **tf_vars)
    # skip the fixture
    root_module = plan.root_module['child_modules'][0]
    modules = dict((mod['address'], mod['resources'])
@@ -79,9 +80,10 @@ def example_plan_runner(_plan_runner):
    "Runs Terraform plan and returns count of modules and resources."
    plan = _plan_runner(fixture_path)
    # the fixture is the example we are testing
+    modules = plan.modules or {}
    return (
-        len(plan.modules),
-        sum(len(m.resources) for m in plan.modules.values()))
+        len(modules),
+        sum(len(m.resources) for m in modules.values()))

  return run_plan

@@ -94,7 +96,7 @@ def apply_runner():
    "Runs Terraform apply and returns parsed output"
    tf = tftest.TerraformTest(fixture_path, BASEDIR,
                              os.environ.get('TERRAFORM', 'terraform'))
-    tf.setup()
+    tf.setup(upgrade=True)
    apply = tf.apply(tf_vars=tf_vars)
    output = tf.output(json_format=True)
    return apply, output
--- a/tests/data_solutions/cmek_via_centralized_kms/init.py
+++ b/tests/data_solutions/cmek_via_centralized_kms/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/data_solutions/cmek_via_centralized_kms/fixture/main.tf
+++ b/tests/data_solutions/cmek_via_centralized_kms/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/cmek_via_centralized_kms/fixture/variables.tf
+++ b/tests/data_solutions/cmek_via_centralized_kms/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/cmek_via_centralized_kms/test_plan.py
+++ b/tests/data_solutions/cmek_via_centralized_kms/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/data_solutions/data_platform_foundations/init.py
+++ b/tests/data_solutions/data_platform_foundations/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/data_solutions/data_platform_foundations/fixture/main.tf
+++ b/tests/data_solutions/data_platform_foundations/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/data_platform_foundations/fixture/variables.tf
+++ b/tests/data_solutions/data_platform_foundations/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/data_platform_foundations/test_plan.py
+++ b/tests/data_solutions/data_platform_foundations/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/data_solutions/gcs_to_bq_with_dataflow/init.py
+++ b/tests/data_solutions/gcs_to_bq_with_dataflow/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/main.tf
+++ b/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/variables.tf
+++ b/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/data_solutions/gcs_to_bq_with_dataflow/test_plan.py
+++ b/tests/data_solutions/gcs_to_bq_with_dataflow/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/examples/conftest.py
+++ b/tests/examples/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,15 +23,16 @@ MODULES_PATH = Path(__file__).parents[2] / 'modules/'
 def pytest_generate_tests(metafunc):
  if 'example' in metafunc.fixturenames:
    modules = [
-      x for x in MODULES_PATH.iterdir()
-      if x.is_dir()
+        x for x in MODULES_PATH.iterdir()
+        if x.is_dir()
    ]
    modules.sort()
    examples = []
    ids = []
    for module in modules:
      readme = module / 'README.md'
-      if not readme.exists(): continue
+      if not readme.exists():
+        continue
      doc = marko.parse(readme.read_text())
      index = 0
      for child in doc.children:
--- a/tests/examples/test_plan.py
+++ b/tests/examples/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/examples/variables.tf
+++ b/tests/examples/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/init.py
+++ b/tests/factories/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/firewall_hierarchical_policies/init.py
+++ b/tests/factories/firewall_hierarchical_policies/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/firewall_hierarchical_policies/fixture/main.tf
+++ b/tests/factories/firewall_hierarchical_policies/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/factories/firewall_hierarchical_policies/test_plan.py
+++ b/tests/factories/firewall_hierarchical_policies/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/subnets/init.py
+++ b/tests/factories/subnets/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/subnets/fixture/main.tf
+++ b/tests/factories/subnets/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,4 +17,4 @@
 module "subnets" {
  source        = "../../../../factories/subnets"
  config_folder = "conf"
-}
+}
--- a/tests/factories/subnets/test_plan.py
+++ b/tests/factories/subnets/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/init.py
+++ b/tests/factories/vpc_firewall/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/flat/init.py
+++ b/tests/factories/vpc_firewall/flat/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/flat/fixture/main.tf
+++ b/tests/factories/vpc_firewall/flat/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/flat/fixture/rules/common.yaml
+++ b/tests/factories/vpc_firewall/flat/fixture/rules/common.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,24 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-
 # allow ingress from GCLB to all instances in the network
 lb-health-checks:
  allow:
-  - ports: []
-    protocol: tcp
+    - ports: []
+      protocol: tcp
  direction: INGRESS
  priority: 1001
  source_ranges:
-  - 35.191.0.0/16
-  - 130.211.0.0/22
+    - 35.191.0.0/16
+    - 130.211.0.0/22

 # deny all egress
 deny-all:
  deny:
-  - ports: []
-    protocol: all
+    - ports: []
+      protocol: all
  direction: EGRESS
  priority: 65535
  destination_ranges:
-  - 0.0.0.0/0
+    - 0.0.0.0/0
--- a/tests/factories/vpc_firewall/flat/fixture/variables.tf
+++ b/tests/factories/vpc_firewall/flat/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/flat/test_plan.py
+++ b/tests/factories/vpc_firewall/flat/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,30 +21,30 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixture')


 def test_firewall_simple(plan_runner):
-    "Test firewall rules from rules/common.yaml with no extra options."
-    _, resources = plan_runner(FIXTURES_DIR)
-    assert len(resources) == 4
-    assert set(r['type'] for r in resources) == set([
-        'google_compute_firewall', 'time_static'
-    ])
-    firewall_values = [r['values'] for r in resources if r['type']
-                       == 'google_compute_firewall']
-    assert set([f['project'] for f in firewall_values]) == set(['my-project'])
-    assert set([f['network'] for f in firewall_values]) == set(['my-network'])
+  "Test firewall rules from rules/common.yaml with no extra options."
+  _, resources = plan_runner(FIXTURES_DIR)
+  assert len(resources) == 4
+  assert set(r['type'] for r in resources) == set([
+      'google_compute_firewall', 'time_static'
+  ])
+  firewall_values = [r['values'] for r in resources if r['type']
+                     == 'google_compute_firewall']
+  assert set([f['project'] for f in firewall_values]) == set(['my-project'])
+  assert set([f['network'] for f in firewall_values]) == set(['my-network'])


 def test_firewall_log_config(plan_runner):
-    "Test firewall rules log configuration."
-    log_config = """ {
+  "Test firewall rules log configuration."
+  log_config = """ {
      metadata = "INCLUDE_ALL_METADATA"
    }
    """
-    log_config_value = [{"metadata": "INCLUDE_ALL_METADATA"}]
-    _, resources = plan_runner(FIXTURES_DIR, log_config=log_config)
-    assert len(resources) == 4
-    assert set(r['type'] for r in resources) == set([
-        'google_compute_firewall', 'time_static'
-    ])
-    firewall_values = [r['values'] for r in resources if r['type']
-                       == 'google_compute_firewall']
-    assert all(f['log_config'] == log_config_value for f in firewall_values)
+  log_config_value = [{"metadata": "INCLUDE_ALL_METADATA"}]
+  _, resources = plan_runner(FIXTURES_DIR, log_config=log_config)
+  assert len(resources) == 4
+  assert set(r['type'] for r in resources) == set([
+      'google_compute_firewall', 'time_static'
+  ])
+  firewall_values = [r['values'] for r in resources if r['type']
+                     == 'google_compute_firewall']
+  assert all(f['log_config'] == log_config_value for f in firewall_values)
--- a/tests/factories/vpc_firewall/nested/init.py
+++ b/tests/factories/vpc_firewall/nested/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/nested/fixture/main.tf
+++ b/tests/factories/vpc_firewall/nested/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/factories/vpc_firewall/nested/test_plan.py
+++ b/tests/factories/vpc_firewall/nested/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/init.py
+++ b/tests/foundations/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/business_units/init.py
+++ b/tests/foundations/business_units/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/business_units/fixture/main.tf
+++ b/tests/foundations/business_units/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/foundations/business_units/fixture/variables.tf
+++ b/tests/foundations/business_units/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/business_units/test_plan.py
+++ b/tests/foundations/business_units/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/environments/init.py
+++ b/tests/foundations/environments/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/environments/fixture/main.tf
+++ b/tests/foundations/environments/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/foundations/environments/fixture/variables.tf
+++ b/tests/foundations/environments/fixture/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/foundations/environments/test_plan.py
+++ b/tests/foundations/environments/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/init.py
+++ b/tests/modules/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,5 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
--- a/tests/modules/apigee_organization/init.py
+++ b/tests/modules/apigee_organization/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/apigee_organization/fixture/main.tf
+++ b/tests/modules/apigee_organization/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/apigee_organization/fixture/variables.tf
+++ b/tests/modules/apigee_organization/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@ variable "analytics_region" {
 variable "network" {
  type    = string
  default = "apigee-vpc"
-}
+}
--- a/tests/modules/apigee_organization/test_plan.py
+++ b/tests/modules/apigee_organization/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ def test_resource_count(resources):
 def test_envgroup_attachment(resources):
  "Test Apigee Envgroup Attachments."
  attachments = [r['values'] for r in resources if r['type']
-              == 'google_apigee_envgroup_attachment']
+                 == 'google_apigee_envgroup_attachment']
  assert len(attachments) == 2
  assert set(a['environment'] for a in attachments) == set(['eval1', 'eval2'])

@@ -42,7 +42,7 @@ def test_envgroup_attachment(resources):
 def test_envgroup(resources):
  "Test env group."
  envgroups = [r['values'] for r in resources if r['type']
-          == 'google_apigee_envgroup']
+               == 'google_apigee_envgroup']
  assert len(envgroups) == 1
  assert envgroups[0]['name'] == 'eval'
  assert len(envgroups[0]['hostnames']) == 1
--- a/tests/modules/apigee_x_instance/init.py
+++ b/tests/modules/apigee_x_instance/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/apigee_x_instance/fixture/main.tf
+++ b/tests/modules/apigee_x_instance/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,4 +25,4 @@ module "apigee-x-instance" {
    "eval1",
    "eval2"
  ]
-}
+}
--- a/tests/modules/apigee_x_instance/fixture/variables.tf
+++ b/tests/modules/apigee_x_instance/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@ variable "name" {
 variable "region" {
  type    = string
  default = "europe-west1"
-}
+}
--- a/tests/modules/apigee_x_instance/test_plan.py
+++ b/tests/modules/apigee_x_instance/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ def test_resource_count(resources):
 def test_instance_attachment(resources):
  "Test Apigee Instance Attachments."
  attachments = [r['values'] for r in resources if r['type']
-              == 'google_apigee_instance_attachment']
+                 == 'google_apigee_instance_attachment']
  assert len(attachments) == 2
  assert set(a['environment'] for a in attachments) == set(['eval1', 'eval2'])

@@ -42,9 +42,8 @@ def test_instance_attachment(resources):
 def test_instance(resources):
  "Test Instance."
  instances = [r['values'] for r in resources if r['type']
-          == 'google_apigee_instance']
+               == 'google_apigee_instance']
  assert len(instances) == 1
  assert instances[0]['peering_cidr_range'] == 'SLASH_22'
  assert instances[0]['name'] == 'my-test-instance'
  assert instances[0]['location'] == 'europe-west1'
-
--- a/tests/modules/bigquery_dataset/init.py
+++ b/tests/modules/bigquery_dataset/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/bigquery_dataset/fixture/main.tf
+++ b/tests/modules/bigquery_dataset/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/bigquery_dataset/test_plan.py
+++ b/tests/modules/bigquery_dataset/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/bigtable_instance/init.py
+++ b/tests/modules/bigtable_instance/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/bigtable_instance/fixture/main.tf
+++ b/tests/modules/bigtable_instance/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/bigtable_instance/fixture/variables.tf
+++ b/tests/modules/bigtable_instance/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/bigtable_instance/test_plan.py
+++ b/tests/modules/bigtable_instance/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/billing_budget/init.py
+++ b/tests/modules/billing_budget/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/billing_budget/fixture/main.tf
+++ b/tests/modules/billing_budget/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/billing_budget/fixture/variables.tf
+++ b/tests/modules/billing_budget/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/billing_budget/test_plan.py
+++ b/tests/modules/billing_budget/test_plan.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,23 +26,25 @@ def test_pubsub(plan_runner):
  assert len(resources) == 1
  resource = resources[0]
  assert resource['values']['all_updates_rule'] == [
-    {'disable_default_iam_recipients': False,
-     'monitoring_notification_channels': [],
-     'pubsub_topic': 'topic',
-     'schema_version': '1.0'}
+      {'disable_default_iam_recipients': False,
+       'monitoring_notification_channels': [],
+       'pubsub_topic': 'topic',
+       'schema_version': '1.0'}
  ]

+
 def test_channel(plan_runner):
  _, resources = plan_runner(FIXTURES_DIR, notification_channels='["channel"]')
  assert len(resources) == 1
  resource = resources[0]
  assert resource['values']['all_updates_rule'] == [
-    {'disable_default_iam_recipients': True,
-     'monitoring_notification_channels': ['channel'],
-     'pubsub_topic': None,
-     'schema_version': '1.0'}
+      {'disable_default_iam_recipients': True,
+       'monitoring_notification_channels': ['channel'],
+       'pubsub_topic': None,
+       'schema_version': '1.0'}
  ]

+
 def test_emails(plan_runner):
  email_recipients = '{project_id = "project", emails = ["a@b.com", "c@d.com"]}'
  _, resources = plan_runner(FIXTURES_DIR, email_recipients=email_recipients)
@@ -59,11 +61,11 @@ def test_absolute_amount(plan_runner):
  assert amount['last_period_amount'] is None
  assert amount['specified_amount'] == [{'nanos': None, 'units': '100'}]

-  assert resource['values']['threshold_rules'] ==  [
-    {'spend_basis': 'CURRENT_SPEND',
-     'threshold_percent': 0.5},
-    {'spend_basis': 'CURRENT_SPEND',
-     'threshold_percent': 1},
-    {'spend_basis': 'FORECASTED_SPEND',
-     'threshold_percent': 1}
+  assert resource['values']['threshold_rules'] == [
+      {'spend_basis': 'CURRENT_SPEND',
+       'threshold_percent': 0.5},
+      {'spend_basis': 'CURRENT_SPEND',
+          'threshold_percent': 1},
+      {'spend_basis': 'FORECASTED_SPEND',
+          'threshold_percent': 1}
  ]
--- a/tests/modules/cloud_config_container_coredns/init.py
+++ b/tests/modules/cloud_config_container_coredns/init.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/tests/modules/cloud_config_container_coredns/fixture/main.tf
+++ b/tests/modules/cloud_config_container_coredns/fixture/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/cloud_config_container_coredns/fixture/outputs.tf
+++ b/tests/modules/cloud_config_container_coredns/fixture/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/tests/modules/cloud_config_container_coredns/fixture/variables.tf
+++ b/tests/modules/cloud_config_container_coredns/fixture/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More