From ee25965c895aa4bc3f62090a08b797d45b82d178 Mon Sep 17 00:00:00 2001 From: Simone Ruffilli Date: Sat, 1 Jan 2022 15:52:31 +0100 Subject: [PATCH] Copyright bump (#410) --- .ci/cloudbuild.lint.yaml | 4 +- .ci/cloudbuild.test.environments.yaml | 2 +- .ci/cloudbuild.test.examples.yaml | 2 +- .ci/cloudbuild.test.modules.yaml | 2 +- .github/workflows/daily-tag.yml | 6 +- .github/workflows/linting.yml | 2 +- .github/workflows/tests.yml | 12 +- .../backend.tf.sample | 2 +- .../cf/main.py | 2 +- .../asset-inventory-feed-remediation/main.tf | 2 +- .../outputs.tf | 2 +- .../variables.tf | 2 +- .../versions.tf | 2 +- .../dns-fine-grained-iam/backend.tf.sample | 2 +- cloud-operations/dns-fine-grained-iam/main.tf | 2 +- .../dns-fine-grained-iam/outputs.tf | 2 +- .../dns-fine-grained-iam/variables.tf | 2 +- .../dns-fine-grained-iam/versions.tf | 2 +- .../examples/shared-vpc-example/network.tf | 4 +- .../examples/shared-vpc-example/outputs.tf | 4 +- .../examples/shared-vpc-example/projects.tf | 4 +- .../examples/shared-vpc-example/test.example | 2 +- .../examples/shared-vpc-example/variables.tf | 4 +- cloud-operations/dns-shared-vpc/main.tf | 2 +- cloud-operations/dns-shared-vpc/outputs.tf | 2 +- cloud-operations/dns-shared-vpc/variables.tf | 2 +- cloud-operations/dns-shared-vpc/versions.tf | 2 +- .../iam-delegated-role-grants/audit.py | 70 ++-- .../iam-delegated-role-grants/main.tf | 2 +- .../iam-delegated-role-grants/outputs.tf | 2 +- .../iam-delegated-role-grants/variables.tf | 2 +- .../iam-delegated-role-grants/versions.tf | 2 +- .../backend.tf.sample | 2 +- .../onprem-sa-key-management/main.tf | 2 +- .../onprem-sa-key-management/outputs.tf | 2 +- .../onprem-sa-key-management/variables.tf | 2 +- .../onprem-sa-key-management/versions.tf | 2 +- cloud-operations/packer-image-builder/main.tf | 4 +- .../packer-image-builder/outputs.tf | 2 +- .../packer-image-builder/packer/build.pkr.hcl | 2 +- .../packer/install_httpd.sh | 2 +- .../packer/variables.pkr.hcl | 2 +- .../packer-image-builder/variables.tf | 2 +- .../packer-image-builder/versions.tf | 2 +- .../quota-monitoring/backend.tf.sample | 2 +- cloud-operations/quota-monitoring/cf/main.py | 2 +- cloud-operations/quota-monitoring/main.tf | 2 +- cloud-operations/quota-monitoring/outputs.tf | 2 +- .../quota-monitoring/variables.tf | 2 +- cloud-operations/quota-monitoring/versions.tf | 2 +- .../backend.tf.sample | 2 +- .../cf/main.py | 11 +- .../cffile/main.py | 12 +- .../main.tf | 2 +- .../outputs.tf | 2 +- .../variables.tf | 2 +- .../versions.tf | 2 +- .../backend.tf.sample | 2 +- .../cmek-via-centralized-kms/main.tf | 2 +- .../cmek-via-centralized-kms/outputs.tf | 2 +- .../cmek-via-centralized-kms/variables.tf | 2 +- .../cmek-via-centralized-kms/versions.tf | 2 +- .../01-environment/versions.tf | 2 +- .../02-resources/providers.tf | 2 +- .../02-resources/versions.tf | 2 +- .../gcs-to-bq-with-dataflow/backend.tf.sample | 2 +- .../gcs-to-bq-with-dataflow/main.tf | 2 +- .../gcs-to-bq-with-dataflow/outputs.tf | 2 +- .../scripts/data_ingestion/data_ingestion.py | 2 +- .../person_details_generator.py | 2 +- .../gcs-to-bq-with-dataflow/variables.tf | 2 +- .../gcs-to-bq-with-dataflow/versions.tf | 2 +- default-versions.tf | 2 +- factories/example-environments/dev/main.tf | 2 +- .../example-environments/dev/versions.tf | 2 +- factories/example-environments/prod/main.tf | 2 +- .../example-environments/prod/versions.tf | 2 +- .../firewall-hierarchical-policies/main.tf | 2 +- .../firewall-hierarchical-policies/outputs.tf | 2 +- .../variables.tf | 2 +- .../versions.tf | 2 +- factories/firewall-vpc-rules/flat/main.tf | 2 +- factories/firewall-vpc-rules/flat/outputs.tf | 2 +- .../firewall-vpc-rules/flat/variables.tf | 2 +- factories/firewall-vpc-rules/flat/versions.tf | 2 +- factories/firewall-vpc-rules/nested/main.tf | 2 +- .../firewall-vpc-rules/nested/outputs.tf | 2 +- .../firewall-vpc-rules/nested/variables.tf | 2 +- .../firewall-vpc-rules/nested/versions.tf | 2 +- factories/subnets/main.tf | 2 +- factories/subnets/outputs.tf | 2 +- factories/subnets/variables.tf | 2 +- factories/subnets/versions.tf | 2 +- foundations/business-units/backend.tf.sample | 2 +- foundations/business-units/main.tf | 2 +- foundations/business-units/outputs.tf | 2 +- .../business-units/terraform.tfvars.sample | 2 +- foundations/business-units/variables.tf | 2 +- foundations/business-units/versions.tf | 2 +- foundations/environments/backend.tf.sample | 2 +- foundations/environments/locals.tf | 2 +- foundations/environments/main.tf | 2 +- foundations/environments/outputs.tf | 2 +- foundations/environments/variables.tf | 2 +- foundations/environments/versions.tf | 2 +- modules/__experimental/net-neg/main.tf | 2 +- modules/__experimental/net-neg/outputs.tf | 2 +- modules/__experimental/net-neg/variables.tf | 2 +- modules/__experimental/net-neg/versions.tf | 2 +- modules/apigee-organization/main.tf | 4 +- modules/apigee-organization/outputs.tf | 2 +- modules/apigee-organization/variables.tf | 2 +- modules/apigee-organization/versions.tf | 2 +- modules/apigee-x-instance/main.tf | 2 +- modules/apigee-x-instance/outputs.tf | 2 +- modules/apigee-x-instance/variables.tf | 2 +- modules/apigee-x-instance/versions.tf | 2 +- modules/artifact-registry/main.tf | 2 +- modules/artifact-registry/outputs.tf | 2 +- modules/artifact-registry/variables.tf | 2 +- modules/artifact-registry/versions.tf | 2 +- modules/bigquery-dataset/main.tf | 2 +- modules/bigquery-dataset/outputs.tf | 2 +- modules/bigquery-dataset/variables.tf | 2 +- modules/bigquery-dataset/versions.tf | 2 +- modules/bigtable-instance/main.tf | 2 +- modules/bigtable-instance/outputs.tf | 2 +- modules/bigtable-instance/variables.tf | 2 +- modules/bigtable-instance/versions.tf | 2 +- modules/billing-budget/main.tf | 2 +- modules/billing-budget/outputs.tf | 2 +- modules/billing-budget/variables.tf | 2 +- modules/billing-budget/versions.tf | 2 +- .../coredns/cloud-config.yaml | 2 +- .../cloud-config-container/coredns/main.tf | 2 +- .../cloud-config-container/coredns/outputs.tf | 2 +- .../coredns/variables.tf | 2 +- .../coredns/versions.tf | 2 +- .../cos-generic-metadata/cloud-config.yaml | 2 +- .../cos-generic-metadata/main.tf | 2 +- .../cos-generic-metadata/outputs.tf | 2 +- .../cos-generic-metadata/variables.tf | 2 +- .../cos-generic-metadata/versions.tf | 2 +- .../envoy-traffic-director/files/customize.sh | 2 +- .../envoy-traffic-director/files/envoy.yaml | 2 +- .../envoy-traffic-director/main.tf | 2 +- .../envoy-traffic-director/outputs.tf | 2 +- .../envoy-traffic-director/variables.tf | 2 +- .../envoy-traffic-director/versions.tf | 2 +- modules/cloud-config-container/instance.tf | 2 +- .../mysql/cloud-config.yaml | 2 +- modules/cloud-config-container/mysql/main.tf | 2 +- .../cloud-config-container/mysql/outputs.tf | 2 +- .../cloud-config-container/mysql/variables.tf | 2 +- .../cloud-config-container/mysql/versions.tf | 2 +- .../nginx/cloud-config.yaml | 2 +- modules/cloud-config-container/nginx/main.tf | 2 +- .../cloud-config-container/nginx/outputs.tf | 2 +- .../cloud-config-container/nginx/variables.tf | 2 +- .../cloud-config-container/nginx/versions.tf | 2 +- .../onprem/cloud-config.yaml | 2 +- .../docker-images/strongswan/Dockerfile | 4 +- .../docker-images/strongswan/cloudbuild.yaml | 21 +- .../docker-images/strongswan/entrypoint.sh | 2 +- .../docker-images/strongswan/ipsec-vti.sh | 2 +- .../onprem/docker-images/toolbox/Dockerfile | 8 +- .../docker-images/toolbox/cloudbuild.yaml | 21 +- .../docker-images/toolbox/entrypoint.sh | 2 +- modules/cloud-config-container/onprem/main.tf | 2 +- .../cloud-config-container/onprem/outputs.tf | 2 +- .../onprem/static-vpn-gw-cloud-init.yaml | 383 +++++++++--------- .../onprem/variables.tf | 2 +- .../cloud-config-container/onprem/versions.tf | 2 +- .../outputs-instance.tf | 2 +- .../squid/cloud-config.yaml | 2 +- .../squid/docker/Dockerfile | 12 +- .../squid/docker/cloudbuild.yaml | 21 +- .../squid/docker/entrypoint.sh | 2 +- modules/cloud-config-container/squid/main.tf | 2 +- .../cloud-config-container/squid/outputs.tf | 2 +- .../cloud-config-container/squid/variables.tf | 2 +- .../cloud-config-container/squid/versions.tf | 2 +- .../variables-instance.tf | 2 +- modules/cloud-function/main.tf | 2 +- modules/cloud-function/outputs.tf | 2 +- modules/cloud-function/variables.tf | 2 +- modules/cloud-function/versions.tf | 2 +- modules/cloud-identity-group/main.tf | 2 +- modules/cloud-identity-group/outputs.tf | 2 +- modules/cloud-identity-group/variables.tf | 2 +- modules/cloud-identity-group/versions.tf | 2 +- modules/cloud-run/main.tf | 2 +- modules/cloud-run/outputs.tf | 4 +- modules/cloud-run/variables.tf | 2 +- modules/cloud-run/versions.tf | 4 +- modules/cloudsql-instance/main.tf | 2 +- modules/cloudsql-instance/outputs.tf | 2 +- modules/cloudsql-instance/variables.tf | 2 +- modules/cloudsql-instance/versions.tf | 2 +- modules/compute-mig/main.tf | 2 +- modules/compute-mig/outputs.tf | 2 +- modules/compute-mig/variables.tf | 2 +- modules/compute-mig/versions.tf | 2 +- modules/compute-vm/main.tf | 2 +- modules/compute-vm/outputs.tf | 2 +- modules/compute-vm/variables.tf | 2 +- modules/compute-vm/versions.tf | 2 +- modules/container-registry/main.tf | 2 +- modules/container-registry/outputs.tf | 2 +- modules/container-registry/variables.tf | 2 +- modules/container-registry/versions.tf | 2 +- modules/datafusion/main.tf | 2 +- modules/datafusion/outputs.tf | 2 +- modules/datafusion/variables.tf | 2 +- modules/datafusion/versions.tf | 2 +- modules/dns/main.tf | 2 +- modules/dns/outputs.tf | 2 +- modules/dns/variables.tf | 2 +- modules/dns/versions.tf | 2 +- modules/endpoints/main.tf | 2 +- modules/endpoints/outputs.tf | 2 +- modules/endpoints/variables.tf | 2 +- modules/endpoints/versions.tf | 2 +- modules/folder/firewall-policy.tf | 2 +- modules/folder/main.tf | 2 +- modules/folder/outputs.tf | 2 +- modules/folder/variables.tf | 2 +- modules/folder/versions.tf | 2 +- modules/folders-unit/locals.tf | 2 +- modules/folders-unit/main.tf | 2 +- modules/folders-unit/outputs.tf | 2 +- modules/folders-unit/variables.tf | 2 +- modules/folders-unit/versions.tf | 2 +- modules/gcs/main.tf | 4 +- modules/gcs/outputs.tf | 2 +- modules/gcs/variables.tf | 4 +- modules/gcs/versions.tf | 2 +- modules/gke-cluster/main.tf | 4 +- modules/gke-cluster/outputs.tf | 2 +- modules/gke-cluster/variables.tf | 2 +- modules/gke-cluster/versions.tf | 2 +- modules/gke-nodepool/main.tf | 2 +- modules/gke-nodepool/outputs.tf | 2 +- modules/gke-nodepool/variables.tf | 2 +- modules/gke-nodepool/versions.tf | 2 +- modules/iam-service-account/main.tf | 2 +- modules/iam-service-account/outputs.tf | 2 +- modules/iam-service-account/variables.tf | 2 +- modules/iam-service-account/versions.tf | 2 +- modules/kms/main.tf | 2 +- modules/kms/outputs.tf | 2 +- modules/kms/variables.tf | 2 +- modules/kms/versions.tf | 2 +- modules/logging-bucket/main.tf | 2 +- modules/logging-bucket/outputs.tf | 2 +- modules/logging-bucket/variables.tf | 2 +- modules/logging-bucket/versions.tf | 2 +- modules/naming-convention/main.tf | 2 +- modules/naming-convention/outputs.tf | 2 +- modules/naming-convention/variables.tf | 2 +- modules/naming-convention/versions.tf | 2 +- modules/net-address/main.tf | 2 +- modules/net-address/outputs.tf | 2 +- modules/net-address/variables.tf | 2 +- modules/net-address/versions.tf | 2 +- modules/net-cloudnat/main.tf | 2 +- modules/net-cloudnat/outputs.tf | 2 +- modules/net-cloudnat/variables.tf | 2 +- modules/net-cloudnat/versions.tf | 2 +- modules/net-ilb/main.tf | 2 +- modules/net-ilb/outputs.tf | 2 +- modules/net-ilb/variables.tf | 2 +- modules/net-ilb/versions.tf | 2 +- .../main.tf | 2 +- .../outputs.tf | 2 +- .../variables.tf | 2 +- .../versions.tf | 2 +- modules/net-vpc-firewall/main.tf | 2 +- modules/net-vpc-firewall/outputs.tf | 2 +- modules/net-vpc-firewall/variables.tf | 2 +- modules/net-vpc-firewall/versions.tf | 2 +- modules/net-vpc-peering/main.tf | 2 +- modules/net-vpc-peering/outputs.tf | 2 +- modules/net-vpc-peering/variables.tf | 2 +- modules/net-vpc-peering/versions.tf | 2 +- modules/net-vpc/main.tf | 2 +- modules/net-vpc/outputs.tf | 2 +- modules/net-vpc/variables.tf | 2 +- modules/net-vpc/versions.tf | 2 +- modules/net-vpn-dynamic/main.tf | 2 +- modules/net-vpn-dynamic/outputs.tf | 2 +- modules/net-vpn-dynamic/variables.tf | 2 +- modules/net-vpn-dynamic/versions.tf | 2 +- modules/net-vpn-ha/main.tf | 2 +- modules/net-vpn-ha/outputs.tf | 2 +- modules/net-vpn-ha/variables.tf | 2 +- modules/net-vpn-ha/versions.tf | 2 +- modules/net-vpn-static/main.tf | 2 +- modules/net-vpn-static/outputs.tf | 2 +- modules/net-vpn-static/variables.tf | 2 +- modules/net-vpn-static/versions.tf | 2 +- modules/organization/firewall-policy.tf | 2 +- modules/organization/iam.tf | 2 +- modules/organization/logging.tf | 2 +- modules/organization/main.tf | 2 +- modules/organization/outputs.tf | 2 +- modules/organization/variables.tf | 2 +- modules/organization/versions.tf | 2 +- modules/project/main.tf | 2 +- modules/project/outputs.tf | 2 +- modules/project/service_accounts.tf | 2 +- modules/project/variables.tf | 2 +- modules/project/versions.tf | 2 +- modules/pubsub/main.tf | 2 +- modules/pubsub/outputs.tf | 2 +- modules/pubsub/variables.tf | 2 +- modules/pubsub/versions.tf | 2 +- modules/secret-manager/main.tf | 2 +- modules/secret-manager/outputs.tf | 2 +- modules/secret-manager/variables.tf | 2 +- modules/secret-manager/versions.tf | 2 +- modules/service-directory/main.tf | 2 +- modules/service-directory/outputs.tf | 2 +- modules/service-directory/variables.tf | 2 +- modules/service-directory/versions.tf | 2 +- modules/source-repository/main.tf | 2 +- modules/source-repository/outputs.tf | 2 +- modules/source-repository/variables.tf | 2 +- modules/source-repository/versions.tf | 2 +- modules/vpc-sc/access_levels.tf | 2 +- modules/vpc-sc/main.tf | 2 +- modules/vpc-sc/outputs.tf | 2 +- modules/vpc-sc/service_perimeters_bridge.tf | 2 +- modules/vpc-sc/service_perimeters_regular.tf | 2 +- modules/vpc-sc/variables.tf | 2 +- .../decentralized-firewall/backend.tf.sample | 2 +- .../firewall/common/common-egress.yaml | 22 +- .../firewall/common/iap-access.yaml | 11 +- .../firewall/common/lb-access.yaml | 10 +- .../firewall/dev/app-1/app1-rules.yaml | 18 +- .../firewall/dev/app-2/app2-rules.yaml | 18 +- .../firewall/prod/app-1/app1-rules.yaml | 18 +- networking/decentralized-firewall/main.tf | 2 +- networking/decentralized-firewall/outputs.tf | 2 +- .../validator/Dockerfile | 2 +- .../validator/action.yml | 28 +- .../validator/firewallSchema.yaml | 2 +- .../validator/firewallSchemaAutoApprove.yaml | 2 +- .../validator/firewallSchemaSettings.yaml | 54 +-- .../validator/requirements.txt | 2 +- .../validator/validator.py | 5 +- .../decentralized-firewall/variables.tf | 2 +- networking/decentralized-firewall/versions.tf | 2 +- networking/filtering-proxy/main.tf | 2 +- networking/filtering-proxy/outputs.tf | 2 +- networking/filtering-proxy/variables.tf | 2 +- networking/filtering-proxy/versions.tf | 2 +- .../hub-and-spoke-peering/backend.tf.sample | 2 +- networking/hub-and-spoke-peering/main.tf | 2 +- networking/hub-and-spoke-peering/outputs.tf | 2 +- networking/hub-and-spoke-peering/variables.tf | 2 +- networking/hub-and-spoke-peering/versions.tf | 2 +- .../hub-and-spoke-vpn/backend.tf.sample | 2 +- networking/hub-and-spoke-vpn/main.tf | 2 +- networking/hub-and-spoke-vpn/outputs.tf | 2 +- networking/hub-and-spoke-vpn/provider.tf | 2 +- networking/hub-and-spoke-vpn/variables.tf | 2 +- networking/hub-and-spoke-vpn/versions.tf | 2 +- networking/ilb-next-hop/assets/gw.yaml | 2 +- networking/ilb-next-hop/backend.tf.sample | 2 +- networking/ilb-next-hop/gateways.tf | 2 +- networking/ilb-next-hop/main.tf | 2 +- networking/ilb-next-hop/outputs.tf | 2 +- networking/ilb-next-hop/variables.tf | 2 +- networking/ilb-next-hop/versions.tf | 2 +- networking/ilb-next-hop/vms.tf | 2 +- networking/ilb-next-hop/vpc-left.tf | 2 +- networking/ilb-next-hop/vpc-right.tf | 2 +- .../backend.tf.sample | 2 +- networking/onprem-google-access-dns/main.tf | 2 +- .../onprem-google-access-dns/outputs.tf | 2 +- .../onprem-google-access-dns/variables.tf | 2 +- .../onprem-google-access-dns/versions.tf | 2 +- .../assets/main.py | 16 +- .../main.tf | 2 +- .../outputs.tf | 4 +- .../variables.tf | 2 +- .../versions.tf | 2 +- networking/shared-vpc-gke/backend.tf.sample | 2 +- networking/shared-vpc-gke/main.tf | 2 +- networking/shared-vpc-gke/outputs.tf | 2 +- networking/shared-vpc-gke/variables.tf | 2 +- networking/shared-vpc-gke/versions.tf | 2 +- tests/__init__.py | 2 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../test_plan.py | 2 +- .../dns_fine_grained_iam/__init__.py | 2 +- .../dns_fine_grained_iam/fixture/main.tf | 2 +- .../dns_fine_grained_iam/fixture/variables.tf | 2 +- .../dns_fine_grained_iam/test_plan.py | 2 +- .../dns_shared_vpc/__init__.py | 2 +- .../dns_shared_vpc/fixture/main.tf | 2 +- .../dns_shared_vpc/fixture/variables.tf | 2 +- .../dns_shared_vpc/test_plan.py | 2 +- .../iam_delegated_role_grants/__init__.py | 2 +- .../iam_delegated_role_grants/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../iam_delegated_role_grants/test_plan.py | 5 +- .../onprem_sa_key_management/__init__.py | 2 +- .../onprem_sa_key_management/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../onprem_sa_key_management/test_plan.py | 2 +- .../packer_image_builder/__init__.py | 2 +- .../packer_image_builder/fixture/main.tf | 2 +- .../packer_image_builder/fixture/variables.tf | 2 +- .../packer_image_builder/test_plan.py | 8 +- .../quota_monitoring/__init__.py | 2 +- .../quota_monitoring/fixture/main.tf | 2 +- .../quota_monitoring/fixture/variables.tf | 2 +- .../quota_monitoring/test_plan.py | 2 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../test_plan.py | 2 +- tests/conftest.py | 5 +- .../cmek_via_centralized_kms/__init__.py | 2 +- .../cmek_via_centralized_kms/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../cmek_via_centralized_kms/test_plan.py | 2 +- .../data_platform_foundations/__init__.py | 2 +- .../data_platform_foundations/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../data_platform_foundations/test_plan.py | 2 +- .../gcs_to_bq_with_dataflow/__init__.py | 2 +- .../gcs_to_bq_with_dataflow/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../gcs_to_bq_with_dataflow/test_plan.py | 2 +- tests/examples/conftest.py | 9 +- tests/examples/test_plan.py | 2 +- tests/examples/variables.tf | 2 +- tests/factories/__init__.py | 2 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../test_plan.py | 2 +- tests/factories/subnets/__init__.py | 2 +- tests/factories/subnets/fixture/main.tf | 4 +- tests/factories/subnets/test_plan.py | 2 +- tests/factories/vpc_firewall/__init__.py | 2 +- tests/factories/vpc_firewall/flat/__init__.py | 2 +- .../vpc_firewall/flat/fixture/main.tf | 2 +- .../flat/fixture/rules/common.yaml | 17 +- .../vpc_firewall/flat/fixture/variables.tf | 2 +- .../factories/vpc_firewall/flat/test_plan.py | 44 +- .../factories/vpc_firewall/nested/__init__.py | 2 +- .../vpc_firewall/nested/fixture/main.tf | 2 +- .../vpc_firewall/nested/test_plan.py | 2 +- tests/foundations/__init__.py | 2 +- tests/foundations/business_units/__init__.py | 2 +- .../business_units/fixture/main.tf | 2 +- .../business_units/fixture/variables.tf | 2 +- tests/foundations/business_units/test_plan.py | 2 +- tests/foundations/environments/__init__.py | 2 +- .../foundations/environments/fixture/main.tf | 2 +- .../environments/fixture/variables.tf | 2 +- tests/foundations/environments/test_plan.py | 2 +- tests/modules/__init__.py | 4 +- tests/modules/apigee_organization/__init__.py | 2 +- .../apigee_organization/fixture/main.tf | 2 +- .../apigee_organization/fixture/variables.tf | 4 +- .../modules/apigee_organization/test_plan.py | 6 +- tests/modules/apigee_x_instance/__init__.py | 2 +- .../modules/apigee_x_instance/fixture/main.tf | 4 +- .../apigee_x_instance/fixture/variables.tf | 4 +- tests/modules/apigee_x_instance/test_plan.py | 7 +- tests/modules/bigquery_dataset/__init__.py | 2 +- .../modules/bigquery_dataset/fixture/main.tf | 2 +- tests/modules/bigquery_dataset/test_plan.py | 2 +- tests/modules/bigtable_instance/__init__.py | 2 +- .../modules/bigtable_instance/fixture/main.tf | 2 +- .../bigtable_instance/fixture/variables.tf | 2 +- tests/modules/bigtable_instance/test_plan.py | 2 +- tests/modules/billing_budget/__init__.py | 2 +- tests/modules/billing_budget/fixture/main.tf | 2 +- .../billing_budget/fixture/variables.tf | 2 +- tests/modules/billing_budget/test_plan.py | 34 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../fixture/outputs.tf | 2 +- .../fixture/variables.tf | 2 +- .../test_apply.py | 2 +- .../cloud_config_container_mysql/__init__.py | 2 +- .../fixture/main.tf | 2 +- .../fixture/outputs.tf | 2 +- .../fixture/variables.tf | 2 +- .../test_apply.py | 2 +- tests/modules/cloud_function/__init__.py | 2 +- .../cloud_function/fixture/bundle/main.py | 2 +- tests/modules/cloud_function/fixture/main.tf | 2 +- .../cloud_function/fixture/variables.tf | 2 +- tests/modules/cloud_function/test_plan.py | 2 +- .../modules/cloud_identity_group/__init__.py | 2 +- .../cloud_identity_group/fixture/main.tf | 2 +- .../cloud_identity_group/fixture/variables.tf | 2 +- .../modules/cloud_identity_group/test_plan.py | 6 +- tests/modules/cloud_run/__init__.py | 4 +- .../modules/cloud_run/fixture/bundle/main.py | 4 +- tests/modules/cloud_run/fixture/main.tf | 2 +- tests/modules/cloud_run/fixture/variables.tf | 4 +- tests/modules/cloud_run/test_plan.py | 9 +- tests/modules/cloudsql_instance/__init__.py | 2 +- .../modules/cloudsql_instance/fixture/main.tf | 2 +- .../cloudsql_instance/fixture/variables.tf | 2 +- tests/modules/cloudsql_instance/test_plan.py | 2 +- tests/modules/compute_mig/__init__.py | 2 +- tests/modules/compute_mig/fixture/main.tf | 2 +- .../modules/compute_mig/fixture/variables.tf | 2 +- tests/modules/compute_mig/test_plan.py | 79 ++-- tests/modules/compute_vm/__init__.py | 2 +- tests/modules/compute_vm/fixture/main.tf | 2 +- tests/modules/compute_vm/fixture/variables.tf | 2 +- tests/modules/compute_vm/test_plan.py | 2 +- tests/modules/compute_vm/test_plan_disks.py | 2 +- .../compute_vm/test_plan_interfaces.py | 2 +- tests/modules/container_registry/__init__.py | 2 +- .../container_registry/fixture/main.tf | 2 +- .../container_registry/fixture/variables.tf | 2 +- tests/modules/container_registry/test_plan.py | 2 +- tests/modules/dns/__init__.py | 2 +- tests/modules/dns/fixture/main.tf | 2 +- tests/modules/dns/fixture/variables.tf | 2 +- tests/modules/dns/test_plan.py | 2 +- tests/modules/endpoints/__init__.py | 2 +- tests/modules/endpoints/fixture/main.tf | 2 +- tests/modules/endpoints/fixture/openapi.yaml | 2 +- tests/modules/endpoints/fixture/variables.tf | 2 +- tests/modules/endpoints/test_plan.py | 2 +- tests/modules/folder/__init__.py | 2 +- tests/modules/folder/fixture/main.tf | 2 +- tests/modules/folder/fixture/variables.tf | 2 +- tests/modules/folder/test_plan.py | 2 +- .../folder/test_plan_firewall_policy.py | 30 +- tests/modules/folder/test_plan_logging.py | 207 +++++----- .../modules/folder/test_plan_org_policies.py | 6 +- tests/modules/gcs/__init__.py | 2 +- tests/modules/gcs/fixture/main.tf | 2 +- tests/modules/gcs/fixture/variables.tf | 2 +- tests/modules/gcs/test_plan.py | 12 +- tests/modules/gke_nodepool/__init__.py | 2 +- tests/modules/gke_nodepool/fixture/main.tf | 2 +- .../modules/gke_nodepool/fixture/variables.tf | 2 +- tests/modules/gke_nodepool/test_plan.py | 2 +- tests/modules/iam_service_account/__init__.py | 2 +- .../iam_service_account/fixture/main.tf | 2 +- .../iam_service_account/fixture/variables.tf | 2 +- .../modules/iam_service_account/test_plan.py | 12 +- tests/modules/kms/__init__.py | 2 +- tests/modules/kms/fixture/main.tf | 2 +- tests/modules/kms/fixture/outputs.tf | 2 +- tests/modules/kms/fixture/variables.tf | 2 +- tests/modules/kms/test_plan.py | 2 +- tests/modules/logging_bucket/__init__.py | 2 +- tests/modules/logging_bucket/fixture/main.tf | 2 +- .../logging_bucket/fixture/variables.tf | 2 +- tests/modules/logging_bucket/test_plan.py | 103 ++--- tests/modules/naming_convention/__init__.py | 2 +- .../modules/naming_convention/fixture/main.tf | 2 +- tests/modules/naming_convention/test_plan.py | 2 +- tests/modules/net_address/__init__.py | 2 +- tests/modules/net_address/fixture/main.tf | 2 +- tests/modules/net_address/fixture/outputs.tf | 2 +- .../modules/net_address/fixture/variables.tf | 2 +- tests/modules/net_address/test_plan.py | 2 +- tests/modules/net_ilb/__init__.py | 2 +- tests/modules/net_ilb/fixture/main.tf | 2 +- tests/modules/net_ilb/fixture/variables.tf | 2 +- tests/modules/net_ilb/test_plan.py | 2 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../test_plan.py | 106 ++--- tests/modules/net_vpc/__init__.py | 2 +- .../net_vpc/fixture/data/factory-subnet.yaml | 24 +- tests/modules/net_vpc/fixture/main.tf | 2 +- tests/modules/net_vpc/fixture/variables.tf | 2 +- tests/modules/net_vpc/test_plan.py | 2 +- tests/modules/net_vpc/test_plan_psn.py | 2 +- tests/modules/net_vpc/test_plan_subnets.py | 2 +- tests/modules/net_vpc_firewall/__init__.py | 2 +- .../fixture/config/cidr_template.yaml | 2 +- .../config/firewall/load_balancers.yaml | 2 +- .../modules/net_vpc_firewall/fixture/main.tf | 2 +- .../net_vpc_firewall/fixture/variables.tf | 2 +- tests/modules/net_vpc_firewall/test_plan.py | 2 +- tests/modules/organization/__init__.py | 2 +- .../fixture/data/firewall-cidrs.yaml | 2 +- .../fixture/data/firewall-rules.yaml | 2 +- tests/modules/organization/fixture/main.tf | 2 +- .../modules/organization/fixture/variables.tf | 2 +- tests/modules/organization/test_plan.py | 2 +- .../organization/test_plan_firewall.py | 2 +- .../modules/organization/test_plan_logging.py | 2 +- tests/modules/project/__init__.py | 2 +- tests/modules/project/fixture/main.tf | 2 +- tests/modules/project/fixture/variables.tf | 2 +- tests/modules/project/test_iam.py | 2 +- tests/modules/project/test_plan.py | 2 +- tests/modules/project/test_plan_logging.py | 207 +++++----- .../modules/project/test_plan_org_policies.py | 2 +- tests/modules/pubsub/__init__.py | 2 +- tests/modules/pubsub/fixture/main.tf | 2 +- tests/modules/pubsub/fixture/variables.tf | 2 +- tests/modules/pubsub/test_plan.py | 2 +- tests/modules/secret_manager/__init__.py | 2 +- tests/modules/secret_manager/fixture/main.tf | 2 +- .../secret_manager/fixture/variables.tf | 2 +- tests/modules/secret_manager/test_plan.py | 2 +- tests/modules/service_directory/__init__.py | 2 +- .../modules/service_directory/fixture/main.tf | 2 +- .../service_directory/fixture/variables.tf | 2 +- tests/modules/service_directory/test_plan.py | 2 +- tests/modules/source_repository/__init__.py | 2 +- .../modules/source_repository/fixture/main.tf | 2 +- .../source_repository/fixture/variables.tf | 2 +- tests/modules/source_repository/test_plan.py | 2 +- tests/modules/vpc_sc/__init__.py | 2 +- tests/modules/vpc_sc/fixture/main.tf | 2 +- tests/modules/vpc_sc/test_plan.py | 2 +- tests/networking/__init__.py | 2 +- .../decentralized_firewall/__init__.py | 2 +- .../decentralized_firewall/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../decentralized_firewall/test_plan.py | 10 +- tests/networking/filtering_proxy/__init__.py | 2 +- .../filtering_proxy/fixture/main.tf | 2 +- .../filtering_proxy/fixture/variables.tf | 2 +- tests/networking/filtering_proxy/test_plan.py | 2 +- .../hub_and_spoke_peering/__init__.py | 2 +- .../hub_and_spoke_peering/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../hub_and_spoke_peering/test_plan.py | 2 +- .../networking/hub_and_spoke_vpn/__init__.py | 2 +- .../hub_and_spoke_vpn/fixture/main.tf | 2 +- .../hub_and_spoke_vpn/fixture/variables.tf | 2 +- .../networking/hub_and_spoke_vpn/test_plan.py | 2 +- tests/networking/ilb_next_hop/__init__.py | 2 +- tests/networking/ilb_next_hop/fixture/main.tf | 2 +- .../ilb_next_hop/fixture/variables.tf | 2 +- tests/networking/ilb_next_hop/test_plan.py | 2 +- .../onprem_google_access_dns/__init__.py | 2 +- .../onprem_google_access_dns/fixture/main.tf | 2 +- .../fixture/variables.tf | 2 +- .../onprem_google_access_dns/test_plan.py | 2 +- .../__init__.py | 2 +- .../fixture/main.tf | 2 +- .../test_plan.py | 2 +- tests/networking/shared_vpc_gke/__init__.py | 2 +- .../networking/shared_vpc_gke/fixture/main.tf | 2 +- .../shared_vpc_gke/fixture/variables.tf | 2 +- tests/networking/shared_vpc_gke/test_plan.py | 2 +- third-party-solutions/openshift/prepare.py | 2 +- .../openshift/tf/bootstrap.tf | 2 +- third-party-solutions/openshift/tf/dns.tf | 2 +- .../openshift/tf/firewall.tf | 2 +- third-party-solutions/openshift/tf/iam.tf | 2 +- third-party-solutions/openshift/tf/ilb.tf | 2 +- third-party-solutions/openshift/tf/main.tf | 2 +- third-party-solutions/openshift/tf/masters.tf | 2 +- third-party-solutions/openshift/tf/outputs.tf | 2 +- .../openshift/tf/variables.tf | 2 +- .../openshift/tf/versions.tf | 2 +- tools/__init__.py | 3 +- tools/check_boilerplate.py | 2 +- tools/check_documentation.py | 2 +- tools/tfutils.py | 2 +- 676 files changed, 1526 insertions(+), 1508 deletions(-) diff --git a/.ci/cloudbuild.lint.yaml b/.ci/cloudbuild.lint.yaml index a4fe27a48..1adfc9f1a 100644 --- a/.ci/cloudbuild.lint.yaml +++ b/.ci/cloudbuild.lint.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. @@ -50,7 +50,7 @@ steps: "factories/firewall-vpc-rules", "foundations", "modules", - "networking" + "networking", ] substitutions: diff --git a/.ci/cloudbuild.test.environments.yaml b/.ci/cloudbuild.test.environments.yaml index 180f33de5..8d8708f00 100644 --- a/.ci/cloudbuild.test.environments.yaml +++ b/.ci/cloudbuild.test.environments.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. diff --git a/.ci/cloudbuild.test.examples.yaml b/.ci/cloudbuild.test.examples.yaml index 83c7cb946..22ce6016c 100644 --- a/.ci/cloudbuild.test.examples.yaml +++ b/.ci/cloudbuild.test.examples.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. diff --git a/.ci/cloudbuild.test.modules.yaml b/.ci/cloudbuild.test.modules.yaml index 1222f2a53..507aafe1f 100644 --- a/.ci/cloudbuild.test.modules.yaml +++ b/.ci/cloudbuild.test.modules.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. diff --git a/.github/workflows/daily-tag.yml b/.github/workflows/daily-tag.yml index 6f712a7ae..7a0efc590 100644 --- a/.github/workflows/daily-tag.yml +++ b/.github/workflows/daily-tag.yml @@ -1,5 +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,7 +18,7 @@ name: | on: workflow_dispatch: schedule: - - cron: '0 2 * * *' + - cron: "0 2 * * *" permissions: contents: write @@ -44,4 +43,3 @@ jobs: else echo "No changes in last 24 hours" fi - \ No newline at end of file diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index aa0427401..629ccaf1a 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -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. diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ac6d252f..588f6eaf0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: 'Tests' +name: "Tests" on: schedule: - - cron: '45 2 * * *' + - cron: "45 2 * * *" pull_request: branches: - master @@ -35,7 +35,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: "3.9" - name: Set up Terraform uses: hashicorp/setup-terraform@v1 @@ -64,7 +64,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: "3.9" - name: Set up Terraform uses: hashicorp/setup-terraform@v1 @@ -93,7 +93,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: "3.9" - name: Set up Terraform uses: hashicorp/setup-terraform@v1 diff --git a/cloud-operations/asset-inventory-feed-remediation/backend.tf.sample b/cloud-operations/asset-inventory-feed-remediation/backend.tf.sample index ca06c47e7..36f4e8b80 100644 --- a/cloud-operations/asset-inventory-feed-remediation/backend.tf.sample +++ b/cloud-operations/asset-inventory-feed-remediation/backend.tf.sample @@ -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. diff --git a/cloud-operations/asset-inventory-feed-remediation/cf/main.py b/cloud-operations/asset-inventory-feed-remediation/cf/main.py index f363a37c0..8a46eb137 100755 --- a/cloud-operations/asset-inventory-feed-remediation/cf/main.py +++ b/cloud-operations/asset-inventory-feed-remediation/cf/main.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. diff --git a/cloud-operations/asset-inventory-feed-remediation/main.tf b/cloud-operations/asset-inventory-feed-remediation/main.tf index 88d3bfdb1..95fdc46f0 100644 --- a/cloud-operations/asset-inventory-feed-remediation/main.tf +++ b/cloud-operations/asset-inventory-feed-remediation/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. diff --git a/cloud-operations/asset-inventory-feed-remediation/outputs.tf b/cloud-operations/asset-inventory-feed-remediation/outputs.tf index 812d69c79..643918138 100644 --- a/cloud-operations/asset-inventory-feed-remediation/outputs.tf +++ b/cloud-operations/asset-inventory-feed-remediation/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. diff --git a/cloud-operations/asset-inventory-feed-remediation/variables.tf b/cloud-operations/asset-inventory-feed-remediation/variables.tf index c67ee6453..ca1d4fc98 100644 --- a/cloud-operations/asset-inventory-feed-remediation/variables.tf +++ b/cloud-operations/asset-inventory-feed-remediation/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. diff --git a/cloud-operations/asset-inventory-feed-remediation/versions.tf b/cloud-operations/asset-inventory-feed-remediation/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/asset-inventory-feed-remediation/versions.tf +++ b/cloud-operations/asset-inventory-feed-remediation/versions.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. diff --git a/cloud-operations/dns-fine-grained-iam/backend.tf.sample b/cloud-operations/dns-fine-grained-iam/backend.tf.sample index 26629625c..0b20c04a2 100644 --- a/cloud-operations/dns-fine-grained-iam/backend.tf.sample +++ b/cloud-operations/dns-fine-grained-iam/backend.tf.sample @@ -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. diff --git a/cloud-operations/dns-fine-grained-iam/main.tf b/cloud-operations/dns-fine-grained-iam/main.tf index 6876a2aa9..56fa39360 100644 --- a/cloud-operations/dns-fine-grained-iam/main.tf +++ b/cloud-operations/dns-fine-grained-iam/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. diff --git a/cloud-operations/dns-fine-grained-iam/outputs.tf b/cloud-operations/dns-fine-grained-iam/outputs.tf index 1f7f66123..d5b7aa11d 100644 --- a/cloud-operations/dns-fine-grained-iam/outputs.tf +++ b/cloud-operations/dns-fine-grained-iam/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. diff --git a/cloud-operations/dns-fine-grained-iam/variables.tf b/cloud-operations/dns-fine-grained-iam/variables.tf index 4604bfd5f..008a48c76 100644 --- a/cloud-operations/dns-fine-grained-iam/variables.tf +++ b/cloud-operations/dns-fine-grained-iam/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. diff --git a/cloud-operations/dns-fine-grained-iam/versions.tf b/cloud-operations/dns-fine-grained-iam/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/dns-fine-grained-iam/versions.tf +++ b/cloud-operations/dns-fine-grained-iam/versions.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. diff --git a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/network.tf b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/network.tf index 7864b3fd8..725ef6363 100644 --- a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/network.tf +++ b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/network.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. @@ -40,4 +40,4 @@ module "cloud-dns" { teams = var.teams dns_domain = var.dns_domain -} \ No newline at end of file +} diff --git a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/outputs.tf b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/outputs.tf index 1a097a713..fc145c2f4 100644 --- a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/outputs.tf +++ b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/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. @@ -22,4 +22,4 @@ output "host_project_id" { output "shared_vpc_self_link" { description = "Shared VPC Self link" value = module.shared-vpc.self_link -} \ No newline at end of file +} diff --git a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/projects.tf b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/projects.tf index 5d7eef9d8..66602cb16 100644 --- a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/projects.tf +++ b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/projects.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. @@ -71,4 +71,4 @@ module "project-service-2" { attach = true host_project = module.project-host.project_id } -} \ No newline at end of file +} diff --git a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/test.example b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/test.example index b00d2bb00..8a302df81 100644 --- a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/test.example +++ b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/test.example @@ -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. diff --git a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/variables.tf b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/variables.tf index 1e79a9dd1..77743bae3 100644 --- a/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/variables.tf +++ b/cloud-operations/dns-shared-vpc/examples/shared-vpc-example/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. @@ -62,4 +62,4 @@ variable "dns_domain" { variable "teams" { description = "List of teams that require their own Cloud DNS instance" default = ["appteam1", "appteam2"] -} \ No newline at end of file +} diff --git a/cloud-operations/dns-shared-vpc/main.tf b/cloud-operations/dns-shared-vpc/main.tf index f7419b364..58a31bd35 100644 --- a/cloud-operations/dns-shared-vpc/main.tf +++ b/cloud-operations/dns-shared-vpc/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. diff --git a/cloud-operations/dns-shared-vpc/outputs.tf b/cloud-operations/dns-shared-vpc/outputs.tf index dbe838a0e..2c9021e7d 100644 --- a/cloud-operations/dns-shared-vpc/outputs.tf +++ b/cloud-operations/dns-shared-vpc/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. diff --git a/cloud-operations/dns-shared-vpc/variables.tf b/cloud-operations/dns-shared-vpc/variables.tf index 0cf5b95f5..f74acfde0 100644 --- a/cloud-operations/dns-shared-vpc/variables.tf +++ b/cloud-operations/dns-shared-vpc/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. diff --git a/cloud-operations/dns-shared-vpc/versions.tf b/cloud-operations/dns-shared-vpc/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/dns-shared-vpc/versions.tf +++ b/cloud-operations/dns-shared-vpc/versions.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. diff --git a/cloud-operations/iam-delegated-role-grants/audit.py b/cloud-operations/iam-delegated-role-grants/audit.py index abb042e8e..75488c9b7 100644 --- a/cloud-operations/iam-delegated-role-grants/audit.py +++ b/cloud-operations/iam-delegated-role-grants/audit.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. @@ -28,50 +28,50 @@ SENSITIVE_PERMISSIONS = { def get_role_permissions(role): - if role.startswith("roles/"): - endpoint = iam_service.roles() - elif role.startswith("projects/"): - endpoint = iam_service.projects().roles() - elif role.startswith("organizations/"): - endpoint = iam_service.organizations().roles() - else: - raise Exception(f"Invalid role {role}") + if role.startswith("roles/"): + endpoint = iam_service.roles() + elif role.startswith("projects/"): + endpoint = iam_service.projects().roles() + elif role.startswith("organizations/"): + endpoint = iam_service.organizations().roles() + else: + raise Exception(f"Invalid role {role}") - response = endpoint.get(name=role).execute() - permissions = response.get("includedPermissions") - return permissions + response = endpoint.get(name=role).execute() + permissions = response.get("includedPermissions") + return permissions @click.command() @click.argument("file", type=click.File("r")) def main(file): - """Verify that the set of GCP roles in FILE does not include the - permission setIamPolicy at project, folder or organization level + """Verify that the set of GCP roles in FILE does not include the + permission setIamPolicy at project, folder or organization level - This program authenticates against GCP using default application - credentials to query project and organization level roles. + This program authenticates against GCP using default application + credentials to query project and organization level roles. - """ - clean_roles = [x.rstrip(" \n") for x in file] - roles = (x for x in clean_roles if x) + """ + clean_roles = [x.rstrip(" \n") for x in file] + roles = (x for x in clean_roles if x) - allok = True - for role in roles: - try: - permissions = set(get_role_permissions(role)) - except Error as e: - print(f"WARNING: can't read {role}: {e}") - allok = False - else: - matched_sensitive_permissions = SENSITIVE_PERMISSIONS & permissions - if matched_sensitive_permissions: - print(f"WARNING: {role} contains {matched_sensitive_permissions}") - allok = False - else: - print(f"{role} ok") + allok = True + for role in roles: + try: + permissions = set(get_role_permissions(role)) + except Error as e: + print(f"WARNING: can't read {role}: {e}") + allok = False + else: + matched_sensitive_permissions = SENSITIVE_PERMISSIONS & permissions + if matched_sensitive_permissions: + print(f"WARNING: {role} contains {matched_sensitive_permissions}") + allok = False + else: + print(f"{role} ok") - exit(0 if allok else 1) + exit(0 if allok else 1) if __name__ == "__main__": - main() + main() diff --git a/cloud-operations/iam-delegated-role-grants/main.tf b/cloud-operations/iam-delegated-role-grants/main.tf index cdd8d35d1..b9be3dadb 100644 --- a/cloud-operations/iam-delegated-role-grants/main.tf +++ b/cloud-operations/iam-delegated-role-grants/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. diff --git a/cloud-operations/iam-delegated-role-grants/outputs.tf b/cloud-operations/iam-delegated-role-grants/outputs.tf index d28a337a8..11a2ddf11 100644 --- a/cloud-operations/iam-delegated-role-grants/outputs.tf +++ b/cloud-operations/iam-delegated-role-grants/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. diff --git a/cloud-operations/iam-delegated-role-grants/variables.tf b/cloud-operations/iam-delegated-role-grants/variables.tf index e90100e92..6686f568b 100644 --- a/cloud-operations/iam-delegated-role-grants/variables.tf +++ b/cloud-operations/iam-delegated-role-grants/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. diff --git a/cloud-operations/iam-delegated-role-grants/versions.tf b/cloud-operations/iam-delegated-role-grants/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/iam-delegated-role-grants/versions.tf +++ b/cloud-operations/iam-delegated-role-grants/versions.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. diff --git a/cloud-operations/onprem-sa-key-management/backend.tf.sample b/cloud-operations/onprem-sa-key-management/backend.tf.sample index 9eebc1bad..a22a87d8b 100644 --- a/cloud-operations/onprem-sa-key-management/backend.tf.sample +++ b/cloud-operations/onprem-sa-key-management/backend.tf.sample @@ -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. diff --git a/cloud-operations/onprem-sa-key-management/main.tf b/cloud-operations/onprem-sa-key-management/main.tf index e4ffe168d..1fc53bbb4 100644 --- a/cloud-operations/onprem-sa-key-management/main.tf +++ b/cloud-operations/onprem-sa-key-management/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. diff --git a/cloud-operations/onprem-sa-key-management/outputs.tf b/cloud-operations/onprem-sa-key-management/outputs.tf index a8f9c16ab..9174474cd 100644 --- a/cloud-operations/onprem-sa-key-management/outputs.tf +++ b/cloud-operations/onprem-sa-key-management/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. diff --git a/cloud-operations/onprem-sa-key-management/variables.tf b/cloud-operations/onprem-sa-key-management/variables.tf index 60f893c57..329c5debd 100644 --- a/cloud-operations/onprem-sa-key-management/variables.tf +++ b/cloud-operations/onprem-sa-key-management/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. diff --git a/cloud-operations/onprem-sa-key-management/versions.tf b/cloud-operations/onprem-sa-key-management/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/onprem-sa-key-management/versions.tf +++ b/cloud-operations/onprem-sa-key-management/versions.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. diff --git a/cloud-operations/packer-image-builder/main.tf b/cloud-operations/packer-image-builder/main.tf index 122ea104d..4e0735370 100644 --- a/cloud-operations/packer-image-builder/main.tf +++ b/cloud-operations/packer-image-builder/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. @@ -128,4 +128,4 @@ resource "local_file" "packer-vars" { USE_IAP = "${var.use_iap}" }) filename = local.packer_variables_file -} \ No newline at end of file +} diff --git a/cloud-operations/packer-image-builder/outputs.tf b/cloud-operations/packer-image-builder/outputs.tf index b19cac70b..1ca7bfc0b 100644 --- a/cloud-operations/packer-image-builder/outputs.tf +++ b/cloud-operations/packer-image-builder/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. diff --git a/cloud-operations/packer-image-builder/packer/build.pkr.hcl b/cloud-operations/packer-image-builder/packer/build.pkr.hcl index 71c0c2d01..259a0b687 100644 --- a/cloud-operations/packer-image-builder/packer/build.pkr.hcl +++ b/cloud-operations/packer-image-builder/packer/build.pkr.hcl @@ -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. diff --git a/cloud-operations/packer-image-builder/packer/install_httpd.sh b/cloud-operations/packer-image-builder/packer/install_httpd.sh index 9a26b3aac..6d0c6a8e6 100644 --- a/cloud-operations/packer-image-builder/packer/install_httpd.sh +++ b/cloud-operations/packer-image-builder/packer/install_httpd.sh @@ -1,6 +1,6 @@ #!/bin/sh -# 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. diff --git a/cloud-operations/packer-image-builder/packer/variables.pkr.hcl b/cloud-operations/packer-image-builder/packer/variables.pkr.hcl index 6686fd842..39ac98289 100644 --- a/cloud-operations/packer-image-builder/packer/variables.pkr.hcl +++ b/cloud-operations/packer-image-builder/packer/variables.pkr.hcl @@ -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. diff --git a/cloud-operations/packer-image-builder/variables.tf b/cloud-operations/packer-image-builder/variables.tf index 8ca8e4b3b..d3b49a2f8 100644 --- a/cloud-operations/packer-image-builder/variables.tf +++ b/cloud-operations/packer-image-builder/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. diff --git a/cloud-operations/packer-image-builder/versions.tf b/cloud-operations/packer-image-builder/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/packer-image-builder/versions.tf +++ b/cloud-operations/packer-image-builder/versions.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. diff --git a/cloud-operations/quota-monitoring/backend.tf.sample b/cloud-operations/quota-monitoring/backend.tf.sample index add436846..a0a18aed2 100644 --- a/cloud-operations/quota-monitoring/backend.tf.sample +++ b/cloud-operations/quota-monitoring/backend.tf.sample @@ -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. diff --git a/cloud-operations/quota-monitoring/cf/main.py b/cloud-operations/quota-monitoring/cf/main.py index ed26dc0b8..622c28310 100755 --- a/cloud-operations/quota-monitoring/cf/main.py +++ b/cloud-operations/quota-monitoring/cf/main.py @@ -1,5 +1,5 @@ #! /usr/bin/env python3 -# 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. diff --git a/cloud-operations/quota-monitoring/main.tf b/cloud-operations/quota-monitoring/main.tf index 01d036910..66b6185db 100644 --- a/cloud-operations/quota-monitoring/main.tf +++ b/cloud-operations/quota-monitoring/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. diff --git a/cloud-operations/quota-monitoring/outputs.tf b/cloud-operations/quota-monitoring/outputs.tf index 9d277cce1..3ea74b550 100644 --- a/cloud-operations/quota-monitoring/outputs.tf +++ b/cloud-operations/quota-monitoring/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. diff --git a/cloud-operations/quota-monitoring/variables.tf b/cloud-operations/quota-monitoring/variables.tf index 02d3b1d78..12803af01 100644 --- a/cloud-operations/quota-monitoring/variables.tf +++ b/cloud-operations/quota-monitoring/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. diff --git a/cloud-operations/quota-monitoring/versions.tf b/cloud-operations/quota-monitoring/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/quota-monitoring/versions.tf +++ b/cloud-operations/quota-monitoring/versions.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. diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/backend.tf.sample b/cloud-operations/scheduled-asset-inventory-export-bq/backend.tf.sample index 12097d0ab..fafd25d51 100644 --- a/cloud-operations/scheduled-asset-inventory-export-bq/backend.tf.sample +++ b/cloud-operations/scheduled-asset-inventory-export-bq/backend.tf.sample @@ -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. diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/cf/main.py b/cloud-operations/scheduled-asset-inventory-export-bq/cf/main.py index 9f9cfb3f0..85bba4650 100755 --- a/cloud-operations/scheduled-asset-inventory-export-bq/cf/main.py +++ b/cloud-operations/scheduled-asset-inventory-export-bq/cf/main.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. @@ -62,7 +62,8 @@ def main_cli(project=None, bq_project=None, bq_dataset=None, bq_table=None, bq_t the dataset specified on a dated table with the name specified. ''' try: - _main(project, bq_project, bq_dataset, bq_table, bq_table_overwrite, target_node, read_time, verbose) + _main(project, bq_project, bq_dataset, bq_table, + bq_table_overwrite, target_node, read_time, verbose) except RuntimeError: logging.exception('exception raised') @@ -89,10 +90,10 @@ def _main(project=None, bq_project=None, bq_dataset=None, bq_table=None, bq_tabl if bq_table_overwrite == False: read_time = datetime.datetime.now() output_config.bigquery_destination.table = '%s_%s' % ( - bq_table, read_time.strftime('%Y%m%d')) + bq_table, read_time.strftime('%Y%m%d')) else: - output_config.bigquery_destination.table = '%s_latest' % ( - bq_table) + output_config.bigquery_destination.table = '%s_latest' % ( + bq_table) content_type = asset_v1.ContentType.RESOURCE output_config.bigquery_destination.dataset = 'projects/%s/datasets/%s' % ( bq_project, bq_dataset) diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/cffile/main.py b/cloud-operations/scheduled-asset-inventory-export-bq/cffile/main.py index cb54b0bc6..ed2e54b85 100755 --- a/cloud-operations/scheduled-asset-inventory-export-bq/cffile/main.py +++ b/cloud-operations/scheduled-asset-inventory-export-bq/cffile/main.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. @@ -44,6 +44,7 @@ def _configure_logging(verbose=True): logging.basicConfig(level=level) warnings.filterwarnings('ignore', r'.*end user credentials.*', UserWarning) + @click.command() @click.option('--bucket', required=True, help='GCS bucket for export') @click.option('--filename', required=True, help='Path and filename with extension to export e.g. folder/export.json .') @@ -60,6 +61,7 @@ def main_cli(bucket=None, filename=None, format=None, bq_dataset=None, bq_table= except RuntimeError: logging.exception('exception raised') + def main(event, context): 'Cloud Function entry point.' try: @@ -83,10 +85,10 @@ def _main(bucket=None, filename=None, format=None, bq_dataset=None, bq_table=Non table_ref = dataset_ref.table(bq_table) job_config = bigquery.job.ExtractJobConfig() job_config.destination_format = ( - getattr(bigquery.DestinationFormat, format) ) + getattr(bigquery.DestinationFormat, format)) extract_job = client.extract_table( - table_ref, destination_uri, job_config=job_config - ) + table_ref, destination_uri, job_config=job_config + ) try: extract_job.result() except (GoogleAPIError, googleapiclient.errors.HttpError) as e: @@ -96,4 +98,4 @@ def _main(bucket=None, filename=None, format=None, bq_dataset=None, bq_table=Non if __name__ == '__main__': - main_cli() \ No newline at end of file + main_cli() diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/main.tf b/cloud-operations/scheduled-asset-inventory-export-bq/main.tf index 39c1e37df..a0a045bec 100644 --- a/cloud-operations/scheduled-asset-inventory-export-bq/main.tf +++ b/cloud-operations/scheduled-asset-inventory-export-bq/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. diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/outputs.tf b/cloud-operations/scheduled-asset-inventory-export-bq/outputs.tf index 8a4af39a1..45d321709 100644 --- a/cloud-operations/scheduled-asset-inventory-export-bq/outputs.tf +++ b/cloud-operations/scheduled-asset-inventory-export-bq/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. diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/variables.tf b/cloud-operations/scheduled-asset-inventory-export-bq/variables.tf index b31291b8a..8c6454473 100644 --- a/cloud-operations/scheduled-asset-inventory-export-bq/variables.tf +++ b/cloud-operations/scheduled-asset-inventory-export-bq/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. diff --git a/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf index 1cc6bf899..290412687 100644 --- a/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf +++ b/cloud-operations/scheduled-asset-inventory-export-bq/versions.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. diff --git a/data-solutions/cmek-via-centralized-kms/backend.tf.sample b/data-solutions/cmek-via-centralized-kms/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/data-solutions/cmek-via-centralized-kms/backend.tf.sample +++ b/data-solutions/cmek-via-centralized-kms/backend.tf.sample @@ -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. diff --git a/data-solutions/cmek-via-centralized-kms/main.tf b/data-solutions/cmek-via-centralized-kms/main.tf index 66372b2c6..2889d87fa 100644 --- a/data-solutions/cmek-via-centralized-kms/main.tf +++ b/data-solutions/cmek-via-centralized-kms/main.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. diff --git a/data-solutions/cmek-via-centralized-kms/outputs.tf b/data-solutions/cmek-via-centralized-kms/outputs.tf index fdda13dc1..1d7767a5a 100644 --- a/data-solutions/cmek-via-centralized-kms/outputs.tf +++ b/data-solutions/cmek-via-centralized-kms/outputs.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. diff --git a/data-solutions/cmek-via-centralized-kms/variables.tf b/data-solutions/cmek-via-centralized-kms/variables.tf index f9f1ed526..737bde3dd 100644 --- a/data-solutions/cmek-via-centralized-kms/variables.tf +++ b/data-solutions/cmek-via-centralized-kms/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. diff --git a/data-solutions/cmek-via-centralized-kms/versions.tf b/data-solutions/cmek-via-centralized-kms/versions.tf index 1cc6bf899..290412687 100644 --- a/data-solutions/cmek-via-centralized-kms/versions.tf +++ b/data-solutions/cmek-via-centralized-kms/versions.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. diff --git a/data-solutions/data-platform-foundations/01-environment/versions.tf b/data-solutions/data-platform-foundations/01-environment/versions.tf index 1cc6bf899..290412687 100644 --- a/data-solutions/data-platform-foundations/01-environment/versions.tf +++ b/data-solutions/data-platform-foundations/01-environment/versions.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. diff --git a/data-solutions/data-platform-foundations/02-resources/providers.tf b/data-solutions/data-platform-foundations/02-resources/providers.tf index c2ad682c5..2907650f7 100644 --- a/data-solutions/data-platform-foundations/02-resources/providers.tf +++ b/data-solutions/data-platform-foundations/02-resources/providers.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. diff --git a/data-solutions/data-platform-foundations/02-resources/versions.tf b/data-solutions/data-platform-foundations/02-resources/versions.tf index 1cc6bf899..290412687 100644 --- a/data-solutions/data-platform-foundations/02-resources/versions.tf +++ b/data-solutions/data-platform-foundations/02-resources/versions.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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/backend.tf.sample b/data-solutions/gcs-to-bq-with-dataflow/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/backend.tf.sample +++ b/data-solutions/gcs-to-bq-with-dataflow/backend.tf.sample @@ -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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/main.tf b/data-solutions/gcs-to-bq-with-dataflow/main.tf index d64789a6d..f64c46965 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/main.tf +++ b/data-solutions/gcs-to-bq-with-dataflow/main.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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/outputs.tf b/data-solutions/gcs-to-bq-with-dataflow/outputs.tf index 315fc9094..0678de675 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/outputs.tf +++ b/data-solutions/gcs-to-bq-with-dataflow/outputs.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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/scripts/data_ingestion/data_ingestion.py b/data-solutions/gcs-to-bq-with-dataflow/scripts/data_ingestion/data_ingestion.py index 4745e2428..d31187d32 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/scripts/data_ingestion/data_ingestion.py +++ b/data-solutions/gcs-to-bq-with-dataflow/scripts/data_ingestion/data_ingestion.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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/scripts/person_details_generator/person_details_generator.py b/data-solutions/gcs-to-bq-with-dataflow/scripts/person_details_generator/person_details_generator.py index 9292e4f10..84b6a262d 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/scripts/person_details_generator/person_details_generator.py +++ b/data-solutions/gcs-to-bq-with-dataflow/scripts/person_details_generator/person_details_generator.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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/variables.tf b/data-solutions/gcs-to-bq-with-dataflow/variables.tf index 1b4c4dff6..8bb4aa666 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/variables.tf +++ b/data-solutions/gcs-to-bq-with-dataflow/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. diff --git a/data-solutions/gcs-to-bq-with-dataflow/versions.tf b/data-solutions/gcs-to-bq-with-dataflow/versions.tf index 1cc6bf899..290412687 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/versions.tf +++ b/data-solutions/gcs-to-bq-with-dataflow/versions.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. diff --git a/default-versions.tf b/default-versions.tf index 1cc6bf899..290412687 100644 --- a/default-versions.tf +++ b/default-versions.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. diff --git a/factories/example-environments/dev/main.tf b/factories/example-environments/dev/main.tf index a7c58c1e6..36233f7b5 100644 --- a/factories/example-environments/dev/main.tf +++ b/factories/example-environments/dev/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. diff --git a/factories/example-environments/dev/versions.tf b/factories/example-environments/dev/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/example-environments/dev/versions.tf +++ b/factories/example-environments/dev/versions.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. diff --git a/factories/example-environments/prod/main.tf b/factories/example-environments/prod/main.tf index a7c58c1e6..36233f7b5 100644 --- a/factories/example-environments/prod/main.tf +++ b/factories/example-environments/prod/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. diff --git a/factories/example-environments/prod/versions.tf b/factories/example-environments/prod/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/example-environments/prod/versions.tf +++ b/factories/example-environments/prod/versions.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. diff --git a/factories/firewall-hierarchical-policies/main.tf b/factories/firewall-hierarchical-policies/main.tf index b63c9f5ab..499a2a5b3 100644 --- a/factories/firewall-hierarchical-policies/main.tf +++ b/factories/firewall-hierarchical-policies/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. diff --git a/factories/firewall-hierarchical-policies/outputs.tf b/factories/firewall-hierarchical-policies/outputs.tf index 42d6738d4..4ead20e34 100644 --- a/factories/firewall-hierarchical-policies/outputs.tf +++ b/factories/firewall-hierarchical-policies/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. diff --git a/factories/firewall-hierarchical-policies/variables.tf b/factories/firewall-hierarchical-policies/variables.tf index 503a2e010..1fafc45f9 100644 --- a/factories/firewall-hierarchical-policies/variables.tf +++ b/factories/firewall-hierarchical-policies/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. diff --git a/factories/firewall-hierarchical-policies/versions.tf b/factories/firewall-hierarchical-policies/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/firewall-hierarchical-policies/versions.tf +++ b/factories/firewall-hierarchical-policies/versions.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. diff --git a/factories/firewall-vpc-rules/flat/main.tf b/factories/firewall-vpc-rules/flat/main.tf index ab19b23a7..d478625c2 100644 --- a/factories/firewall-vpc-rules/flat/main.tf +++ b/factories/firewall-vpc-rules/flat/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. diff --git a/factories/firewall-vpc-rules/flat/outputs.tf b/factories/firewall-vpc-rules/flat/outputs.tf index ce49bff94..f60e9c92f 100644 --- a/factories/firewall-vpc-rules/flat/outputs.tf +++ b/factories/firewall-vpc-rules/flat/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. diff --git a/factories/firewall-vpc-rules/flat/variables.tf b/factories/firewall-vpc-rules/flat/variables.tf index 850c642f1..04cb7a567 100644 --- a/factories/firewall-vpc-rules/flat/variables.tf +++ b/factories/firewall-vpc-rules/flat/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. diff --git a/factories/firewall-vpc-rules/flat/versions.tf b/factories/firewall-vpc-rules/flat/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/firewall-vpc-rules/flat/versions.tf +++ b/factories/firewall-vpc-rules/flat/versions.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. diff --git a/factories/firewall-vpc-rules/nested/main.tf b/factories/firewall-vpc-rules/nested/main.tf index 62f535bc3..afbf44739 100644 --- a/factories/firewall-vpc-rules/nested/main.tf +++ b/factories/firewall-vpc-rules/nested/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. diff --git a/factories/firewall-vpc-rules/nested/outputs.tf b/factories/firewall-vpc-rules/nested/outputs.tf index 36b9e1662..e6f5dc3ff 100644 --- a/factories/firewall-vpc-rules/nested/outputs.tf +++ b/factories/firewall-vpc-rules/nested/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. diff --git a/factories/firewall-vpc-rules/nested/variables.tf b/factories/firewall-vpc-rules/nested/variables.tf index 503a2e010..1fafc45f9 100644 --- a/factories/firewall-vpc-rules/nested/variables.tf +++ b/factories/firewall-vpc-rules/nested/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. diff --git a/factories/firewall-vpc-rules/nested/versions.tf b/factories/firewall-vpc-rules/nested/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/firewall-vpc-rules/nested/versions.tf +++ b/factories/firewall-vpc-rules/nested/versions.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. diff --git a/factories/subnets/main.tf b/factories/subnets/main.tf index 0bed84072..e837d8076 100644 --- a/factories/subnets/main.tf +++ b/factories/subnets/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. diff --git a/factories/subnets/outputs.tf b/factories/subnets/outputs.tf index 2cdecb2ef..b068c1ccc 100644 --- a/factories/subnets/outputs.tf +++ b/factories/subnets/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. diff --git a/factories/subnets/variables.tf b/factories/subnets/variables.tf index fbea28bbe..c6d3e731f 100644 --- a/factories/subnets/variables.tf +++ b/factories/subnets/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. diff --git a/factories/subnets/versions.tf b/factories/subnets/versions.tf index 1cc6bf899..290412687 100644 --- a/factories/subnets/versions.tf +++ b/factories/subnets/versions.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. diff --git a/foundations/business-units/backend.tf.sample b/foundations/business-units/backend.tf.sample index 1a4ffa12f..065cd071e 100644 --- a/foundations/business-units/backend.tf.sample +++ b/foundations/business-units/backend.tf.sample @@ -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. diff --git a/foundations/business-units/main.tf b/foundations/business-units/main.tf index 43782c693..015676825 100644 --- a/foundations/business-units/main.tf +++ b/foundations/business-units/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. diff --git a/foundations/business-units/outputs.tf b/foundations/business-units/outputs.tf index a828ef8c4..4456123a0 100644 --- a/foundations/business-units/outputs.tf +++ b/foundations/business-units/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. diff --git a/foundations/business-units/terraform.tfvars.sample b/foundations/business-units/terraform.tfvars.sample index b4f27c812..7036b9697 100644 --- a/foundations/business-units/terraform.tfvars.sample +++ b/foundations/business-units/terraform.tfvars.sample @@ -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. diff --git a/foundations/business-units/variables.tf b/foundations/business-units/variables.tf index 88b9a7773..69f5ac3b2 100644 --- a/foundations/business-units/variables.tf +++ b/foundations/business-units/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. diff --git a/foundations/business-units/versions.tf b/foundations/business-units/versions.tf index 1cc6bf899..290412687 100644 --- a/foundations/business-units/versions.tf +++ b/foundations/business-units/versions.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. diff --git a/foundations/environments/backend.tf.sample b/foundations/environments/backend.tf.sample index acf3b1be1..4232a96eb 100644 --- a/foundations/environments/backend.tf.sample +++ b/foundations/environments/backend.tf.sample @@ -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. diff --git a/foundations/environments/locals.tf b/foundations/environments/locals.tf index 9c501d71a..f6c9ae0ba 100644 --- a/foundations/environments/locals.tf +++ b/foundations/environments/locals.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. diff --git a/foundations/environments/main.tf b/foundations/environments/main.tf index 7174b2f5b..a3cea4720 100644 --- a/foundations/environments/main.tf +++ b/foundations/environments/main.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. diff --git a/foundations/environments/outputs.tf b/foundations/environments/outputs.tf index 50eb79a24..4d5f9d4c2 100644 --- a/foundations/environments/outputs.tf +++ b/foundations/environments/outputs.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. diff --git a/foundations/environments/variables.tf b/foundations/environments/variables.tf index 2458b8f24..3b38a8ca2 100644 --- a/foundations/environments/variables.tf +++ b/foundations/environments/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. diff --git a/foundations/environments/versions.tf b/foundations/environments/versions.tf index 1cc6bf899..290412687 100644 --- a/foundations/environments/versions.tf +++ b/foundations/environments/versions.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. diff --git a/modules/__experimental/net-neg/main.tf b/modules/__experimental/net-neg/main.tf index dd5ef7e5c..773a75c67 100644 --- a/modules/__experimental/net-neg/main.tf +++ b/modules/__experimental/net-neg/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. diff --git a/modules/__experimental/net-neg/outputs.tf b/modules/__experimental/net-neg/outputs.tf index 6b5eac522..351a020c5 100644 --- a/modules/__experimental/net-neg/outputs.tf +++ b/modules/__experimental/net-neg/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. diff --git a/modules/__experimental/net-neg/variables.tf b/modules/__experimental/net-neg/variables.tf index 6594f11d8..a3f872c61 100644 --- a/modules/__experimental/net-neg/variables.tf +++ b/modules/__experimental/net-neg/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. diff --git a/modules/__experimental/net-neg/versions.tf b/modules/__experimental/net-neg/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/__experimental/net-neg/versions.tf +++ b/modules/__experimental/net-neg/versions.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. diff --git a/modules/apigee-organization/main.tf b/modules/apigee-organization/main.tf index b1c134814..fe798f929 100644 --- a/modules/apigee-organization/main.tf +++ b/modules/apigee-organization/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. @@ -52,4 +52,4 @@ resource "google_apigee_envgroup_attachment" "env_to_envgroup_attachment" { for_each = { for pair in local.env_envgroup_pairs : "${pair.envgroup}-${pair.env}" => pair } envgroup_id = google_apigee_envgroup.apigee_envgroup[each.value.envgroup].id environment = google_apigee_environment.apigee_env[each.value.env].name -} \ No newline at end of file +} diff --git a/modules/apigee-organization/outputs.tf b/modules/apigee-organization/outputs.tf index aa8b74ec0..f53a46961 100644 --- a/modules/apigee-organization/outputs.tf +++ b/modules/apigee-organization/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. diff --git a/modules/apigee-organization/variables.tf b/modules/apigee-organization/variables.tf index 7e8550203..d7ab70dac 100644 --- a/modules/apigee-organization/variables.tf +++ b/modules/apigee-organization/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. diff --git a/modules/apigee-organization/versions.tf b/modules/apigee-organization/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/apigee-organization/versions.tf +++ b/modules/apigee-organization/versions.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. diff --git a/modules/apigee-x-instance/main.tf b/modules/apigee-x-instance/main.tf index 552d6d085..1d6f84e85 100644 --- a/modules/apigee-x-instance/main.tf +++ b/modules/apigee-x-instance/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. diff --git a/modules/apigee-x-instance/outputs.tf b/modules/apigee-x-instance/outputs.tf index 0f2d5d6bb..d21a422aa 100644 --- a/modules/apigee-x-instance/outputs.tf +++ b/modules/apigee-x-instance/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. diff --git a/modules/apigee-x-instance/variables.tf b/modules/apigee-x-instance/variables.tf index 219ee7d6a..a1cfc9542 100644 --- a/modules/apigee-x-instance/variables.tf +++ b/modules/apigee-x-instance/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. diff --git a/modules/apigee-x-instance/versions.tf b/modules/apigee-x-instance/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/apigee-x-instance/versions.tf +++ b/modules/apigee-x-instance/versions.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. diff --git a/modules/artifact-registry/main.tf b/modules/artifact-registry/main.tf index 368ccc1ca..8b01e0961 100644 --- a/modules/artifact-registry/main.tf +++ b/modules/artifact-registry/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. diff --git a/modules/artifact-registry/outputs.tf b/modules/artifact-registry/outputs.tf index e9cc69af8..cb035b760 100644 --- a/modules/artifact-registry/outputs.tf +++ b/modules/artifact-registry/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. diff --git a/modules/artifact-registry/variables.tf b/modules/artifact-registry/variables.tf index b350e8247..1cb16b747 100644 --- a/modules/artifact-registry/variables.tf +++ b/modules/artifact-registry/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. diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.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. diff --git a/modules/bigquery-dataset/main.tf b/modules/bigquery-dataset/main.tf index 24f72a238..fc8f8706d 100644 --- a/modules/bigquery-dataset/main.tf +++ b/modules/bigquery-dataset/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. diff --git a/modules/bigquery-dataset/outputs.tf b/modules/bigquery-dataset/outputs.tf index c8a533b33..dd2da22c6 100644 --- a/modules/bigquery-dataset/outputs.tf +++ b/modules/bigquery-dataset/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. diff --git a/modules/bigquery-dataset/variables.tf b/modules/bigquery-dataset/variables.tf index cadf5aeb6..5f8028abf 100644 --- a/modules/bigquery-dataset/variables.tf +++ b/modules/bigquery-dataset/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. diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.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. diff --git a/modules/bigtable-instance/main.tf b/modules/bigtable-instance/main.tf index f3081fca3..49423d948 100644 --- a/modules/bigtable-instance/main.tf +++ b/modules/bigtable-instance/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. diff --git a/modules/bigtable-instance/outputs.tf b/modules/bigtable-instance/outputs.tf index afbb16070..3cb462246 100644 --- a/modules/bigtable-instance/outputs.tf +++ b/modules/bigtable-instance/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. diff --git a/modules/bigtable-instance/variables.tf b/modules/bigtable-instance/variables.tf index d8cf2dc8b..d98cfab57 100644 --- a/modules/bigtable-instance/variables.tf +++ b/modules/bigtable-instance/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. diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.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. diff --git a/modules/billing-budget/main.tf b/modules/billing-budget/main.tf index 739dcedd4..2c6838dc7 100644 --- a/modules/billing-budget/main.tf +++ b/modules/billing-budget/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. diff --git a/modules/billing-budget/outputs.tf b/modules/billing-budget/outputs.tf index 9f2dd4ffb..1d4e082f1 100644 --- a/modules/billing-budget/outputs.tf +++ b/modules/billing-budget/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. diff --git a/modules/billing-budget/variables.tf b/modules/billing-budget/variables.tf index e37301fab..bc836fce3 100644 --- a/modules/billing-budget/variables.tf +++ b/modules/billing-budget/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. diff --git a/modules/billing-budget/versions.tf b/modules/billing-budget/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/billing-budget/versions.tf +++ b/modules/billing-budget/versions.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. diff --git a/modules/cloud-config-container/coredns/cloud-config.yaml b/modules/cloud-config-container/coredns/cloud-config.yaml index 29616b438..0796fc6b9 100644 --- a/modules/cloud-config-container/coredns/cloud-config.yaml +++ b/modules/cloud-config-container/coredns/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/coredns/main.tf b/modules/cloud-config-container/coredns/main.tf index 3d9079e74..789168ca4 100644 --- a/modules/cloud-config-container/coredns/main.tf +++ b/modules/cloud-config-container/coredns/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. diff --git a/modules/cloud-config-container/coredns/outputs.tf b/modules/cloud-config-container/coredns/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/coredns/outputs.tf +++ b/modules/cloud-config-container/coredns/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. diff --git a/modules/cloud-config-container/coredns/variables.tf b/modules/cloud-config-container/coredns/variables.tf index 33f6a3199..c323017fc 100644 --- a/modules/cloud-config-container/coredns/variables.tf +++ b/modules/cloud-config-container/coredns/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. diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/coredns/versions.tf +++ b/modules/cloud-config-container/coredns/versions.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. diff --git a/modules/cloud-config-container/cos-generic-metadata/cloud-config.yaml b/modules/cloud-config-container/cos-generic-metadata/cloud-config.yaml index 535e33601..fc75616a5 100644 --- a/modules/cloud-config-container/cos-generic-metadata/cloud-config.yaml +++ b/modules/cloud-config-container/cos-generic-metadata/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/cos-generic-metadata/main.tf b/modules/cloud-config-container/cos-generic-metadata/main.tf index db1596503..5019fa097 100644 --- a/modules/cloud-config-container/cos-generic-metadata/main.tf +++ b/modules/cloud-config-container/cos-generic-metadata/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. diff --git a/modules/cloud-config-container/cos-generic-metadata/outputs.tf b/modules/cloud-config-container/cos-generic-metadata/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/cos-generic-metadata/outputs.tf +++ b/modules/cloud-config-container/cos-generic-metadata/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. diff --git a/modules/cloud-config-container/cos-generic-metadata/variables.tf b/modules/cloud-config-container/cos-generic-metadata/variables.tf index 0f4a947d2..41a11557e 100644 --- a/modules/cloud-config-container/cos-generic-metadata/variables.tf +++ b/modules/cloud-config-container/cos-generic-metadata/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. diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tf +++ b/modules/cloud-config-container/cos-generic-metadata/versions.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. diff --git a/modules/cloud-config-container/envoy-traffic-director/files/customize.sh b/modules/cloud-config-container/envoy-traffic-director/files/customize.sh index 5593826fc..85c8746ea 100644 --- a/modules/cloud-config-container/envoy-traffic-director/files/customize.sh +++ b/modules/cloud-config-container/envoy-traffic-director/files/customize.sh @@ -1,5 +1,5 @@ #!/bin/bash -# 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. diff --git a/modules/cloud-config-container/envoy-traffic-director/files/envoy.yaml b/modules/cloud-config-container/envoy-traffic-director/files/envoy.yaml index 009b7a707..2be4ef3c5 100644 --- a/modules/cloud-config-container/envoy-traffic-director/files/envoy.yaml +++ b/modules/cloud-config-container/envoy-traffic-director/files/envoy.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. diff --git a/modules/cloud-config-container/envoy-traffic-director/main.tf b/modules/cloud-config-container/envoy-traffic-director/main.tf index c208a728e..cdb805c6b 100644 --- a/modules/cloud-config-container/envoy-traffic-director/main.tf +++ b/modules/cloud-config-container/envoy-traffic-director/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. diff --git a/modules/cloud-config-container/envoy-traffic-director/outputs.tf b/modules/cloud-config-container/envoy-traffic-director/outputs.tf index 2044eb46f..4ce8d2473 100644 --- a/modules/cloud-config-container/envoy-traffic-director/outputs.tf +++ b/modules/cloud-config-container/envoy-traffic-director/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. diff --git a/modules/cloud-config-container/envoy-traffic-director/variables.tf b/modules/cloud-config-container/envoy-traffic-director/variables.tf index a3c4f1f55..6eb7dcc75 100644 --- a/modules/cloud-config-container/envoy-traffic-director/variables.tf +++ b/modules/cloud-config-container/envoy-traffic-director/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. diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tf +++ b/modules/cloud-config-container/envoy-traffic-director/versions.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. diff --git a/modules/cloud-config-container/instance.tf b/modules/cloud-config-container/instance.tf index 447becf51..7f76f2183 100644 --- a/modules/cloud-config-container/instance.tf +++ b/modules/cloud-config-container/instance.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. diff --git a/modules/cloud-config-container/mysql/cloud-config.yaml b/modules/cloud-config-container/mysql/cloud-config.yaml index 0d5546b2f..1c792a744 100644 --- a/modules/cloud-config-container/mysql/cloud-config.yaml +++ b/modules/cloud-config-container/mysql/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/mysql/main.tf b/modules/cloud-config-container/mysql/main.tf index 2323582db..4e44c4693 100644 --- a/modules/cloud-config-container/mysql/main.tf +++ b/modules/cloud-config-container/mysql/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. diff --git a/modules/cloud-config-container/mysql/outputs.tf b/modules/cloud-config-container/mysql/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/mysql/outputs.tf +++ b/modules/cloud-config-container/mysql/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. diff --git a/modules/cloud-config-container/mysql/variables.tf b/modules/cloud-config-container/mysql/variables.tf index 107209659..52bb3dbbd 100644 --- a/modules/cloud-config-container/mysql/variables.tf +++ b/modules/cloud-config-container/mysql/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. diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/mysql/versions.tf +++ b/modules/cloud-config-container/mysql/versions.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. diff --git a/modules/cloud-config-container/nginx/cloud-config.yaml b/modules/cloud-config-container/nginx/cloud-config.yaml index 16ee0efd3..d061e0376 100644 --- a/modules/cloud-config-container/nginx/cloud-config.yaml +++ b/modules/cloud-config-container/nginx/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/nginx/main.tf b/modules/cloud-config-container/nginx/main.tf index a748759e4..a2fce41b8 100644 --- a/modules/cloud-config-container/nginx/main.tf +++ b/modules/cloud-config-container/nginx/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. diff --git a/modules/cloud-config-container/nginx/outputs.tf b/modules/cloud-config-container/nginx/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/nginx/outputs.tf +++ b/modules/cloud-config-container/nginx/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. diff --git a/modules/cloud-config-container/nginx/variables.tf b/modules/cloud-config-container/nginx/variables.tf index d38ca4c7a..dec89cc2b 100644 --- a/modules/cloud-config-container/nginx/variables.tf +++ b/modules/cloud-config-container/nginx/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. diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/nginx/versions.tf +++ b/modules/cloud-config-container/nginx/versions.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. diff --git a/modules/cloud-config-container/onprem/cloud-config.yaml b/modules/cloud-config-container/onprem/cloud-config.yaml index 471127225..ba27f84d5 100644 --- a/modules/cloud-config-container/onprem/cloud-config.yaml +++ b/modules/cloud-config-container/onprem/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile b/modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile index 033173aa8..7a22d9436 100644 --- a/modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile +++ b/modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile @@ -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. @@ -15,7 +15,7 @@ FROM alpine:latest RUN set -xe \ - && apk add --no-cache strongswan bash sudo + && apk add --no-cache strongswan bash sudo COPY entrypoint.sh /entrypoint.sh RUN chmod 0755 /entrypoint.sh diff --git a/modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml b/modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml index a24ab0bfc..b451e79a5 100644 --- a/modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml +++ b/modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml @@ -1,5 +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. @@ -17,14 +16,14 @@ # $ gcloud builds submit . --config=cloudbuild.yaml steps: -- name: 'gcr.io/cloud-builders/docker' - args: - - build - - --tag=gcr.io/$PROJECT_ID/strongswan - - --tag=gcr.io/$PROJECT_ID/strongswan:latest - - . - + - name: "gcr.io/cloud-builders/docker" + args: + - build + - --tag=gcr.io/$PROJECT_ID/strongswan + - --tag=gcr.io/$PROJECT_ID/strongswan:latest + - . + images: - - 'gcr.io/$PROJECT_ID/strongswan:latest' - + - "gcr.io/$PROJECT_ID/strongswan:latest" + timeout: 1200s diff --git a/modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh b/modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh index 3ae54954a..e99d1ec82 100644 --- a/modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh +++ b/modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# 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. diff --git a/modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh b/modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh index cce90acde..399ff629d 100644 --- a/modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh +++ b/modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh @@ -1,6 +1,6 @@ #!/bin/bash -# 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. diff --git a/modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile b/modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile index 87068a18b..dfc8f6ec3 100644 --- a/modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile +++ b/modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile @@ -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,11 +19,11 @@ COPY entrypoint.sh /entrypoint.sh RUN chmod 0755 /entrypoint.sh RUN apk update && \ - apk add bash curl bind-tools busybox-extras netcat-openbsd && \ - rm /var/cache/apk/* + apk add bash curl bind-tools busybox-extras netcat-openbsd && \ + rm /var/cache/apk/* RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && \ - chmod 755 kubectl && mv kubectl /usr/local/bin/ + chmod 755 kubectl && mv kubectl /usr/local/bin/ CMD ["/bin/bash"] diff --git a/modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml b/modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml index e3ef5f8e2..6da9ed88c 100644 --- a/modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml +++ b/modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml @@ -1,5 +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. @@ -17,14 +16,14 @@ # $ gcloud builds submit . --config=cloudbuild.yaml steps: -- name: 'gcr.io/cloud-builders/docker' - args: - - build - - --tag=gcr.io/$PROJECT_ID/toolbox - - --tag=gcr.io/$PROJECT_ID/toolbox:latest - - . - + - name: "gcr.io/cloud-builders/docker" + args: + - build + - --tag=gcr.io/$PROJECT_ID/toolbox + - --tag=gcr.io/$PROJECT_ID/toolbox:latest + - . + images: - - 'gcr.io/$PROJECT_ID/toolbox:latest' - + - "gcr.io/$PROJECT_ID/toolbox:latest" + timeout: 1200s diff --git a/modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh b/modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh index ad8c4c4b7..bee48ff6e 100644 --- a/modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh +++ b/modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# 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. diff --git a/modules/cloud-config-container/onprem/main.tf b/modules/cloud-config-container/onprem/main.tf index 6cff5bd0d..2e6165965 100644 --- a/modules/cloud-config-container/onprem/main.tf +++ b/modules/cloud-config-container/onprem/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. diff --git a/modules/cloud-config-container/onprem/outputs.tf b/modules/cloud-config-container/onprem/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/onprem/outputs.tf +++ b/modules/cloud-config-container/onprem/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. diff --git a/modules/cloud-config-container/onprem/static-vpn-gw-cloud-init.yaml b/modules/cloud-config-container/onprem/static-vpn-gw-cloud-init.yaml index 6a1e4e7a5..36be78bca 100644 --- a/modules/cloud-config-container/onprem/static-vpn-gw-cloud-init.yaml +++ b/modules/cloud-config-container/onprem/static-vpn-gw-cloud-init.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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,200 +26,211 @@ packages: - software-properties-common write_files: - -# Docker daemon configuration -- path: /etc/docker/daemon.json - owner: root:root - permissions: '0644' - content: | - { - "log-driver": "json-file", - "log-opts": { - "max-size": "10m" + # Docker daemon configuration + - path: /etc/docker/daemon.json + owner: root:root + permissions: "0644" + content: | + { + "log-driver": "json-file", + "log-opts": { + "max-size": "10m" + } } - } -# Docker compose systemd unit for onprem -- path: /etc/systemd/system/docker-onprem.service - permissions: 0644 - owner: root - content: | - [Install] - WantedBy=multi-user.target - [Unit] - Description=Start Docker Compose onprem infrastructure - After=network-online.target docker.socket - Wants=network-online.target docker.socket - [Service] - ExecStart=/bin/sh -c "cd /var/lib/docker-compose/onprem && /usr/local/bin/docker-compose up" - ExecStop=/bin/sh -c "cd /var/lib/docker-compose/onprem && /usr/local/bin/docker-compose down" + # Docker compose systemd unit for onprem + - path: /etc/systemd/system/docker-onprem.service + permissions: 0644 + owner: root + content: | + [Install] + WantedBy=multi-user.target + [Unit] + Description=Start Docker Compose onprem infrastructure + After=network-online.target docker.socket + Wants=network-online.target docker.socket + [Service] + ExecStart=/bin/sh -c "cd /var/lib/docker-compose/onprem && /usr/local/bin/docker-compose up" + ExecStop=/bin/sh -c "cd /var/lib/docker-compose/onprem && /usr/local/bin/docker-compose down" -# Docker compose configuration file for onprem -- path: /var/lib/docker-compose/onprem/docker-compose.yaml - permissions: 0644 - owner: root - content: | - version: "3" - services: - vpn: - image: gcr.io/pso-cft-fabric/strongswan:latest - networks: - onprem: - ipv4_address: ${vpn_ip_address} - ports: - - "500:500/udp" - - "4500:4500/udp" - privileged: true - cap_add: - - NET_ADMIN - volumes: - - "/lib/modules:/lib/modules:ro" - - "/etc/localtime:/etc/localtime:ro" - - "/var/lib/docker-compose/onprem/ipsec/ipsec.conf:/etc/ipsec.conf:ro" - - "/var/lib/docker-compose/onprem/ipsec/ipsec.secrets:/etc/ipsec.secrets:ro" - environment: - - LAN_NETWORKS=${local_ip_cidr_range} - dns: - image: coredns/coredns - command: "-conf /etc/coredns/Corefile" - depends_on: - - "vpn" - networks: - onprem: - ipv4_address: ${dns_ip_address} - volumes: - - "/var/lib/docker-compose/onprem/coredns:/etc/coredns:ro" - routing_sidecar_dns: - image: alpine - network_mode: service:dns - command: | - /bin/sh -c "\ - ip route del default &&\ - ip route add default via ${vpn_ip_address}" - privileged: true - web: - image: nginx:stable-alpine - depends_on: - - "vpn" - - "dns" + # Docker compose configuration file for onprem + - path: /var/lib/docker-compose/onprem/docker-compose.yaml + permissions: 0644 + owner: root + content: | + version: "3" + services: + vpn: + image: gcr.io/pso-cft-fabric/strongswan:latest + networks: + onprem: + ipv4_address: ${vpn_ip_address} + ports: + - "500:500/udp" + - "4500:4500/udp" + privileged: true + cap_add: + - NET_ADMIN + volumes: + - "/lib/modules:/lib/modules:ro" + - "/etc/localtime:/etc/localtime:ro" + - "/var/lib/docker-compose/onprem/ipsec/ipsec.conf:/etc/ipsec.conf:ro" + - "/var/lib/docker-compose/onprem/ipsec/ipsec.secrets:/etc/ipsec.secrets:ro" + environment: + - LAN_NETWORKS=${local_ip_cidr_range} dns: - - ${dns_ip_address} - networks: - onprem: - ipv4_address: ${web_ip_address} - volumes: - - "/var/lib/docker-compose/onprem/nginx:/usr/share/nginx/html:ro" - routing_sidecar_web: - image: alpine - network_mode: service:web - command: | - /bin/sh -c "\ - ip route del default &&\ - ip route add default via ${vpn_ip_address}" - privileged: true - toolbox: - image: gcr.io/pso-cft-fabric/toolbox:latest - networks: - onprem: - ipv4_address: ${toolbox_ip_address} - depends_on: - - "vpn" - - "dns" - - "web" - dns: - - ${dns_ip_address} - routing_sidecar_toolbox: - image: alpine - network_mode: service:toolbox - command: | - /bin/sh -c "\ - ip route del default &&\ - ip route add default via ${vpn_ip_address}" - privileged: true - networks: - onprem: - ipam: - driver: default - config: - - subnet: ${local_ip_cidr_range} + image: coredns/coredns + command: "-conf /etc/coredns/Corefile" + depends_on: + - "vpn" + networks: + onprem: + ipv4_address: ${dns_ip_address} + volumes: + - "/var/lib/docker-compose/onprem/coredns:/etc/coredns:ro" + routing_sidecar_dns: + image: alpine + network_mode: service:dns + command: | + /bin/sh -c "\ + ip route del default &&\ + ip route add default via ${vpn_ip_address}" + privileged: true + web: + image: nginx:stable-alpine + depends_on: + - "vpn" + - "dns" + dns: + - ${dns_ip_address} + networks: + onprem: + ipv4_address: ${web_ip_address} + volumes: + - "/var/lib/docker-compose/onprem/nginx:/usr/share/nginx/html:ro" + routing_sidecar_web: + image: alpine + network_mode: service:web + command: | + /bin/sh -c "\ + ip route del default &&\ + ip route add default via ${vpn_ip_address}" + privileged: true + toolbox: + image: gcr.io/pso-cft-fabric/toolbox:latest + networks: + onprem: + ipv4_address: ${toolbox_ip_address} + depends_on: + - "vpn" + - "dns" + - "web" + dns: + - ${dns_ip_address} + routing_sidecar_toolbox: + image: alpine + network_mode: service:toolbox + command: | + /bin/sh -c "\ + ip route del default &&\ + ip route add default via ${vpn_ip_address}" + privileged: true + networks: + onprem: + ipam: + driver: default + config: + - subnet: ${local_ip_cidr_range} -# IPSEC tunnel secret -- path: /var/lib/docker-compose/onprem/ipsec/ipsec.secrets - owner: root:root - permissions: '0600' - content: | - : PSK "${shared_secret}" + # IPSEC tunnel secret + - path: /var/lib/docker-compose/onprem/ipsec/ipsec.secrets + owner: root:root + permissions: "0600" + content: | + : PSK "${shared_secret}" -# IPSEC tunnel configuration -- path: /var/lib/docker-compose/onprem/ipsec/ipsec.conf - owner: root:root - permissions: '0644' - content: | - conn %default - ikelifetime=600m - keylife=180m - rekeymargin=3m - keyingtries=3 - keyexchange=ikev2 - mobike=no - ike=aes256gcm16-sha512-modp2048 - esp=aes256gcm16-sha512-modp8192 - authby=psk + # IPSEC tunnel configuration + - path: /var/lib/docker-compose/onprem/ipsec/ipsec.conf + owner: root:root + permissions: "0644" + content: | + conn %default + ikelifetime=600m + keylife=180m + rekeymargin=3m + keyingtries=3 + keyexchange=ikev2 + mobike=no + ike=aes256gcm16-sha512-modp2048 + esp=aes256gcm16-sha512-modp8192 + authby=psk - conn gcp - left=%any - leftid=%any - leftsubnet=${local_ip_cidr_range} - leftauth=psk - right=${peer_ip_wildcard} - rightid=${peer_ip} - rightsubnet=199.36.153.4/30,35.199.192.0/19,${remote_ip_cidr_ranges} - rightauth=psk - type=tunnel - auto=start - dpdaction=restart - closeaction=restart + conn gcp + left=%any + leftid=%any + leftsubnet=${local_ip_cidr_range} + leftauth=psk + right=${peer_ip_wildcard} + rightid=${peer_ip} + rightsubnet=199.36.153.4/30,35.199.192.0/19,${remote_ip_cidr_ranges} + rightauth=psk + type=tunnel + auto=start + dpdaction=restart + closeaction=restart -# CoreDNS configuration -- path: /var/lib/docker-compose/onprem/coredns/Corefile - owner: root:root - permissions: '0644' - content: | - ${coredns_config} + # CoreDNS configuration + - path: /var/lib/docker-compose/onprem/coredns/Corefile + owner: root:root + permissions: "0644" + content: | + ${coredns_config} -# CoreDNS onprem hosts file -- path: /var/lib/docker-compose/onprem/coredns/onprem.hosts - owner: root:root - permissions: '0644' - content: | - ${vpn_ip_address} gw.${dns_domain} - ${dns_ip_address} ns.${dns_domain} - ${web_ip_address} www.${dns_domain} - ${toolbox_ip_address} toolbox.${dns_domain} + # CoreDNS onprem hosts file + - path: /var/lib/docker-compose/onprem/coredns/onprem.hosts + owner: root:root + permissions: "0644" + content: | + ${vpn_ip_address} gw.${dns_domain} + ${dns_ip_address} ns.${dns_domain} + ${web_ip_address} www.${dns_domain} + ${toolbox_ip_address} toolbox.${dns_domain} -# Minimal nginx index page -- path: /var/lib/docker-compose/onprem/nginx/index.html - owner: root:root - permissions: '0644' - content: | - - - - -

On Prem in a Box

-

${instance_name}

- - + # Minimal nginx index page + - path: /var/lib/docker-compose/onprem/nginx/index.html + owner: root:root + permissions: "0644" + content: | + + + + +

On Prem in a Box

+

${instance_name}

+ + runcmd: -- [systemctl, daemon-reload] -- [ sh, -c, 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -' ] -- [ sh, -c, 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"' ] -- [ sh, -c, 'apt update' ] -- [ sh, -c, 'apt install -y docker-ce docker-ce-cli containerd.io' ] -- [ sh, -c, 'curl -L https://github.com/docker/compose/releases/download/$(curl -s https://api.github.com/repos/docker/compose/releases/latest | grep "tag_name" | cut -d \" -f4)/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose' ] -- [ sh, -c, 'chmod 755 /usr/local/bin/docker-compose' ] -- [systemctl, enable, docker.service] -- [systemctl, start, docker.service] -- [systemctl, enable, docker-onprem.service] -- [systemctl, start, docker-onprem.service] + - [systemctl, daemon-reload] + - [ + sh, + -c, + "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -", + ] + - [ + sh, + -c, + 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"', + ] + - [sh, -c, "apt update"] + - [sh, -c, "apt install -y docker-ce docker-ce-cli containerd.io"] + - [ + sh, + -c, + 'curl -L https://github.com/docker/compose/releases/download/$(curl -s https://api.github.com/repos/docker/compose/releases/latest | grep "tag_name" | cut -d \" -f4)/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose', + ] + - [sh, -c, "chmod 755 /usr/local/bin/docker-compose"] + - [systemctl, enable, docker.service] + - [systemctl, start, docker.service] + - [systemctl, enable, docker-onprem.service] + - [systemctl, start, docker-onprem.service] diff --git a/modules/cloud-config-container/onprem/variables.tf b/modules/cloud-config-container/onprem/variables.tf index 1517221f8..3b09e2366 100644 --- a/modules/cloud-config-container/onprem/variables.tf +++ b/modules/cloud-config-container/onprem/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. diff --git a/modules/cloud-config-container/onprem/versions.tf b/modules/cloud-config-container/onprem/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/onprem/versions.tf +++ b/modules/cloud-config-container/onprem/versions.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. diff --git a/modules/cloud-config-container/outputs-instance.tf b/modules/cloud-config-container/outputs-instance.tf index a9223ce96..182c02127 100644 --- a/modules/cloud-config-container/outputs-instance.tf +++ b/modules/cloud-config-container/outputs-instance.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. diff --git a/modules/cloud-config-container/squid/cloud-config.yaml b/modules/cloud-config-container/squid/cloud-config.yaml index abd58a705..b0c4b7fe3 100644 --- a/modules/cloud-config-container/squid/cloud-config.yaml +++ b/modules/cloud-config-container/squid/cloud-config.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/modules/cloud-config-container/squid/docker/Dockerfile b/modules/cloud-config-container/squid/docker/Dockerfile index 180971da3..bdbc7d04c 100644 --- a/modules/cloud-config-container/squid/docker/Dockerfile +++ b/modules/cloud-config-container/squid/docker/Dockerfile @@ -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. @@ -15,13 +15,13 @@ FROM debian:buster-slim ENV SQUID_VERSION=4.6 \ - SQUID_CACHE_DIR=/var/spool/squid \ - SQUID_LOG_DIR=/var/log/squid \ - SQUID_USER=proxy + SQUID_CACHE_DIR=/var/spool/squid \ + SQUID_LOG_DIR=/var/log/squid \ + SQUID_USER=proxy RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y squid=${SQUID_VERSION}* \ - && rm -rf /var/lib/apt/lists/* + && DEBIAN_FRONTEND=noninteractive apt-get install -y squid=${SQUID_VERSION}* \ + && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /sbin/entrypoint.sh RUN chmod 755 /sbin/entrypoint.sh diff --git a/modules/cloud-config-container/squid/docker/cloudbuild.yaml b/modules/cloud-config-container/squid/docker/cloudbuild.yaml index a942320a2..e2e725fb3 100644 --- a/modules/cloud-config-container/squid/docker/cloudbuild.yaml +++ b/modules/cloud-config-container/squid/docker/cloudbuild.yaml @@ -1,5 +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. @@ -17,15 +16,15 @@ # $ gcloud builds submit . steps: -- name: 'gcr.io/cloud-builders/docker' - args: - - build - - --tag=gcr.io/$PROJECT_ID/squid:${_IMAGE_VERSION} - - --tag=gcr.io/$PROJECT_ID/squid:latest - - . + - name: "gcr.io/cloud-builders/docker" + args: + - build + - --tag=gcr.io/$PROJECT_ID/squid:${_IMAGE_VERSION} + - --tag=gcr.io/$PROJECT_ID/squid:latest + - . substitutions: - _IMAGE_VERSION: "20210215" + _IMAGE_VERSION: "20210215" images: - - 'gcr.io/$PROJECT_ID/squid:${_IMAGE_VERSION}' - - 'gcr.io/$PROJECT_ID/squid:latest' + - "gcr.io/$PROJECT_ID/squid:${_IMAGE_VERSION}" + - "gcr.io/$PROJECT_ID/squid:latest" diff --git a/modules/cloud-config-container/squid/docker/entrypoint.sh b/modules/cloud-config-container/squid/docker/entrypoint.sh index 5349208c7..880eaf3d0 100755 --- a/modules/cloud-config-container/squid/docker/entrypoint.sh +++ b/modules/cloud-config-container/squid/docker/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -# 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. diff --git a/modules/cloud-config-container/squid/main.tf b/modules/cloud-config-container/squid/main.tf index 6805a7999..ad895c178 100644 --- a/modules/cloud-config-container/squid/main.tf +++ b/modules/cloud-config-container/squid/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. diff --git a/modules/cloud-config-container/squid/outputs.tf b/modules/cloud-config-container/squid/outputs.tf index 33dcc5516..7d8d41656 100644 --- a/modules/cloud-config-container/squid/outputs.tf +++ b/modules/cloud-config-container/squid/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. diff --git a/modules/cloud-config-container/squid/variables.tf b/modules/cloud-config-container/squid/variables.tf index 20c050848..eaaca7309 100644 --- a/modules/cloud-config-container/squid/variables.tf +++ b/modules/cloud-config-container/squid/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. diff --git a/modules/cloud-config-container/squid/versions.tf b/modules/cloud-config-container/squid/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-config-container/squid/versions.tf +++ b/modules/cloud-config-container/squid/versions.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. diff --git a/modules/cloud-config-container/variables-instance.tf b/modules/cloud-config-container/variables-instance.tf index e5e5f3466..3697133ea 100644 --- a/modules/cloud-config-container/variables-instance.tf +++ b/modules/cloud-config-container/variables-instance.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. diff --git a/modules/cloud-function/main.tf b/modules/cloud-function/main.tf index 74fab3e7b..3a37a63f1 100644 --- a/modules/cloud-function/main.tf +++ b/modules/cloud-function/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. diff --git a/modules/cloud-function/outputs.tf b/modules/cloud-function/outputs.tf index 0b625b12c..1071270e1 100644 --- a/modules/cloud-function/outputs.tf +++ b/modules/cloud-function/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. diff --git a/modules/cloud-function/variables.tf b/modules/cloud-function/variables.tf index 92a49b739..fe5e80abb 100644 --- a/modules/cloud-function/variables.tf +++ b/modules/cloud-function/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. diff --git a/modules/cloud-function/versions.tf b/modules/cloud-function/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-function/versions.tf +++ b/modules/cloud-function/versions.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. diff --git a/modules/cloud-identity-group/main.tf b/modules/cloud-identity-group/main.tf index 7e21d8516..2bed44351 100644 --- a/modules/cloud-identity-group/main.tf +++ b/modules/cloud-identity-group/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. diff --git a/modules/cloud-identity-group/outputs.tf b/modules/cloud-identity-group/outputs.tf index cd08ebdf2..1a0589338 100644 --- a/modules/cloud-identity-group/outputs.tf +++ b/modules/cloud-identity-group/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. diff --git a/modules/cloud-identity-group/variables.tf b/modules/cloud-identity-group/variables.tf index a85a268a5..9dc579d8a 100644 --- a/modules/cloud-identity-group/variables.tf +++ b/modules/cloud-identity-group/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. diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloud-identity-group/versions.tf +++ b/modules/cloud-identity-group/versions.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. diff --git a/modules/cloud-run/main.tf b/modules/cloud-run/main.tf index 083e411f1..d471f42e0 100644 --- a/modules/cloud-run/main.tf +++ b/modules/cloud-run/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. diff --git a/modules/cloud-run/outputs.tf b/modules/cloud-run/outputs.tf index 4caaef0e0..105e77eca 100644 --- a/modules/cloud-run/outputs.tf +++ b/modules/cloud-run/outputs.tf @@ -1,6 +1,6 @@ /** - * 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. @@ -47,4 +47,4 @@ output "service_name" { output "vpc_connector" { description = "VPC connector resource if created." value = try(google_vpc_access_connector.connector.0.id, null) -} \ No newline at end of file +} diff --git a/modules/cloud-run/variables.tf b/modules/cloud-run/variables.tf index c2f73eb67..da0590d13 100644 --- a/modules/cloud-run/variables.tf +++ b/modules/cloud-run/variables.tf @@ -1,6 +1,6 @@ /** - * 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. diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index 72cab149d..b709800c0 100644 --- a/modules/cloud-run/versions.tf +++ b/modules/cloud-run/versions.tf @@ -1,6 +1,6 @@ /** - * 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 @@ terraform { required_version = ">= 0.12.6" -} \ No newline at end of file +} diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index 3803e9fd9..f50121abc 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/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. diff --git a/modules/cloudsql-instance/outputs.tf b/modules/cloudsql-instance/outputs.tf index 3af883943..caa28e83a 100644 --- a/modules/cloudsql-instance/outputs.tf +++ b/modules/cloudsql-instance/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. diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 094ba4e64..0093d4a33 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/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. diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.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. diff --git a/modules/compute-mig/main.tf b/modules/compute-mig/main.tf index 5b3a92425..7b2253599 100644 --- a/modules/compute-mig/main.tf +++ b/modules/compute-mig/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. diff --git a/modules/compute-mig/outputs.tf b/modules/compute-mig/outputs.tf index 5679cfc5b..93de9223d 100644 --- a/modules/compute-mig/outputs.tf +++ b/modules/compute-mig/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. diff --git a/modules/compute-mig/variables.tf b/modules/compute-mig/variables.tf index 31da4aa34..274fb2354 100644 --- a/modules/compute-mig/variables.tf +++ b/modules/compute-mig/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. diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.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. diff --git a/modules/compute-vm/main.tf b/modules/compute-vm/main.tf index 94f8d0a12..50c1fea42 100644 --- a/modules/compute-vm/main.tf +++ b/modules/compute-vm/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. diff --git a/modules/compute-vm/outputs.tf b/modules/compute-vm/outputs.tf index b541e32ae..523924f93 100644 --- a/modules/compute-vm/outputs.tf +++ b/modules/compute-vm/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. diff --git a/modules/compute-vm/variables.tf b/modules/compute-vm/variables.tf index 9a27cd98a..cfdd40dc5 100644 --- a/modules/compute-vm/variables.tf +++ b/modules/compute-vm/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. diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.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. diff --git a/modules/container-registry/main.tf b/modules/container-registry/main.tf index f69cb283f..740975105 100644 --- a/modules/container-registry/main.tf +++ b/modules/container-registry/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. diff --git a/modules/container-registry/outputs.tf b/modules/container-registry/outputs.tf index 46a76aa76..53f0fc6b1 100644 --- a/modules/container-registry/outputs.tf +++ b/modules/container-registry/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. diff --git a/modules/container-registry/variables.tf b/modules/container-registry/variables.tf index d1191b03a..ae35034cb 100644 --- a/modules/container-registry/variables.tf +++ b/modules/container-registry/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. diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.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. diff --git a/modules/datafusion/main.tf b/modules/datafusion/main.tf index 967e36a55..d42255173 100644 --- a/modules/datafusion/main.tf +++ b/modules/datafusion/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. diff --git a/modules/datafusion/outputs.tf b/modules/datafusion/outputs.tf index 9c626a72c..513675e46 100644 --- a/modules/datafusion/outputs.tf +++ b/modules/datafusion/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. diff --git a/modules/datafusion/variables.tf b/modules/datafusion/variables.tf index bda621be9..57acf2244 100644 --- a/modules/datafusion/variables.tf +++ b/modules/datafusion/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. diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.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. diff --git a/modules/dns/main.tf b/modules/dns/main.tf index b6a3bfaad..c2b567d2b 100644 --- a/modules/dns/main.tf +++ b/modules/dns/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. diff --git a/modules/dns/outputs.tf b/modules/dns/outputs.tf index 8269faa74..c0e477376 100644 --- a/modules/dns/outputs.tf +++ b/modules/dns/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. diff --git a/modules/dns/variables.tf b/modules/dns/variables.tf index a8268e5de..ba44c7d84 100644 --- a/modules/dns/variables.tf +++ b/modules/dns/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. diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.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. diff --git a/modules/endpoints/main.tf b/modules/endpoints/main.tf index f5bc055f4..dc8c61ba0 100644 --- a/modules/endpoints/main.tf +++ b/modules/endpoints/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. diff --git a/modules/endpoints/outputs.tf b/modules/endpoints/outputs.tf index 2a4d45f88..27fe3f60c 100644 --- a/modules/endpoints/outputs.tf +++ b/modules/endpoints/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. diff --git a/modules/endpoints/variables.tf b/modules/endpoints/variables.tf index 8ecbb5d09..f590670ec 100644 --- a/modules/endpoints/variables.tf +++ b/modules/endpoints/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. diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.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. diff --git a/modules/folder/firewall-policy.tf b/modules/folder/firewall-policy.tf index 312d9adbd..96224c56b 100644 --- a/modules/folder/firewall-policy.tf +++ b/modules/folder/firewall-policy.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. diff --git a/modules/folder/main.tf b/modules/folder/main.tf index 917e27691..80847871e 100644 --- a/modules/folder/main.tf +++ b/modules/folder/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. diff --git a/modules/folder/outputs.tf b/modules/folder/outputs.tf index da3682107..37babc6f6 100644 --- a/modules/folder/outputs.tf +++ b/modules/folder/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. diff --git a/modules/folder/variables.tf b/modules/folder/variables.tf index 4bf5a83c8..365a7561c 100644 --- a/modules/folder/variables.tf +++ b/modules/folder/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. diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.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. diff --git a/modules/folders-unit/locals.tf b/modules/folders-unit/locals.tf index a275da1cc..bd5135092 100644 --- a/modules/folders-unit/locals.tf +++ b/modules/folders-unit/locals.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. diff --git a/modules/folders-unit/main.tf b/modules/folders-unit/main.tf index 22894c526..f609fffc1 100644 --- a/modules/folders-unit/main.tf +++ b/modules/folders-unit/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. diff --git a/modules/folders-unit/outputs.tf b/modules/folders-unit/outputs.tf index 1b619e8e4..8e4d1066f 100644 --- a/modules/folders-unit/outputs.tf +++ b/modules/folders-unit/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. diff --git a/modules/folders-unit/variables.tf b/modules/folders-unit/variables.tf index 8b2f88234..10a167d47 100644 --- a/modules/folders-unit/variables.tf +++ b/modules/folders-unit/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. diff --git a/modules/folders-unit/versions.tf b/modules/folders-unit/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/folders-unit/versions.tf +++ b/modules/folders-unit/versions.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. diff --git a/modules/gcs/main.tf b/modules/gcs/main.tf index 19e2441da..c0aea3739 100644 --- a/modules/gcs/main.tf +++ b/modules/gcs/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. @@ -128,4 +128,4 @@ resource "google_pubsub_topic" "topic" { count = local.notification ? 1 : 0 project = var.project_id name = var.notification_config.topic_name -} \ No newline at end of file +} diff --git a/modules/gcs/outputs.tf b/modules/gcs/outputs.tf index ee21b9d11..415b94639 100644 --- a/modules/gcs/outputs.tf +++ b/modules/gcs/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. diff --git a/modules/gcs/variables.tf b/modules/gcs/variables.tf index 2a50f5912..43673beb3 100644 --- a/modules/gcs/variables.tf +++ b/modules/gcs/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. @@ -152,4 +152,4 @@ variable "website" { not_found_page = string }) default = null -} \ No newline at end of file +} diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.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. diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf index 572e35c11..24f4e0d0b 100644 --- a/modules/gke-cluster/main.tf +++ b/modules/gke-cluster/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. @@ -304,4 +304,4 @@ resource "google_pubsub_topic" "notifications" { labels = { content = "gke-notifications" } -} \ No newline at end of file +} diff --git a/modules/gke-cluster/outputs.tf b/modules/gke-cluster/outputs.tf index df0b40c18..eb5985e7d 100644 --- a/modules/gke-cluster/outputs.tf +++ b/modules/gke-cluster/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. diff --git a/modules/gke-cluster/variables.tf b/modules/gke-cluster/variables.tf index 4c2bf2ecd..ddb754e21 100644 --- a/modules/gke-cluster/variables.tf +++ b/modules/gke-cluster/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. diff --git a/modules/gke-cluster/versions.tf b/modules/gke-cluster/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/gke-cluster/versions.tf +++ b/modules/gke-cluster/versions.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. diff --git a/modules/gke-nodepool/main.tf b/modules/gke-nodepool/main.tf index 536b31ae6..0b7268ffd 100644 --- a/modules/gke-nodepool/main.tf +++ b/modules/gke-nodepool/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. diff --git a/modules/gke-nodepool/outputs.tf b/modules/gke-nodepool/outputs.tf index e3f56aca4..2736acbf8 100644 --- a/modules/gke-nodepool/outputs.tf +++ b/modules/gke-nodepool/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. diff --git a/modules/gke-nodepool/variables.tf b/modules/gke-nodepool/variables.tf index 0053d7aa0..8b3f6d10f 100644 --- a/modules/gke-nodepool/variables.tf +++ b/modules/gke-nodepool/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. diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.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. diff --git a/modules/iam-service-account/main.tf b/modules/iam-service-account/main.tf index 719559081..f4d6952f2 100644 --- a/modules/iam-service-account/main.tf +++ b/modules/iam-service-account/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. diff --git a/modules/iam-service-account/outputs.tf b/modules/iam-service-account/outputs.tf index cf12f5306..8653ccc7c 100644 --- a/modules/iam-service-account/outputs.tf +++ b/modules/iam-service-account/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. diff --git a/modules/iam-service-account/variables.tf b/modules/iam-service-account/variables.tf index d1f5d3e3a..f906baa61 100644 --- a/modules/iam-service-account/variables.tf +++ b/modules/iam-service-account/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. diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.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. diff --git a/modules/kms/main.tf b/modules/kms/main.tf index 7708a5cb3..59cbcf651 100644 --- a/modules/kms/main.tf +++ b/modules/kms/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. diff --git a/modules/kms/outputs.tf b/modules/kms/outputs.tf index 917d7b32c..43f7997c6 100644 --- a/modules/kms/outputs.tf +++ b/modules/kms/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. diff --git a/modules/kms/variables.tf b/modules/kms/variables.tf index 66b9e18fb..d2c425bae 100644 --- a/modules/kms/variables.tf +++ b/modules/kms/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. diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.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. diff --git a/modules/logging-bucket/main.tf b/modules/logging-bucket/main.tf index ee405507c..743f77cd2 100644 --- a/modules/logging-bucket/main.tf +++ b/modules/logging-bucket/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. diff --git a/modules/logging-bucket/outputs.tf b/modules/logging-bucket/outputs.tf index b335d6b00..7100237e3 100644 --- a/modules/logging-bucket/outputs.tf +++ b/modules/logging-bucket/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. diff --git a/modules/logging-bucket/variables.tf b/modules/logging-bucket/variables.tf index 5e1a4996c..350cad683 100644 --- a/modules/logging-bucket/variables.tf +++ b/modules/logging-bucket/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. diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.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. diff --git a/modules/naming-convention/main.tf b/modules/naming-convention/main.tf index 5ec35806c..aa7d406b0 100644 --- a/modules/naming-convention/main.tf +++ b/modules/naming-convention/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. diff --git a/modules/naming-convention/outputs.tf b/modules/naming-convention/outputs.tf index 994823371..d96cfa985 100644 --- a/modules/naming-convention/outputs.tf +++ b/modules/naming-convention/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. diff --git a/modules/naming-convention/variables.tf b/modules/naming-convention/variables.tf index 37ebe3740..3ba8cd2cf 100644 --- a/modules/naming-convention/variables.tf +++ b/modules/naming-convention/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. diff --git a/modules/naming-convention/versions.tf b/modules/naming-convention/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/naming-convention/versions.tf +++ b/modules/naming-convention/versions.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. diff --git a/modules/net-address/main.tf b/modules/net-address/main.tf index 972afa0bd..caab92a0c 100644 --- a/modules/net-address/main.tf +++ b/modules/net-address/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. diff --git a/modules/net-address/outputs.tf b/modules/net-address/outputs.tf index 3c6a26b85..da6912736 100644 --- a/modules/net-address/outputs.tf +++ b/modules/net-address/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. diff --git a/modules/net-address/variables.tf b/modules/net-address/variables.tf index 823d79a6c..bb3043dc8 100644 --- a/modules/net-address/variables.tf +++ b/modules/net-address/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. diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.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. diff --git a/modules/net-cloudnat/main.tf b/modules/net-cloudnat/main.tf index f39f31f44..a7ef22601 100644 --- a/modules/net-cloudnat/main.tf +++ b/modules/net-cloudnat/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. diff --git a/modules/net-cloudnat/outputs.tf b/modules/net-cloudnat/outputs.tf index 0125cde06..d9e95d4bc 100644 --- a/modules/net-cloudnat/outputs.tf +++ b/modules/net-cloudnat/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. diff --git a/modules/net-cloudnat/variables.tf b/modules/net-cloudnat/variables.tf index 9ffeea3f9..fcf79944e 100644 --- a/modules/net-cloudnat/variables.tf +++ b/modules/net-cloudnat/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. diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.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. diff --git a/modules/net-ilb/main.tf b/modules/net-ilb/main.tf index 329a56983..aa4addcc0 100644 --- a/modules/net-ilb/main.tf +++ b/modules/net-ilb/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. diff --git a/modules/net-ilb/outputs.tf b/modules/net-ilb/outputs.tf index c8526d524..55b454e18 100644 --- a/modules/net-ilb/outputs.tf +++ b/modules/net-ilb/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. diff --git a/modules/net-ilb/variables.tf b/modules/net-ilb/variables.tf index 875967cd4..638aee521 100644 --- a/modules/net-ilb/variables.tf +++ b/modules/net-ilb/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. diff --git a/modules/net-ilb/versions.tf b/modules/net-ilb/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-ilb/versions.tf +++ b/modules/net-ilb/versions.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. diff --git a/modules/net-interconnect-attachment-direct/main.tf b/modules/net-interconnect-attachment-direct/main.tf index 01dd8dbca..ae832bcc7 100644 --- a/modules/net-interconnect-attachment-direct/main.tf +++ b/modules/net-interconnect-attachment-direct/main.tf @@ -1,6 +1,6 @@ /** - * 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. diff --git a/modules/net-interconnect-attachment-direct/outputs.tf b/modules/net-interconnect-attachment-direct/outputs.tf index 392f4d122..a7905fefd 100644 --- a/modules/net-interconnect-attachment-direct/outputs.tf +++ b/modules/net-interconnect-attachment-direct/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. diff --git a/modules/net-interconnect-attachment-direct/variables.tf b/modules/net-interconnect-attachment-direct/variables.tf index 69d837c20..881147fbb 100644 --- a/modules/net-interconnect-attachment-direct/variables.tf +++ b/modules/net-interconnect-attachment-direct/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. diff --git a/modules/net-interconnect-attachment-direct/versions.tf b/modules/net-interconnect-attachment-direct/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-interconnect-attachment-direct/versions.tf +++ b/modules/net-interconnect-attachment-direct/versions.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. diff --git a/modules/net-vpc-firewall/main.tf b/modules/net-vpc-firewall/main.tf index 158e0991f..ef4767d3a 100644 --- a/modules/net-vpc-firewall/main.tf +++ b/modules/net-vpc-firewall/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. diff --git a/modules/net-vpc-firewall/outputs.tf b/modules/net-vpc-firewall/outputs.tf index b64db000c..f784583c5 100644 --- a/modules/net-vpc-firewall/outputs.tf +++ b/modules/net-vpc-firewall/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. diff --git a/modules/net-vpc-firewall/variables.tf b/modules/net-vpc-firewall/variables.tf index 7682a3f3c..356b8bd8e 100644 --- a/modules/net-vpc-firewall/variables.tf +++ b/modules/net-vpc-firewall/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. diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.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. diff --git a/modules/net-vpc-peering/main.tf b/modules/net-vpc-peering/main.tf index 987bf0b72..1bade5f14 100644 --- a/modules/net-vpc-peering/main.tf +++ b/modules/net-vpc-peering/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. diff --git a/modules/net-vpc-peering/outputs.tf b/modules/net-vpc-peering/outputs.tf index 8b380b61f..558c4bac1 100644 --- a/modules/net-vpc-peering/outputs.tf +++ b/modules/net-vpc-peering/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. diff --git a/modules/net-vpc-peering/variables.tf b/modules/net-vpc-peering/variables.tf index 0874dda18..908578fa5 100644 --- a/modules/net-vpc-peering/variables.tf +++ b/modules/net-vpc-peering/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. diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.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. diff --git a/modules/net-vpc/main.tf b/modules/net-vpc/main.tf index ad663d319..1abd7c62a 100644 --- a/modules/net-vpc/main.tf +++ b/modules/net-vpc/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. diff --git a/modules/net-vpc/outputs.tf b/modules/net-vpc/outputs.tf index cf17e7f98..0118d7ec1 100644 --- a/modules/net-vpc/outputs.tf +++ b/modules/net-vpc/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. diff --git a/modules/net-vpc/variables.tf b/modules/net-vpc/variables.tf index 5be9c9230..824c6f282 100644 --- a/modules/net-vpc/variables.tf +++ b/modules/net-vpc/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. diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.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. diff --git a/modules/net-vpn-dynamic/main.tf b/modules/net-vpn-dynamic/main.tf index bed5032c4..4da48c12d 100644 --- a/modules/net-vpn-dynamic/main.tf +++ b/modules/net-vpn-dynamic/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. diff --git a/modules/net-vpn-dynamic/outputs.tf b/modules/net-vpn-dynamic/outputs.tf index e29c9e935..09e5959e5 100644 --- a/modules/net-vpn-dynamic/outputs.tf +++ b/modules/net-vpn-dynamic/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. diff --git a/modules/net-vpn-dynamic/variables.tf b/modules/net-vpn-dynamic/variables.tf index 6b97f676f..6da5c0ac4 100644 --- a/modules/net-vpn-dynamic/variables.tf +++ b/modules/net-vpn-dynamic/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. diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.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. diff --git a/modules/net-vpn-ha/main.tf b/modules/net-vpn-ha/main.tf index cb2ba6877..8c4870318 100644 --- a/modules/net-vpn-ha/main.tf +++ b/modules/net-vpn-ha/main.tf @@ -1,6 +1,6 @@ /** - * 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. diff --git a/modules/net-vpn-ha/outputs.tf b/modules/net-vpn-ha/outputs.tf index c988c103e..181305b63 100644 --- a/modules/net-vpn-ha/outputs.tf +++ b/modules/net-vpn-ha/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. diff --git a/modules/net-vpn-ha/variables.tf b/modules/net-vpn-ha/variables.tf index 6f5832be4..4e8d17acf 100644 --- a/modules/net-vpn-ha/variables.tf +++ b/modules/net-vpn-ha/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. diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.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. diff --git a/modules/net-vpn-static/main.tf b/modules/net-vpn-static/main.tf index c8540aabf..3c8f5cb8d 100644 --- a/modules/net-vpn-static/main.tf +++ b/modules/net-vpn-static/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. diff --git a/modules/net-vpn-static/outputs.tf b/modules/net-vpn-static/outputs.tf index e3970f2c7..8a7646019 100644 --- a/modules/net-vpn-static/outputs.tf +++ b/modules/net-vpn-static/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. diff --git a/modules/net-vpn-static/variables.tf b/modules/net-vpn-static/variables.tf index b5e5025cb..90b15f531 100644 --- a/modules/net-vpn-static/variables.tf +++ b/modules/net-vpn-static/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. diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.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. diff --git a/modules/organization/firewall-policy.tf b/modules/organization/firewall-policy.tf index 2c304601d..20dd3f296 100644 --- a/modules/organization/firewall-policy.tf +++ b/modules/organization/firewall-policy.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. diff --git a/modules/organization/iam.tf b/modules/organization/iam.tf index 3e5949350..bafa5e164 100644 --- a/modules/organization/iam.tf +++ b/modules/organization/iam.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. diff --git a/modules/organization/logging.tf b/modules/organization/logging.tf index ad9d85345..dfe47e255 100644 --- a/modules/organization/logging.tf +++ b/modules/organization/logging.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. diff --git a/modules/organization/main.tf b/modules/organization/main.tf index 4f19c524d..60aa65a07 100644 --- a/modules/organization/main.tf +++ b/modules/organization/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. diff --git a/modules/organization/outputs.tf b/modules/organization/outputs.tf index 13b11de30..c1f501d8f 100644 --- a/modules/organization/outputs.tf +++ b/modules/organization/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. diff --git a/modules/organization/variables.tf b/modules/organization/variables.tf index 374b72705..1ca33635f 100644 --- a/modules/organization/variables.tf +++ b/modules/organization/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. diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.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. diff --git a/modules/project/main.tf b/modules/project/main.tf index abd15fed2..13edb1811 100644 --- a/modules/project/main.tf +++ b/modules/project/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. diff --git a/modules/project/outputs.tf b/modules/project/outputs.tf index 9b04ec976..417febe34 100644 --- a/modules/project/outputs.tf +++ b/modules/project/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. diff --git a/modules/project/service_accounts.tf b/modules/project/service_accounts.tf index c601d2812..48e85820f 100644 --- a/modules/project/service_accounts.tf +++ b/modules/project/service_accounts.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. diff --git a/modules/project/variables.tf b/modules/project/variables.tf index 34db467bf..971244cc3 100644 --- a/modules/project/variables.tf +++ b/modules/project/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. diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.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. diff --git a/modules/pubsub/main.tf b/modules/pubsub/main.tf index f66c73245..545abbbd7 100644 --- a/modules/pubsub/main.tf +++ b/modules/pubsub/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. diff --git a/modules/pubsub/outputs.tf b/modules/pubsub/outputs.tf index 3e3cc8cfb..c26eb4d9a 100644 --- a/modules/pubsub/outputs.tf +++ b/modules/pubsub/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. diff --git a/modules/pubsub/variables.tf b/modules/pubsub/variables.tf index 1bf0f409b..78dd2fa62 100644 --- a/modules/pubsub/variables.tf +++ b/modules/pubsub/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. diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.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. diff --git a/modules/secret-manager/main.tf b/modules/secret-manager/main.tf index 6b6154e6e..ed0af26bf 100644 --- a/modules/secret-manager/main.tf +++ b/modules/secret-manager/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. diff --git a/modules/secret-manager/outputs.tf b/modules/secret-manager/outputs.tf index eef3e5c7b..7267fa129 100644 --- a/modules/secret-manager/outputs.tf +++ b/modules/secret-manager/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. diff --git a/modules/secret-manager/variables.tf b/modules/secret-manager/variables.tf index 69cde3dbb..f8ed11116 100644 --- a/modules/secret-manager/variables.tf +++ b/modules/secret-manager/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. diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.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. diff --git a/modules/service-directory/main.tf b/modules/service-directory/main.tf index 618d875c2..781bae606 100644 --- a/modules/service-directory/main.tf +++ b/modules/service-directory/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. diff --git a/modules/service-directory/outputs.tf b/modules/service-directory/outputs.tf index b39478902..a7656002a 100644 --- a/modules/service-directory/outputs.tf +++ b/modules/service-directory/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. diff --git a/modules/service-directory/variables.tf b/modules/service-directory/variables.tf index b164b1138..326aeff89 100644 --- a/modules/service-directory/variables.tf +++ b/modules/service-directory/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. diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.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. diff --git a/modules/source-repository/main.tf b/modules/source-repository/main.tf index 0077b68b7..c4057d76d 100644 --- a/modules/source-repository/main.tf +++ b/modules/source-repository/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. diff --git a/modules/source-repository/outputs.tf b/modules/source-repository/outputs.tf index 5564c6367..d1a4b25e9 100644 --- a/modules/source-repository/outputs.tf +++ b/modules/source-repository/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. diff --git a/modules/source-repository/variables.tf b/modules/source-repository/variables.tf index 88a63b7d5..e592f3589 100644 --- a/modules/source-repository/variables.tf +++ b/modules/source-repository/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. diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index 1cc6bf899..290412687 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.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. diff --git a/modules/vpc-sc/access_levels.tf b/modules/vpc-sc/access_levels.tf index 585570eeb..f8c34355f 100644 --- a/modules/vpc-sc/access_levels.tf +++ b/modules/vpc-sc/access_levels.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. diff --git a/modules/vpc-sc/main.tf b/modules/vpc-sc/main.tf index 739470364..0b06b4814 100644 --- a/modules/vpc-sc/main.tf +++ b/modules/vpc-sc/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. diff --git a/modules/vpc-sc/outputs.tf b/modules/vpc-sc/outputs.tf index 3412e234c..427959483 100644 --- a/modules/vpc-sc/outputs.tf +++ b/modules/vpc-sc/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. diff --git a/modules/vpc-sc/service_perimeters_bridge.tf b/modules/vpc-sc/service_perimeters_bridge.tf index 660736af1..3c57f6b9c 100644 --- a/modules/vpc-sc/service_perimeters_bridge.tf +++ b/modules/vpc-sc/service_perimeters_bridge.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. diff --git a/modules/vpc-sc/service_perimeters_regular.tf b/modules/vpc-sc/service_perimeters_regular.tf index 2f4eae3cd..d3069c57a 100644 --- a/modules/vpc-sc/service_perimeters_regular.tf +++ b/modules/vpc-sc/service_perimeters_regular.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. diff --git a/modules/vpc-sc/variables.tf b/modules/vpc-sc/variables.tf index fcfef359d..9df6989e0 100644 --- a/modules/vpc-sc/variables.tf +++ b/modules/vpc-sc/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. diff --git a/networking/decentralized-firewall/backend.tf.sample b/networking/decentralized-firewall/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/decentralized-firewall/backend.tf.sample +++ b/networking/decentralized-firewall/backend.tf.sample @@ -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. diff --git a/networking/decentralized-firewall/firewall/common/common-egress.yaml b/networking/decentralized-firewall/firewall/common/common-egress.yaml index 716c1498b..c4540e7ac 100644 --- a/networking/decentralized-firewall/firewall/common/common-egress.yaml +++ b/networking/decentralized-firewall/firewall/common/common-egress.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. @@ -15,29 +15,29 @@ # Deny all egress (egress traffic is allowed by default) 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 -# Allow access to GCP APIs via Private Google Access +# Allow access to GCP APIs via Private Google Access # https://cloud.google.com/vpc/docs/access-apis-external-ip#config gcp-pga-apis: allow: - - ports: [443] - protocol: tcp + - ports: [443] + protocol: tcp direction: EGRESS priority: 500 destination_ranges: - - 199.36.153.8/30 + - 199.36.153.8/30 # Allow egress to internal networks internal-egress: allow: - - ports: [] - protocol: tcp + - ports: [] + protocol: tcp direction: EGRESS destination_ranges: - - 10.0.0.0/16 + - 10.0.0.0/16 diff --git a/networking/decentralized-firewall/firewall/common/iap-access.yaml b/networking/decentralized-firewall/firewall/common/iap-access.yaml index 931a180e4..588af1624 100644 --- a/networking/decentralized-firewall/firewall/common/iap-access.yaml +++ b/networking/decentralized-firewall/firewall/common/iap-access.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,13 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Access via SSH from IAP to all instancess https://cloud.google.com/iap/docs/using-tcp-forwarding#create-firewall-rule +# Access via SSH from IAP to all instancess https://cloud.google.com/iap/docs/using-tcp-forwarding#create-firewall-rule iap-ssh-access: allow: - - ports: [22] - protocol: tcp + - ports: [22] + protocol: tcp direction: INGRESS priority: 1001 source_ranges: - - 35.235.240.0/20 - \ No newline at end of file + - 35.235.240.0/20 diff --git a/networking/decentralized-firewall/firewall/common/lb-access.yaml b/networking/decentralized-firewall/firewall/common/lb-access.yaml index 975d3ca05..bd20e976e 100644 --- a/networking/decentralized-firewall/firewall/common/lb-access.yaml +++ b/networking/decentralized-firewall/firewall/common/lb-access.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. @@ -15,10 +15,10 @@ # Access from GCP LBs https://cloud.google.com/load-balancing/docs/https/#firewall_rules 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 diff --git a/networking/decentralized-firewall/firewall/dev/app-1/app1-rules.yaml b/networking/decentralized-firewall/firewall/dev/app-1/app1-rules.yaml index 9a26650be..1691fdf77 100644 --- a/networking/decentralized-firewall/firewall/dev/app-1/app1-rules.yaml +++ b/networking/decentralized-firewall/firewall/dev/app-1/app1-rules.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. @@ -15,17 +15,17 @@ # Allow traffic from the frontend VMs app1-backend: allow: - - ports: ['443', '80'] - protocol: tcp + - ports: ["443", "80"] + protocol: tcp direction: INGRESS - source_tags: ['app1-frontend'] - target_tags: ['app1-backend'] + source_tags: ["app1-frontend"] + target_tags: ["app1-backend"] # Allow traffic to MySQL Servers from App1 backend app1-db: allow: - - ports: ['3306'] - protocol: tcp + - ports: ["3306"] + protocol: tcp direction: INGRESS - source_tags: ['app1-backend'] - target_tags: ['mysql-server'] + source_tags: ["app1-backend"] + target_tags: ["mysql-server"] diff --git a/networking/decentralized-firewall/firewall/dev/app-2/app2-rules.yaml b/networking/decentralized-firewall/firewall/dev/app-2/app2-rules.yaml index d7b79b636..f979397df 100644 --- a/networking/decentralized-firewall/firewall/dev/app-2/app2-rules.yaml +++ b/networking/decentralized-firewall/firewall/dev/app-2/app2-rules.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. @@ -15,17 +15,17 @@ # Allow traffic from app1 frontend app2-backend: allow: - - ports: ['443', '80'] - protocol: tcp + - ports: ["443", "80"] + protocol: tcp direction: INGRESS - source_tags: ['app1-frontend'] - target_tags: ['app2-backend'] + source_tags: ["app1-frontend"] + target_tags: ["app2-backend"] # Allow traffic to MySQL servers from App2 backend app2-db: allow: - - ports: ['3306'] - protocol: tcp + - ports: ["3306"] + protocol: tcp direction: INGRESS - source_tags: ['app2-backend'] - target_tags: ['mysql-server'] + source_tags: ["app2-backend"] + target_tags: ["mysql-server"] diff --git a/networking/decentralized-firewall/firewall/prod/app-1/app1-rules.yaml b/networking/decentralized-firewall/firewall/prod/app-1/app1-rules.yaml index 9a26650be..1691fdf77 100644 --- a/networking/decentralized-firewall/firewall/prod/app-1/app1-rules.yaml +++ b/networking/decentralized-firewall/firewall/prod/app-1/app1-rules.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. @@ -15,17 +15,17 @@ # Allow traffic from the frontend VMs app1-backend: allow: - - ports: ['443', '80'] - protocol: tcp + - ports: ["443", "80"] + protocol: tcp direction: INGRESS - source_tags: ['app1-frontend'] - target_tags: ['app1-backend'] + source_tags: ["app1-frontend"] + target_tags: ["app1-backend"] # Allow traffic to MySQL Servers from App1 backend app1-db: allow: - - ports: ['3306'] - protocol: tcp + - ports: ["3306"] + protocol: tcp direction: INGRESS - source_tags: ['app1-backend'] - target_tags: ['mysql-server'] + source_tags: ["app1-backend"] + target_tags: ["mysql-server"] diff --git a/networking/decentralized-firewall/main.tf b/networking/decentralized-firewall/main.tf index b92671245..99294ce07 100644 --- a/networking/decentralized-firewall/main.tf +++ b/networking/decentralized-firewall/main.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. diff --git a/networking/decentralized-firewall/outputs.tf b/networking/decentralized-firewall/outputs.tf index 95501f309..9542b8927 100644 --- a/networking/decentralized-firewall/outputs.tf +++ b/networking/decentralized-firewall/outputs.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. diff --git a/networking/decentralized-firewall/validator/Dockerfile b/networking/decentralized-firewall/validator/Dockerfile index be4b22b47..ddcbb4534 100644 --- a/networking/decentralized-firewall/validator/Dockerfile +++ b/networking/decentralized-firewall/validator/Dockerfile @@ -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. diff --git a/networking/decentralized-firewall/validator/action.yml b/networking/decentralized-firewall/validator/action.yml index d6e6177c5..00c4819ec 100644 --- a/networking/decentralized-firewall/validator/action.yml +++ b/networking/decentralized-firewall/validator/action.yml @@ -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,33 +12,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -name: 'Validate firewall rules' -description: 'Validate firewall rule YAML files' +name: "Validate firewall rules" +description: "Validate firewall rule YAML files" inputs: files: - description: 'Files to scan (supports wildcards)' + description: "Files to scan (supports wildcards)" required: false - default: '/github/workspace/firewall/**/*.yaml' + default: "/github/workspace/firewall/**/*.yaml" mode: - description: 'Mode (validate or approve)' + description: "Mode (validate or approve)" required: false - default: 'validate' + default: "validate" schema: - description: 'Schema' + description: "Schema" required: false - default: '/schemas/firewallSchema.yaml' + default: "/schemas/firewallSchema.yaml" outputs: ok: - description: 'Validation successful' + description: "Validation successful" errors: - description: 'Validation results' + description: "Validation results" runs: - using: 'docker' - image: 'Dockerfile' + using: "docker" + image: "Dockerfile" args: - ${{ inputs.files }} - "--mode" - ${{ inputs.mode }} - "--schema" - ${{ inputs.schema }} - - "--github" \ No newline at end of file + - "--github" diff --git a/networking/decentralized-firewall/validator/firewallSchema.yaml b/networking/decentralized-firewall/validator/firewallSchema.yaml index 697d982a4..82a52a071 100644 --- a/networking/decentralized-firewall/validator/firewallSchema.yaml +++ b/networking/decentralized-firewall/validator/firewallSchema.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. diff --git a/networking/decentralized-firewall/validator/firewallSchemaAutoApprove.yaml b/networking/decentralized-firewall/validator/firewallSchemaAutoApprove.yaml index a5a425f3b..3c907c525 100644 --- a/networking/decentralized-firewall/validator/firewallSchemaAutoApprove.yaml +++ b/networking/decentralized-firewall/validator/firewallSchemaAutoApprove.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. diff --git a/networking/decentralized-firewall/validator/firewallSchemaSettings.yaml b/networking/decentralized-firewall/validator/firewallSchemaSettings.yaml index 77c5ec65f..13b3ff1c5 100644 --- a/networking/decentralized-firewall/validator/firewallSchemaSettings.yaml +++ b/networking/decentralized-firewall/validator/firewallSchemaSettings.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. @@ -13,37 +13,37 @@ # limitations under the License. allowedPorts: -- ports: 22 # SSH - approved: false -- ports: 80 # HTTP - approved: true -- ports: 443 # HTTPS - approved: true -- ports: 3306 # MySQL - approved: false -- ports: 8000-8999 - approved: true + - ports: 22 # SSH + approved: false + - ports: 80 # HTTP + approved: true + - ports: 443 # HTTPS + approved: true + - ports: 3306 # MySQL + approved: false + - ports: 8000-8999 + approved: true allowedSourceRanges: -- cidr: 10.0.0.0/8 # Example on-premise range - approved: true -- cidr: 35.191.0.0/16 # Load balancing & health checks - approved: true -- cidr: 130.211.0.0/22 # Load balancing & health checks - approved: false -- cidr: 35.235.240.0/20 # IAP source range - approved: true + - cidr: 10.0.0.0/8 # Example on-premise range + approved: true + - cidr: 35.191.0.0/16 # Load balancing & health checks + approved: true + - cidr: 130.211.0.0/22 # Load balancing & health checks + approved: false + - cidr: 35.235.240.0/20 # IAP source range + approved: true allowedDestinationRanges: -- cidr: 10.0.0.0/8 - approved: true -- cidr: 0.0.0.0/0 - approved: false + - cidr: 10.0.0.0/8 + approved: true + - cidr: 0.0.0.0/0 + approved: false allowedNetworkTags: -- tag: '*' - approved: true + - tag: "*" + approved: true allowedServiceAccounts: -- serviceAccount: '*' - approved: true \ No newline at end of file + - serviceAccount: "*" + approved: true diff --git a/networking/decentralized-firewall/validator/requirements.txt b/networking/decentralized-firewall/validator/requirements.txt index 05fa91c40..df645f6b6 100644 --- a/networking/decentralized-firewall/validator/requirements.txt +++ b/networking/decentralized-firewall/validator/requirements.txt @@ -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. diff --git a/networking/decentralized-firewall/validator/validator.py b/networking/decentralized-firewall/validator/validator.py index ca625882f..0daa40e3e 100644 --- a/networking/decentralized-firewall/validator/validator.py +++ b/networking/decentralized-firewall/validator/validator.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# 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. @@ -199,7 +199,8 @@ class FirewallValidator: self.schema = yamale.make_schema(path=schema, validators=self.validators) def set_schema_from_string(self, schema): - self.schema = yamale.make_schema(content=schema, validators=self.validators) + self.schema = yamale.make_schema( + content=schema, validators=self.validators) def validate_file(self, file): print('Validating %s...' % (file), file=sys.stderr) diff --git a/networking/decentralized-firewall/variables.tf b/networking/decentralized-firewall/variables.tf index 9001eacfa..76a3e1cd4 100644 --- a/networking/decentralized-firewall/variables.tf +++ b/networking/decentralized-firewall/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. diff --git a/networking/decentralized-firewall/versions.tf b/networking/decentralized-firewall/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/decentralized-firewall/versions.tf +++ b/networking/decentralized-firewall/versions.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. diff --git a/networking/filtering-proxy/main.tf b/networking/filtering-proxy/main.tf index 1abcd369f..0f0f52dc1 100644 --- a/networking/filtering-proxy/main.tf +++ b/networking/filtering-proxy/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. diff --git a/networking/filtering-proxy/outputs.tf b/networking/filtering-proxy/outputs.tf index 1a8492299..687ce3cd5 100644 --- a/networking/filtering-proxy/outputs.tf +++ b/networking/filtering-proxy/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. diff --git a/networking/filtering-proxy/variables.tf b/networking/filtering-proxy/variables.tf index a48d94ffa..194898999 100644 --- a/networking/filtering-proxy/variables.tf +++ b/networking/filtering-proxy/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. diff --git a/networking/filtering-proxy/versions.tf b/networking/filtering-proxy/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/filtering-proxy/versions.tf +++ b/networking/filtering-proxy/versions.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. diff --git a/networking/hub-and-spoke-peering/backend.tf.sample b/networking/hub-and-spoke-peering/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/hub-and-spoke-peering/backend.tf.sample +++ b/networking/hub-and-spoke-peering/backend.tf.sample @@ -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. diff --git a/networking/hub-and-spoke-peering/main.tf b/networking/hub-and-spoke-peering/main.tf index e6f436ca5..aa8ef5665 100644 --- a/networking/hub-and-spoke-peering/main.tf +++ b/networking/hub-and-spoke-peering/main.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. diff --git a/networking/hub-and-spoke-peering/outputs.tf b/networking/hub-and-spoke-peering/outputs.tf index 03f9bd57a..7010404a4 100644 --- a/networking/hub-and-spoke-peering/outputs.tf +++ b/networking/hub-and-spoke-peering/outputs.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. diff --git a/networking/hub-and-spoke-peering/variables.tf b/networking/hub-and-spoke-peering/variables.tf index 0017e6039..fdaf4e834 100644 --- a/networking/hub-and-spoke-peering/variables.tf +++ b/networking/hub-and-spoke-peering/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. diff --git a/networking/hub-and-spoke-peering/versions.tf b/networking/hub-and-spoke-peering/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/hub-and-spoke-peering/versions.tf +++ b/networking/hub-and-spoke-peering/versions.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. diff --git a/networking/hub-and-spoke-vpn/backend.tf.sample b/networking/hub-and-spoke-vpn/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/hub-and-spoke-vpn/backend.tf.sample +++ b/networking/hub-and-spoke-vpn/backend.tf.sample @@ -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. diff --git a/networking/hub-and-spoke-vpn/main.tf b/networking/hub-and-spoke-vpn/main.tf index c0a093008..3bf7e391b 100644 --- a/networking/hub-and-spoke-vpn/main.tf +++ b/networking/hub-and-spoke-vpn/main.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. diff --git a/networking/hub-and-spoke-vpn/outputs.tf b/networking/hub-and-spoke-vpn/outputs.tf index 2ccd2ca70..f69ca1096 100644 --- a/networking/hub-and-spoke-vpn/outputs.tf +++ b/networking/hub-and-spoke-vpn/outputs.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. diff --git a/networking/hub-and-spoke-vpn/provider.tf b/networking/hub-and-spoke-vpn/provider.tf index c58f735ac..b36fb5ee5 100644 --- a/networking/hub-and-spoke-vpn/provider.tf +++ b/networking/hub-and-spoke-vpn/provider.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. diff --git a/networking/hub-and-spoke-vpn/variables.tf b/networking/hub-and-spoke-vpn/variables.tf index d02bcd2e4..f30bebc5a 100644 --- a/networking/hub-and-spoke-vpn/variables.tf +++ b/networking/hub-and-spoke-vpn/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. diff --git a/networking/hub-and-spoke-vpn/versions.tf b/networking/hub-and-spoke-vpn/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/hub-and-spoke-vpn/versions.tf +++ b/networking/hub-and-spoke-vpn/versions.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. diff --git a/networking/ilb-next-hop/assets/gw.yaml b/networking/ilb-next-hop/assets/gw.yaml index 9a7d3ceb5..215821c41 100644 --- a/networking/ilb-next-hop/assets/gw.yaml +++ b/networking/ilb-next-hop/assets/gw.yaml @@ -1,6 +1,6 @@ #cloud-config -# 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. diff --git a/networking/ilb-next-hop/backend.tf.sample b/networking/ilb-next-hop/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/ilb-next-hop/backend.tf.sample +++ b/networking/ilb-next-hop/backend.tf.sample @@ -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. diff --git a/networking/ilb-next-hop/gateways.tf b/networking/ilb-next-hop/gateways.tf index 55b4c1cdf..ee401af7d 100644 --- a/networking/ilb-next-hop/gateways.tf +++ b/networking/ilb-next-hop/gateways.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. diff --git a/networking/ilb-next-hop/main.tf b/networking/ilb-next-hop/main.tf index 39f7c3fd9..138eec05e 100644 --- a/networking/ilb-next-hop/main.tf +++ b/networking/ilb-next-hop/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. diff --git a/networking/ilb-next-hop/outputs.tf b/networking/ilb-next-hop/outputs.tf index 80c3e77ac..17702e832 100644 --- a/networking/ilb-next-hop/outputs.tf +++ b/networking/ilb-next-hop/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. diff --git a/networking/ilb-next-hop/variables.tf b/networking/ilb-next-hop/variables.tf index 6d0834727..2450c4eba 100644 --- a/networking/ilb-next-hop/variables.tf +++ b/networking/ilb-next-hop/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. diff --git a/networking/ilb-next-hop/versions.tf b/networking/ilb-next-hop/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/ilb-next-hop/versions.tf +++ b/networking/ilb-next-hop/versions.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. diff --git a/networking/ilb-next-hop/vms.tf b/networking/ilb-next-hop/vms.tf index 3a00b3469..5b0fe22b5 100644 --- a/networking/ilb-next-hop/vms.tf +++ b/networking/ilb-next-hop/vms.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. diff --git a/networking/ilb-next-hop/vpc-left.tf b/networking/ilb-next-hop/vpc-left.tf index c5f8df222..e286790e4 100644 --- a/networking/ilb-next-hop/vpc-left.tf +++ b/networking/ilb-next-hop/vpc-left.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. diff --git a/networking/ilb-next-hop/vpc-right.tf b/networking/ilb-next-hop/vpc-right.tf index 1bf590e93..e2f604c5b 100644 --- a/networking/ilb-next-hop/vpc-right.tf +++ b/networking/ilb-next-hop/vpc-right.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. diff --git a/networking/onprem-google-access-dns/backend.tf.sample b/networking/onprem-google-access-dns/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/onprem-google-access-dns/backend.tf.sample +++ b/networking/onprem-google-access-dns/backend.tf.sample @@ -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. diff --git a/networking/onprem-google-access-dns/main.tf b/networking/onprem-google-access-dns/main.tf index 6c651a578..5027581b5 100644 --- a/networking/onprem-google-access-dns/main.tf +++ b/networking/onprem-google-access-dns/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. diff --git a/networking/onprem-google-access-dns/outputs.tf b/networking/onprem-google-access-dns/outputs.tf index b02b92d9f..35a8e9006 100644 --- a/networking/onprem-google-access-dns/outputs.tf +++ b/networking/onprem-google-access-dns/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. diff --git a/networking/onprem-google-access-dns/variables.tf b/networking/onprem-google-access-dns/variables.tf index e0ae1712c..a32f4b54e 100644 --- a/networking/onprem-google-access-dns/variables.tf +++ b/networking/onprem-google-access-dns/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. diff --git a/networking/onprem-google-access-dns/versions.tf b/networking/onprem-google-access-dns/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/onprem-google-access-dns/versions.tf +++ b/networking/onprem-google-access-dns/versions.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. diff --git a/networking/private-cloud-function-from-onprem/assets/main.py b/networking/private-cloud-function-from-onprem/assets/main.py index 45236c378..6534cbd6e 100644 --- a/networking/private-cloud-function-from-onprem/assets/main.py +++ b/networking/private-cloud-function-from-onprem/assets/main.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. @@ -13,10 +13,10 @@ # limitations under the License. def main(request): - request_json = request.get_json() - if request.args and 'message' in request.args: - return request.args.get('message') - elif request_json and 'message' in request_json: - return request_json['message'] - else: - return f'Hello World!!1\n' + request_json = request.get_json() + if request.args and 'message' in request.args: + return request.args.get('message') + elif request_json and 'message' in request_json: + return request_json['message'] + else: + return f'Hello World!!1\n' diff --git a/networking/private-cloud-function-from-onprem/main.tf b/networking/private-cloud-function-from-onprem/main.tf index 2cb858d63..b8dda5614 100644 --- a/networking/private-cloud-function-from-onprem/main.tf +++ b/networking/private-cloud-function-from-onprem/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. diff --git a/networking/private-cloud-function-from-onprem/outputs.tf b/networking/private-cloud-function-from-onprem/outputs.tf index 76a2fc680..a710c1d39 100644 --- a/networking/private-cloud-function-from-onprem/outputs.tf +++ b/networking/private-cloud-function-from-onprem/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. @@ -17,4 +17,4 @@ output "function_url" { description = "URL of the Cloud Function." value = module.function-hello.function.https_trigger_url -} \ No newline at end of file +} diff --git a/networking/private-cloud-function-from-onprem/variables.tf b/networking/private-cloud-function-from-onprem/variables.tf index 70355e172..d7f1aa00a 100644 --- a/networking/private-cloud-function-from-onprem/variables.tf +++ b/networking/private-cloud-function-from-onprem/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. diff --git a/networking/private-cloud-function-from-onprem/versions.tf b/networking/private-cloud-function-from-onprem/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/private-cloud-function-from-onprem/versions.tf +++ b/networking/private-cloud-function-from-onprem/versions.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. diff --git a/networking/shared-vpc-gke/backend.tf.sample b/networking/shared-vpc-gke/backend.tf.sample index 99f84b17c..4f2bb3365 100644 --- a/networking/shared-vpc-gke/backend.tf.sample +++ b/networking/shared-vpc-gke/backend.tf.sample @@ -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. diff --git a/networking/shared-vpc-gke/main.tf b/networking/shared-vpc-gke/main.tf index e60478f61..62946cd45 100644 --- a/networking/shared-vpc-gke/main.tf +++ b/networking/shared-vpc-gke/main.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. diff --git a/networking/shared-vpc-gke/outputs.tf b/networking/shared-vpc-gke/outputs.tf index 699f0610b..c84254ad5 100644 --- a/networking/shared-vpc-gke/outputs.tf +++ b/networking/shared-vpc-gke/outputs.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. diff --git a/networking/shared-vpc-gke/variables.tf b/networking/shared-vpc-gke/variables.tf index 24f8c58b6..daa1d72de 100644 --- a/networking/shared-vpc-gke/variables.tf +++ b/networking/shared-vpc-gke/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. diff --git a/networking/shared-vpc-gke/versions.tf b/networking/shared-vpc-gke/versions.tf index 1cc6bf899..290412687 100644 --- a/networking/shared-vpc-gke/versions.tf +++ b/networking/shared-vpc-gke/versions.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. diff --git a/tests/__init__.py b/tests/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/asset_inventory_feed_remediation/__init__.py b/tests/cloud_operations/asset_inventory_feed_remediation/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/asset_inventory_feed_remediation/fixture/main.tf b/tests/cloud_operations/asset_inventory_feed_remediation/fixture/main.tf index 8f683ffc6..79f84c5d8 100644 --- 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. diff --git a/tests/cloud_operations/asset_inventory_feed_remediation/fixture/variables.tf b/tests/cloud_operations/asset_inventory_feed_remediation/fixture/variables.tf index d071e3088..3d884c252 100644 --- 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. diff --git a/tests/cloud_operations/asset_inventory_feed_remediation/test_plan.py b/tests/cloud_operations/asset_inventory_feed_remediation/test_plan.py index 693ddd37b..ac90b5de3 100644 --- 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. diff --git a/tests/cloud_operations/dns_fine_grained_iam/__init__.py b/tests/cloud_operations/dns_fine_grained_iam/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/dns_fine_grained_iam/fixture/main.tf b/tests/cloud_operations/dns_fine_grained_iam/fixture/main.tf index 58eb23057..2ca8a398f 100644 --- 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. diff --git a/tests/cloud_operations/dns_fine_grained_iam/fixture/variables.tf b/tests/cloud_operations/dns_fine_grained_iam/fixture/variables.tf index 25a518308..4f92d75d7 100644 --- 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. diff --git a/tests/cloud_operations/dns_fine_grained_iam/test_plan.py b/tests/cloud_operations/dns_fine_grained_iam/test_plan.py index 6ce318bb0..5e22663fd 100644 --- 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. diff --git a/tests/cloud_operations/dns_shared_vpc/__init__.py b/tests/cloud_operations/dns_shared_vpc/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/dns_shared_vpc/fixture/main.tf b/tests/cloud_operations/dns_shared_vpc/fixture/main.tf index 52fd490cf..b91605119 100644 --- 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. diff --git a/tests/cloud_operations/dns_shared_vpc/fixture/variables.tf b/tests/cloud_operations/dns_shared_vpc/fixture/variables.tf index e813a8b08..c6eeb83ef 100644 --- 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. diff --git a/tests/cloud_operations/dns_shared_vpc/test_plan.py b/tests/cloud_operations/dns_shared_vpc/test_plan.py index 74609e3d2..38caca218 100644 --- 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. diff --git a/tests/cloud_operations/iam_delegated_role_grants/__init__.py b/tests/cloud_operations/iam_delegated_role_grants/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/iam_delegated_role_grants/fixture/main.tf b/tests/cloud_operations/iam_delegated_role_grants/fixture/main.tf index 78b313e86..44fa4510f 100644 --- 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. diff --git a/tests/cloud_operations/iam_delegated_role_grants/fixture/variables.tf b/tests/cloud_operations/iam_delegated_role_grants/fixture/variables.tf index da4bff27f..626af0119 100644 --- 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. diff --git a/tests/cloud_operations/iam_delegated_role_grants/test_plan.py b/tests/cloud_operations/iam_delegated_role_grants/test_plan.py index e6c860e88..e8a070fc3 100644 --- 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 diff --git a/tests/cloud_operations/onprem_sa_key_management/__init__.py b/tests/cloud_operations/onprem_sa_key_management/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/cloud_operations/onprem_sa_key_management/__init__.py +++ b/tests/cloud_operations/onprem_sa_key_management/__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. diff --git a/tests/cloud_operations/onprem_sa_key_management/fixture/main.tf b/tests/cloud_operations/onprem_sa_key_management/fixture/main.tf index 1f609552e..a6469b23f 100644 --- a/tests/cloud_operations/onprem_sa_key_management/fixture/main.tf +++ b/tests/cloud_operations/onprem_sa_key_management/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. diff --git a/tests/cloud_operations/onprem_sa_key_management/fixture/variables.tf b/tests/cloud_operations/onprem_sa_key_management/fixture/variables.tf index 7014ccb51..ab2117be3 100644 --- a/tests/cloud_operations/onprem_sa_key_management/fixture/variables.tf +++ b/tests/cloud_operations/onprem_sa_key_management/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. diff --git a/tests/cloud_operations/onprem_sa_key_management/test_plan.py b/tests/cloud_operations/onprem_sa_key_management/test_plan.py index 7de84db57..13ece55a3 100644 --- a/tests/cloud_operations/onprem_sa_key_management/test_plan.py +++ b/tests/cloud_operations/onprem_sa_key_management/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. diff --git a/tests/cloud_operations/packer_image_builder/__init__.py b/tests/cloud_operations/packer_image_builder/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/packer_image_builder/fixture/main.tf b/tests/cloud_operations/packer_image_builder/fixture/main.tf index 261411abb..5b7e81e10 100644 --- 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. diff --git a/tests/cloud_operations/packer_image_builder/fixture/variables.tf b/tests/cloud_operations/packer_image_builder/fixture/variables.tf index 37ef4ce7a..5320fb690 100644 --- 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. diff --git a/tests/cloud_operations/packer_image_builder/test_plan.py b/tests/cloud_operations/packer_image_builder/test_plan.py index f8323f4d7..765456c6d 100644 --- 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 diff --git a/tests/cloud_operations/quota_monitoring/__init__.py b/tests/cloud_operations/quota_monitoring/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/quota_monitoring/fixture/main.tf b/tests/cloud_operations/quota_monitoring/fixture/main.tf index d62e0baed..6b5f89ea2 100644 --- 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. diff --git a/tests/cloud_operations/quota_monitoring/fixture/variables.tf b/tests/cloud_operations/quota_monitoring/fixture/variables.tf index 25a518308..4f92d75d7 100644 --- 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. diff --git a/tests/cloud_operations/quota_monitoring/test_plan.py b/tests/cloud_operations/quota_monitoring/test_plan.py index 134970fc9..46993ff30 100644 --- 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. diff --git a/tests/cloud_operations/scheduled_asset_inventory_export_bq/__init__.py b/tests/cloud_operations/scheduled_asset_inventory_export_bq/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/main.tf b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/main.tf index f7bd01af0..3b72369d1 100644 --- 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. diff --git a/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/variables.tf b/tests/cloud_operations/scheduled_asset_inventory_export_bq/fixture/variables.tf index d80431e33..fb30df607 100644 --- 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. diff --git a/tests/cloud_operations/scheduled_asset_inventory_export_bq/test_plan.py b/tests/cloud_operations/scheduled_asset_inventory_export_bq/test_plan.py index 484496a57..3d0299abc 100644 --- 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. diff --git a/tests/conftest.py b/tests/conftest.py index ad8cc5ae1..f1e8e7603 100644 --- 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. @@ -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']) diff --git a/tests/data_solutions/cmek_via_centralized_kms/__init__.py b/tests/data_solutions/cmek_via_centralized_kms/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/data_solutions/cmek_via_centralized_kms/fixture/main.tf b/tests/data_solutions/cmek_via_centralized_kms/fixture/main.tf index 03f175c22..bf0afe196 100644 --- 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. diff --git a/tests/data_solutions/cmek_via_centralized_kms/fixture/variables.tf b/tests/data_solutions/cmek_via_centralized_kms/fixture/variables.tf index 499e1e464..6a534739f 100644 --- 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. diff --git a/tests/data_solutions/cmek_via_centralized_kms/test_plan.py b/tests/data_solutions/cmek_via_centralized_kms/test_plan.py index d52e85dea..665f28cbc 100644 --- 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. diff --git a/tests/data_solutions/data_platform_foundations/__init__.py b/tests/data_solutions/data_platform_foundations/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/data_solutions/data_platform_foundations/fixture/main.tf b/tests/data_solutions/data_platform_foundations/fixture/main.tf index 66de8aca1..b73101f52 100644 --- 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. diff --git a/tests/data_solutions/data_platform_foundations/fixture/variables.tf b/tests/data_solutions/data_platform_foundations/fixture/variables.tf index 499e1e464..6a534739f 100644 --- 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. diff --git a/tests/data_solutions/data_platform_foundations/test_plan.py b/tests/data_solutions/data_platform_foundations/test_plan.py index 157c9f037..af0130b22 100644 --- 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. diff --git a/tests/data_solutions/gcs_to_bq_with_dataflow/__init__.py b/tests/data_solutions/gcs_to_bq_with_dataflow/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/main.tf b/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/main.tf index 9d73be40d..e9818661f 100644 --- 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. diff --git a/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/variables.tf b/tests/data_solutions/gcs_to_bq_with_dataflow/fixture/variables.tf index 8c3b0169e..531572971 100644 --- 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. diff --git a/tests/data_solutions/gcs_to_bq_with_dataflow/test_plan.py b/tests/data_solutions/gcs_to_bq_with_dataflow/test_plan.py index 0ef9c8657..18d272c8d 100644 --- 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. diff --git a/tests/examples/conftest.py b/tests/examples/conftest.py index dee8fefbc..a2fb5e4d7 100644 --- 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: diff --git a/tests/examples/test_plan.py b/tests/examples/test_plan.py index 7ea19759f..a7d6f1f3a 100644 --- 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. diff --git a/tests/examples/variables.tf b/tests/examples/variables.tf index 0f13eabaa..38fb3db38 100644 --- 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. diff --git a/tests/factories/__init__.py b/tests/factories/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/firewall_hierarchical_policies/__init__.py b/tests/factories/firewall_hierarchical_policies/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/firewall_hierarchical_policies/fixture/main.tf b/tests/factories/firewall_hierarchical_policies/fixture/main.tf index 9e1716415..ffa485c21 100644 --- 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. diff --git a/tests/factories/firewall_hierarchical_policies/test_plan.py b/tests/factories/firewall_hierarchical_policies/test_plan.py index aef8ec1da..77cf70366 100644 --- 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. diff --git a/tests/factories/subnets/__init__.py b/tests/factories/subnets/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/subnets/fixture/main.tf b/tests/factories/subnets/fixture/main.tf index 815bac665..f59530c61 100644 --- 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" -} \ No newline at end of file +} diff --git a/tests/factories/subnets/test_plan.py b/tests/factories/subnets/test_plan.py index 0020964bc..e49710cd7 100644 --- 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. diff --git a/tests/factories/vpc_firewall/__init__.py b/tests/factories/vpc_firewall/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/vpc_firewall/flat/__init__.py b/tests/factories/vpc_firewall/flat/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/vpc_firewall/flat/fixture/main.tf b/tests/factories/vpc_firewall/flat/fixture/main.tf index 2fca3a872..4d20edd3d 100644 --- 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. diff --git a/tests/factories/vpc_firewall/flat/fixture/rules/common.yaml b/tests/factories/vpc_firewall/flat/fixture/rules/common.yaml index 829556ece..cbe8466f0 100644 --- 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 diff --git a/tests/factories/vpc_firewall/flat/fixture/variables.tf b/tests/factories/vpc_firewall/flat/fixture/variables.tf index 690f2878a..018289feb 100644 --- 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. diff --git a/tests/factories/vpc_firewall/flat/test_plan.py b/tests/factories/vpc_firewall/flat/test_plan.py index 684a323eb..f4b9655fd 100644 --- 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) diff --git a/tests/factories/vpc_firewall/nested/__init__.py b/tests/factories/vpc_firewall/nested/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/factories/vpc_firewall/nested/fixture/main.tf b/tests/factories/vpc_firewall/nested/fixture/main.tf index d50ebb79f..f4a2a7dc0 100644 --- 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. diff --git a/tests/factories/vpc_firewall/nested/test_plan.py b/tests/factories/vpc_firewall/nested/test_plan.py index 01cee1b7d..bfb51f2b0 100644 --- 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. diff --git a/tests/foundations/__init__.py b/tests/foundations/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/foundations/business_units/__init__.py b/tests/foundations/business_units/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/foundations/business_units/fixture/main.tf b/tests/foundations/business_units/fixture/main.tf index 2cf332299..252759eae 100644 --- 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. diff --git a/tests/foundations/business_units/fixture/variables.tf b/tests/foundations/business_units/fixture/variables.tf index db4dbe864..a89975953 100644 --- 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. diff --git a/tests/foundations/business_units/test_plan.py b/tests/foundations/business_units/test_plan.py index 97c118cfb..7fce7e718 100644 --- 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. diff --git a/tests/foundations/environments/__init__.py b/tests/foundations/environments/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/foundations/environments/fixture/main.tf b/tests/foundations/environments/fixture/main.tf index 428a8b53c..51fd8dfa8 100644 --- 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. diff --git a/tests/foundations/environments/fixture/variables.tf b/tests/foundations/environments/fixture/variables.tf index f17010e18..48ce5fde7 100644 --- 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. diff --git a/tests/foundations/environments/test_plan.py b/tests/foundations/environments/test_plan.py index 86470834c..ef2f37aaa 100644 --- 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. diff --git a/tests/modules/__init__.py b/tests/modules/__init__.py index bb2436ab6..6d6d1266c 100644 --- 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. - - diff --git a/tests/modules/apigee_organization/__init__.py b/tests/modules/apigee_organization/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/apigee_organization/fixture/main.tf b/tests/modules/apigee_organization/fixture/main.tf index e3b60b6d9..49ad78b1c 100644 --- 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. diff --git a/tests/modules/apigee_organization/fixture/variables.tf b/tests/modules/apigee_organization/fixture/variables.tf index 3e9109347..50e680896 100644 --- 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" -} \ No newline at end of file +} diff --git a/tests/modules/apigee_organization/test_plan.py b/tests/modules/apigee_organization/test_plan.py index 680d3cab3..95a34db3d 100644 --- 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 diff --git a/tests/modules/apigee_x_instance/__init__.py b/tests/modules/apigee_x_instance/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/apigee_x_instance/fixture/main.tf b/tests/modules/apigee_x_instance/fixture/main.tf index 9915ef207..a7c8c9a0e 100644 --- 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" ] -} \ No newline at end of file +} diff --git a/tests/modules/apigee_x_instance/fixture/variables.tf b/tests/modules/apigee_x_instance/fixture/variables.tf index 603ec5085..4fc58d628 100644 --- 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" -} \ No newline at end of file +} diff --git a/tests/modules/apigee_x_instance/test_plan.py b/tests/modules/apigee_x_instance/test_plan.py index 4b3a9256d..a499d72e0 100644 --- 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' - diff --git a/tests/modules/bigquery_dataset/__init__.py b/tests/modules/bigquery_dataset/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/bigquery_dataset/fixture/main.tf b/tests/modules/bigquery_dataset/fixture/main.tf index edb4ee3c9..a33141183 100644 --- 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. diff --git a/tests/modules/bigquery_dataset/test_plan.py b/tests/modules/bigquery_dataset/test_plan.py index bd0db2096..ce02715d8 100644 --- 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. diff --git a/tests/modules/bigtable_instance/__init__.py b/tests/modules/bigtable_instance/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/bigtable_instance/fixture/main.tf b/tests/modules/bigtable_instance/fixture/main.tf index 7e746bf33..fa74a6c8e 100644 --- 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. diff --git a/tests/modules/bigtable_instance/fixture/variables.tf b/tests/modules/bigtable_instance/fixture/variables.tf index 4573745fd..c8a4b5daa 100644 --- 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. diff --git a/tests/modules/bigtable_instance/test_plan.py b/tests/modules/bigtable_instance/test_plan.py index d296f4c9f..557eadd2f 100644 --- 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. diff --git a/tests/modules/billing_budget/__init__.py b/tests/modules/billing_budget/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/billing_budget/fixture/main.tf b/tests/modules/billing_budget/fixture/main.tf index 91c05e4a6..25cd25f57 100644 --- 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. diff --git a/tests/modules/billing_budget/fixture/variables.tf b/tests/modules/billing_budget/fixture/variables.tf index 6eb8e4e39..0cbcb447f 100644 --- 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. diff --git a/tests/modules/billing_budget/test_plan.py b/tests/modules/billing_budget/test_plan.py index 5692bf0a5..ddb848e7f 100644 --- 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} ] diff --git a/tests/modules/cloud_config_container_coredns/__init__.py b/tests/modules/cloud_config_container_coredns/__init__.py index d46dbae5e..6d6d1266c 100644 --- 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. diff --git a/tests/modules/cloud_config_container_coredns/fixture/main.tf b/tests/modules/cloud_config_container_coredns/fixture/main.tf index 8b1bd3525..69a926784 100644 --- 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. diff --git a/tests/modules/cloud_config_container_coredns/fixture/outputs.tf b/tests/modules/cloud_config_container_coredns/fixture/outputs.tf index 103987dc7..6aa222fd8 100644 --- 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. diff --git a/tests/modules/cloud_config_container_coredns/fixture/variables.tf b/tests/modules/cloud_config_container_coredns/fixture/variables.tf index 091e27d5c..b8b2e27b4 100644 --- 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. diff --git a/tests/modules/cloud_config_container_coredns/test_apply.py b/tests/modules/cloud_config_container_coredns/test_apply.py index b4f01a9d0..d1447bb9e 100644 --- a/tests/modules/cloud_config_container_coredns/test_apply.py +++ b/tests/modules/cloud_config_container_coredns/test_apply.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. diff --git a/tests/modules/cloud_config_container_mysql/__init__.py b/tests/modules/cloud_config_container_mysql/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/cloud_config_container_mysql/__init__.py +++ b/tests/modules/cloud_config_container_mysql/__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. diff --git a/tests/modules/cloud_config_container_mysql/fixture/main.tf b/tests/modules/cloud_config_container_mysql/fixture/main.tf index 347e0ebc8..41528d0cf 100644 --- a/tests/modules/cloud_config_container_mysql/fixture/main.tf +++ b/tests/modules/cloud_config_container_mysql/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. diff --git a/tests/modules/cloud_config_container_mysql/fixture/outputs.tf b/tests/modules/cloud_config_container_mysql/fixture/outputs.tf index 103987dc7..6aa222fd8 100644 --- a/tests/modules/cloud_config_container_mysql/fixture/outputs.tf +++ b/tests/modules/cloud_config_container_mysql/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. diff --git a/tests/modules/cloud_config_container_mysql/fixture/variables.tf b/tests/modules/cloud_config_container_mysql/fixture/variables.tf index 2ada8a5ed..8f78592a7 100644 --- a/tests/modules/cloud_config_container_mysql/fixture/variables.tf +++ b/tests/modules/cloud_config_container_mysql/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. diff --git a/tests/modules/cloud_config_container_mysql/test_apply.py b/tests/modules/cloud_config_container_mysql/test_apply.py index 23c80108c..302438a4c 100644 --- a/tests/modules/cloud_config_container_mysql/test_apply.py +++ b/tests/modules/cloud_config_container_mysql/test_apply.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. diff --git a/tests/modules/cloud_function/__init__.py b/tests/modules/cloud_function/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/cloud_function/__init__.py +++ b/tests/modules/cloud_function/__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. diff --git a/tests/modules/cloud_function/fixture/bundle/main.py b/tests/modules/cloud_function/fixture/bundle/main.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/cloud_function/fixture/bundle/main.py +++ b/tests/modules/cloud_function/fixture/bundle/main.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. diff --git a/tests/modules/cloud_function/fixture/main.tf b/tests/modules/cloud_function/fixture/main.tf index e94a9f638..a6fc7278e 100644 --- a/tests/modules/cloud_function/fixture/main.tf +++ b/tests/modules/cloud_function/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. diff --git a/tests/modules/cloud_function/fixture/variables.tf b/tests/modules/cloud_function/fixture/variables.tf index 3223c1629..600840858 100644 --- a/tests/modules/cloud_function/fixture/variables.tf +++ b/tests/modules/cloud_function/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. diff --git a/tests/modules/cloud_function/test_plan.py b/tests/modules/cloud_function/test_plan.py index a69901720..ffd1b6010 100644 --- a/tests/modules/cloud_function/test_plan.py +++ b/tests/modules/cloud_function/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. diff --git a/tests/modules/cloud_identity_group/__init__.py b/tests/modules/cloud_identity_group/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/cloud_identity_group/__init__.py +++ b/tests/modules/cloud_identity_group/__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. diff --git a/tests/modules/cloud_identity_group/fixture/main.tf b/tests/modules/cloud_identity_group/fixture/main.tf index 7d43ae146..a4058573b 100644 --- a/tests/modules/cloud_identity_group/fixture/main.tf +++ b/tests/modules/cloud_identity_group/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. diff --git a/tests/modules/cloud_identity_group/fixture/variables.tf b/tests/modules/cloud_identity_group/fixture/variables.tf index 20c8e273f..936282d85 100644 --- a/tests/modules/cloud_identity_group/fixture/variables.tf +++ b/tests/modules/cloud_identity_group/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. diff --git a/tests/modules/cloud_identity_group/test_plan.py b/tests/modules/cloud_identity_group/test_plan.py index e2b5a20c1..6d7d98237 100644 --- a/tests/modules/cloud_identity_group/test_plan.py +++ b/tests/modules/cloud_identity_group/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. @@ -40,8 +40,8 @@ def test_members(plan_runner): resource_types = Counter([r['type'] for r in resources]) assert resource_types == { - 'google_cloud_identity_group': 1, - 'google_cloud_identity_group_membership': 1, + 'google_cloud_identity_group': 1, + 'google_cloud_identity_group_membership': 1, } values = next(r['values'] for r in resources if r['name'] == 'members') diff --git a/tests/modules/cloud_run/__init__.py b/tests/modules/cloud_run/__init__.py index bb2436ab6..6d6d1266c 100644 --- a/tests/modules/cloud_run/__init__.py +++ b/tests/modules/cloud_run/__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. - - diff --git a/tests/modules/cloud_run/fixture/bundle/main.py b/tests/modules/cloud_run/fixture/bundle/main.py index 0446db3c4..6d6d1266c 100644 --- a/tests/modules/cloud_run/fixture/bundle/main.py +++ b/tests/modules/cloud_run/fixture/bundle/main.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. @@ -10,4 +10,4 @@ # 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. \ No newline at end of file +# limitations under the License. diff --git a/tests/modules/cloud_run/fixture/main.tf b/tests/modules/cloud_run/fixture/main.tf index d0872c22d..f4aa8afab 100644 --- a/tests/modules/cloud_run/fixture/main.tf +++ b/tests/modules/cloud_run/fixture/main.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. diff --git a/tests/modules/cloud_run/fixture/variables.tf b/tests/modules/cloud_run/fixture/variables.tf index 0446db3c4..6d6d1266c 100644 --- a/tests/modules/cloud_run/fixture/variables.tf +++ b/tests/modules/cloud_run/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. @@ -10,4 +10,4 @@ # 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. \ No newline at end of file +# limitations under the License. diff --git a/tests/modules/cloud_run/test_plan.py b/tests/modules/cloud_run/test_plan.py index 13cd3ecb1..719e6d4cc 100644 --- a/tests/modules/cloud_run/test_plan.py +++ b/tests/modules/cloud_run/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. @@ -30,6 +30,7 @@ def test_resource_count(resources): "Test number of resources created." assert len(resources) == 5 + def test_iam(resources): "Test IAM binding resources." bindings = [r['values'] for r in resources if r['type'] @@ -37,14 +38,16 @@ def test_iam(resources): assert len(bindings) == 1 assert bindings[0]['role'] == 'roles/run.invoker' + def test_audit_log_triggers(resources): "Test audit logs Eventarc trigger resources." audit_log_triggers = [r['values'] for r in resources if r['type'] - == 'google_eventarc_trigger' and r['name'] == 'audit_log_triggers'] + == 'google_eventarc_trigger' and r['name'] == 'audit_log_triggers'] assert len(audit_log_triggers) == 1 + def test_pubsub_triggers(resources): "Test Pub/Sub Eventarc trigger resources." pubsub_triggers = [r['values'] for r in resources if r['type'] - == 'google_eventarc_trigger' and r['name'] == 'pubsub_triggers'] + == 'google_eventarc_trigger' and r['name'] == 'pubsub_triggers'] assert len(pubsub_triggers) == 2 diff --git a/tests/modules/cloudsql_instance/__init__.py b/tests/modules/cloudsql_instance/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/cloudsql_instance/__init__.py +++ b/tests/modules/cloudsql_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. diff --git a/tests/modules/cloudsql_instance/fixture/main.tf b/tests/modules/cloudsql_instance/fixture/main.tf index feafb4ceb..075ee4f1a 100644 --- a/tests/modules/cloudsql_instance/fixture/main.tf +++ b/tests/modules/cloudsql_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. diff --git a/tests/modules/cloudsql_instance/fixture/variables.tf b/tests/modules/cloudsql_instance/fixture/variables.tf index a3ff8e0fe..62ff27a30 100644 --- a/tests/modules/cloudsql_instance/fixture/variables.tf +++ b/tests/modules/cloudsql_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. diff --git a/tests/modules/cloudsql_instance/test_plan.py b/tests/modules/cloudsql_instance/test_plan.py index f58a0625f..97c65e001 100644 --- a/tests/modules/cloudsql_instance/test_plan.py +++ b/tests/modules/cloudsql_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. diff --git a/tests/modules/compute_mig/__init__.py b/tests/modules/compute_mig/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/compute_mig/__init__.py +++ b/tests/modules/compute_mig/__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. diff --git a/tests/modules/compute_mig/fixture/main.tf b/tests/modules/compute_mig/fixture/main.tf index a18b237eb..5d87f40f7 100644 --- a/tests/modules/compute_mig/fixture/main.tf +++ b/tests/modules/compute_mig/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. diff --git a/tests/modules/compute_mig/fixture/variables.tf b/tests/modules/compute_mig/fixture/variables.tf index c025665cd..b9fde8343 100644 --- a/tests/modules/compute_mig/fixture/variables.tf +++ b/tests/modules/compute_mig/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. diff --git a/tests/modules/compute_mig/test_plan.py b/tests/modules/compute_mig/test_plan.py index a6987904c..fe7b81b65 100644 --- a/tests/modules/compute_mig/test_plan.py +++ b/tests/modules/compute_mig/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. @@ -36,6 +36,7 @@ def test_defaults(plan_runner): assert mig['values']['target_size'] == 2 assert mig['values']['region'] + def test_health_check(plan_runner): "Test health check resource." health_check_config = '{type="tcp", check={port=80}, config=null, logging=false}' @@ -75,19 +76,20 @@ def test_autoscaler(plan_runner): assert len(resources) == 2 autoscaler = resources[0] assert autoscaler['type'] == 'google_compute_region_autoscaler' - + + def test_stateful_mig(plan_runner): "Test stateful instances - mig." stateful_config = ( - '{' + '{' 'per_instance_config = {},' 'mig_config = {' - 'stateful_disks = {' - 'persistent-disk-1 = {delete_rule="NEVER"}' - '}' + 'stateful_disks = {' + 'persistent-disk-1 = {delete_rule="NEVER"}' + '}' + '}' '}' - '}' ) _, resources = plan_runner( FIXTURES_DIR, stateful_config=stateful_config) @@ -98,37 +100,38 @@ def test_stateful_mig(plan_runner): 'device_name': 'persistent-disk-1', 'delete_rule': 'NEVER', }] - + + def test_stateful_instance(plan_runner): "Test stateful instances - instance." stateful_config = ( - '{' + '{' 'per_instance_config = {' - 'instance-1 = {' - 'stateful_disks = {' - 'persistent-disk-1 = {' - 'source = "test-disk",' - 'mode = "READ_ONLY",' - 'delete_rule= "NEVER",' - '},' - '},' - 'metadata = {' - 'foo = "bar"' - '},' - 'update_config = {' - 'minimal_action = "NONE",' - 'most_disruptive_allowed_action = "REPLACE",' - 'remove_instance_state_on_destroy = false,' - - '},' - '},' + 'instance-1 = {' + 'stateful_disks = {' + 'persistent-disk-1 = {' + 'source = "test-disk",' + 'mode = "READ_ONLY",' + 'delete_rule= "NEVER",' + '},' + '},' + 'metadata = {' + 'foo = "bar"' + '},' + 'update_config = {' + 'minimal_action = "NONE",' + 'most_disruptive_allowed_action = "REPLACE",' + 'remove_instance_state_on_destroy = false,' + + '},' + '},' '},' 'mig_config = {' - 'stateful_disks = {' - 'persistent-disk-1 = {delete_rule="NEVER"}' - '}' + 'stateful_disks = {' + 'persistent-disk-1 = {delete_rule="NEVER"}' + '}' + '}' '}' - '}' ) _, resources = plan_runner( FIXTURES_DIR, stateful_config=stateful_config) @@ -137,19 +140,19 @@ def test_stateful_instance(plan_runner): assert instanceconfig['type'] == 'google_compute_instance_group_manager' instanceconfig = resources[1] assert instanceconfig['type'] == 'google_compute_per_instance_config' - + assert instanceconfig['values']['preserved_state'] == [{ 'disk': [{ - 'device_name': 'persistent-disk-1', - 'delete_rule': 'NEVER', - 'source': 'test-disk', - 'mode': 'READ_ONLY', + 'device_name': 'persistent-disk-1', + 'delete_rule': 'NEVER', + 'source': 'test-disk', + 'mode': 'READ_ONLY', }], 'metadata': { - 'foo': 'bar' + 'foo': 'bar' } }] assert instanceconfig['values']['minimal_action'] == 'NONE' assert instanceconfig['values']['most_disruptive_allowed_action'] == 'REPLACE' - assert instanceconfig['values']['remove_instance_state_on_destroy'] == False \ No newline at end of file + assert instanceconfig['values']['remove_instance_state_on_destroy'] == False diff --git a/tests/modules/compute_vm/__init__.py b/tests/modules/compute_vm/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/compute_vm/__init__.py +++ b/tests/modules/compute_vm/__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. diff --git a/tests/modules/compute_vm/fixture/main.tf b/tests/modules/compute_vm/fixture/main.tf index 31903e6b0..5815f25f7 100644 --- a/tests/modules/compute_vm/fixture/main.tf +++ b/tests/modules/compute_vm/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. diff --git a/tests/modules/compute_vm/fixture/variables.tf b/tests/modules/compute_vm/fixture/variables.tf index cd9cdb475..1c28d2d97 100644 --- a/tests/modules/compute_vm/fixture/variables.tf +++ b/tests/modules/compute_vm/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. diff --git a/tests/modules/compute_vm/test_plan.py b/tests/modules/compute_vm/test_plan.py index 6db0c3019..7c4d42370 100644 --- a/tests/modules/compute_vm/test_plan.py +++ b/tests/modules/compute_vm/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. diff --git a/tests/modules/compute_vm/test_plan_disks.py b/tests/modules/compute_vm/test_plan_disks.py index 711d9f09c..42d365379 100644 --- a/tests/modules/compute_vm/test_plan_disks.py +++ b/tests/modules/compute_vm/test_plan_disks.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. diff --git a/tests/modules/compute_vm/test_plan_interfaces.py b/tests/modules/compute_vm/test_plan_interfaces.py index 9efdeafef..fed07966c 100644 --- a/tests/modules/compute_vm/test_plan_interfaces.py +++ b/tests/modules/compute_vm/test_plan_interfaces.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. diff --git a/tests/modules/container_registry/__init__.py b/tests/modules/container_registry/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/container_registry/__init__.py +++ b/tests/modules/container_registry/__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. diff --git a/tests/modules/container_registry/fixture/main.tf b/tests/modules/container_registry/fixture/main.tf index d505e38a8..52866b54e 100644 --- a/tests/modules/container_registry/fixture/main.tf +++ b/tests/modules/container_registry/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. diff --git a/tests/modules/container_registry/fixture/variables.tf b/tests/modules/container_registry/fixture/variables.tf index 4480e669d..c76b08898 100644 --- a/tests/modules/container_registry/fixture/variables.tf +++ b/tests/modules/container_registry/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. diff --git a/tests/modules/container_registry/test_plan.py b/tests/modules/container_registry/test_plan.py index dc5affe04..c428adf73 100644 --- a/tests/modules/container_registry/test_plan.py +++ b/tests/modules/container_registry/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. diff --git a/tests/modules/dns/__init__.py b/tests/modules/dns/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/dns/__init__.py +++ b/tests/modules/dns/__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. diff --git a/tests/modules/dns/fixture/main.tf b/tests/modules/dns/fixture/main.tf index 51f8928a4..bab319204 100644 --- a/tests/modules/dns/fixture/main.tf +++ b/tests/modules/dns/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. diff --git a/tests/modules/dns/fixture/variables.tf b/tests/modules/dns/fixture/variables.tf index a08a04207..522b238ae 100644 --- a/tests/modules/dns/fixture/variables.tf +++ b/tests/modules/dns/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. diff --git a/tests/modules/dns/test_plan.py b/tests/modules/dns/test_plan.py index 682c2e1a6..b1bc9f666 100644 --- a/tests/modules/dns/test_plan.py +++ b/tests/modules/dns/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. diff --git a/tests/modules/endpoints/__init__.py b/tests/modules/endpoints/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/endpoints/__init__.py +++ b/tests/modules/endpoints/__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. diff --git a/tests/modules/endpoints/fixture/main.tf b/tests/modules/endpoints/fixture/main.tf index 5c1c77366..39694298f 100644 --- a/tests/modules/endpoints/fixture/main.tf +++ b/tests/modules/endpoints/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. diff --git a/tests/modules/endpoints/fixture/openapi.yaml b/tests/modules/endpoints/fixture/openapi.yaml index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/endpoints/fixture/openapi.yaml +++ b/tests/modules/endpoints/fixture/openapi.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. diff --git a/tests/modules/endpoints/fixture/variables.tf b/tests/modules/endpoints/fixture/variables.tf index d323e7202..6efe07c3f 100644 --- a/tests/modules/endpoints/fixture/variables.tf +++ b/tests/modules/endpoints/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. diff --git a/tests/modules/endpoints/test_plan.py b/tests/modules/endpoints/test_plan.py index 3837e2b9c..f504d76d2 100644 --- a/tests/modules/endpoints/test_plan.py +++ b/tests/modules/endpoints/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. diff --git a/tests/modules/folder/__init__.py b/tests/modules/folder/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/folder/__init__.py +++ b/tests/modules/folder/__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. diff --git a/tests/modules/folder/fixture/main.tf b/tests/modules/folder/fixture/main.tf index d9bd34ba8..05fe8105f 100644 --- a/tests/modules/folder/fixture/main.tf +++ b/tests/modules/folder/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. diff --git a/tests/modules/folder/fixture/variables.tf b/tests/modules/folder/fixture/variables.tf index 824560d97..5917d7dce 100644 --- a/tests/modules/folder/fixture/variables.tf +++ b/tests/modules/folder/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. diff --git a/tests/modules/folder/test_plan.py b/tests/modules/folder/test_plan.py index e325627cf..a38cf1512 100644 --- a/tests/modules/folder/test_plan.py +++ b/tests/modules/folder/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. diff --git a/tests/modules/folder/test_plan_firewall_policy.py b/tests/modules/folder/test_plan_firewall_policy.py index 9a7a31b5f..5369eecc6 100644 --- a/tests/modules/folder/test_plan_firewall_policy.py +++ b/tests/modules/folder/test_plan_firewall_policy.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. @@ -60,7 +60,7 @@ def test_firweall_policy(plan_runner): assert len(resources) == 5 policies = [r for r in resources - if r['type'] == 'google_compute_firewall_policy'] + if r['type'] == 'google_compute_firewall_policy'] assert len(policies) == 1 rules = [r for r in resources @@ -78,18 +78,16 @@ def test_firweall_policy(plan_runner): rule_values.append((name, index, action, direction, priority, match)) assert sorted(rule_values) == sorted([ - ('rule', 'policy1-allow-ingress', 'allow', 'INGRESS', 100,[ - { - 'dest_ip_ranges': None, - 'layer4_configs': [{'ip_protocol': 'tcp', 'ports': ['22']}], - 'src_ip_ranges': ['10.0.0.0/8'] - }]), - ('rule', 'policy1-deny-egress', 'deny', 'EGRESS', 200, [ - { - 'dest_ip_ranges': ['192.168.0.0/24'], - 'layer4_configs': [{'ip_protocol': 'tcp', 'ports': ['443']}], - 'src_ip_ranges': None - }]) + ('rule', 'policy1-allow-ingress', 'allow', 'INGRESS', 100, [ + { + 'dest_ip_ranges': None, + 'layer4_configs': [{'ip_protocol': 'tcp', 'ports': ['22']}], + 'src_ip_ranges': ['10.0.0.0/8'] + }]), + ('rule', 'policy1-deny-egress', 'deny', 'EGRESS', 200, [ + { + 'dest_ip_ranges': ['192.168.0.0/24'], + 'layer4_configs': [{'ip_protocol': 'tcp', 'ports': ['443']}], + 'src_ip_ranges': None + }]) ]) - - diff --git a/tests/modules/folder/test_plan_logging.py b/tests/modules/folder/test_plan_logging.py index 9bd7688fe..c57364f27 100644 --- a/tests/modules/folder/test_plan_logging.py +++ b/tests/modules/folder/test_plan_logging.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,8 +22,8 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "fixture") def test_sinks(plan_runner): - "Test folder-level sinks." - logging_sinks = """ { + "Test folder-level sinks." + logging_sinks = """ { warning = { type = "gcs" destination = "mybucket" @@ -61,110 +61,111 @@ def test_sinks(plan_runner): } } """ - _, resources = plan_runner(FIXTURES_DIR, logging_sinks=logging_sinks) - assert len(resources) == 9 + _, resources = plan_runner(FIXTURES_DIR, logging_sinks=logging_sinks) + assert len(resources) == 9 - resource_types = Counter([r["type"] for r in resources]) - assert resource_types == { - "google_logging_folder_sink": 4, - "google_folder": 1, - "google_bigquery_dataset_iam_member": 1, - "google_project_iam_member": 1, - "google_pubsub_topic_iam_member": 1, - "google_storage_bucket_iam_member": 1, - } + resource_types = Counter([r["type"] for r in resources]) + assert resource_types == { + "google_logging_folder_sink": 4, + "google_folder": 1, + "google_bigquery_dataset_iam_member": 1, + "google_project_iam_member": 1, + "google_pubsub_topic_iam_member": 1, + "google_storage_bucket_iam_member": 1, + } - sinks = [r for r in resources if r["type"] == "google_logging_folder_sink"] - assert sorted([r["index"] for r in sinks]) == [ - "debug", - "info", - "notice", - "warning", - ] - values = [ - ( - r["index"], - r["values"]["filter"], - r["values"]["destination"], - r["values"]["include_children"], - ) - for r in sinks - ] - assert sorted(values) == [ - ( - "debug", - "severity=DEBUG", - "logging.googleapis.com/projects/myproject/locations/global/buckets/mybucket", - False, - ), - ( - "info", - "severity=INFO", - "bigquery.googleapis.com/projects/myproject/datasets/mydataset", - True, - ), - ( - "notice", - "severity=NOTICE", - "pubsub.googleapis.com/projects/myproject/topics/mytopic", - False, - ), - ("warning", "severity=WARNING", "storage.googleapis.com/mybucket", True), - ] + sinks = [r for r in resources if r["type"] == "google_logging_folder_sink"] + assert sorted([r["index"] for r in sinks]) == [ + "debug", + "info", + "notice", + "warning", + ] + values = [ + ( + r["index"], + r["values"]["filter"], + r["values"]["destination"], + r["values"]["include_children"], + ) + for r in sinks + ] + assert sorted(values) == [ + ( + "debug", + "severity=DEBUG", + "logging.googleapis.com/projects/myproject/locations/global/buckets/mybucket", + False, + ), + ( + "info", + "severity=INFO", + "bigquery.googleapis.com/projects/myproject/datasets/mydataset", + True, + ), + ( + "notice", + "severity=NOTICE", + "pubsub.googleapis.com/projects/myproject/topics/mytopic", + False, + ), + ("warning", "severity=WARNING", "storage.googleapis.com/mybucket", True), + ] - bindings = [r for r in resources if "member" in r["type"]] - values = [(r["index"], r["type"], r["values"]["role"]) for r in bindings] - assert sorted(values) == [ - ("debug", "google_project_iam_member", "roles/logging.bucketWriter"), - ("info", "google_bigquery_dataset_iam_member", "roles/bigquery.dataEditor"), - ("notice", "google_pubsub_topic_iam_member", "roles/pubsub.publisher"), - ("warning", "google_storage_bucket_iam_member", "roles/storage.objectCreator"), - ] + bindings = [r for r in resources if "member" in r["type"]] + values = [(r["index"], r["type"], r["values"]["role"]) for r in bindings] + assert sorted(values) == [ + ("debug", "google_project_iam_member", "roles/logging.bucketWriter"), + ("info", "google_bigquery_dataset_iam_member", "roles/bigquery.dataEditor"), + ("notice", "google_pubsub_topic_iam_member", "roles/pubsub.publisher"), + ("warning", "google_storage_bucket_iam_member", "roles/storage.objectCreator"), + ] - exclusions = [(r["index"], r["values"]["exclusions"]) for r in sinks] - assert sorted(exclusions) == [ - ( - "debug", - [ - { - "description": None, - "disabled": False, - "filter": "logName:compute", - "name": "no-compute", - }, - { - "description": None, - "disabled": False, - "filter": "logName:container", - "name": "no-container", - }, - ], - ), - ("info", []), - ("notice", []), - ("warning", []), - ] + exclusions = [(r["index"], r["values"]["exclusions"]) for r in sinks] + assert sorted(exclusions) == [ + ( + "debug", + [ + { + "description": None, + "disabled": False, + "filter": "logName:compute", + "name": "no-compute", + }, + { + "description": None, + "disabled": False, + "filter": "logName:container", + "name": "no-container", + }, + ], + ), + ("info", []), + ("notice", []), + ("warning", []), + ] def test_exclusions(plan_runner): - "Test folder-level logging exclusions." - logging_exclusions = ( - "{" - 'exclusion1 = "resource.type=gce_instance", ' - 'exclusion2 = "severity=NOTICE", ' - "}" - ) - _, resources = plan_runner(FIXTURES_DIR, logging_exclusions=logging_exclusions) - assert len(resources) == 3 - exclusions = [ - r for r in resources if r["type"] == "google_logging_folder_exclusion" - ] - assert sorted([r["index"] for r in exclusions]) == [ - "exclusion1", - "exclusion2", - ] - values = [(r["index"], r["values"]["filter"]) for r in exclusions] - assert sorted(values) == [ - ("exclusion1", "resource.type=gce_instance"), - ("exclusion2", "severity=NOTICE"), - ] + "Test folder-level logging exclusions." + logging_exclusions = ( + "{" + 'exclusion1 = "resource.type=gce_instance", ' + 'exclusion2 = "severity=NOTICE", ' + "}" + ) + _, resources = plan_runner( + FIXTURES_DIR, logging_exclusions=logging_exclusions) + assert len(resources) == 3 + exclusions = [ + r for r in resources if r["type"] == "google_logging_folder_exclusion" + ] + assert sorted([r["index"] for r in exclusions]) == [ + "exclusion1", + "exclusion2", + ] + values = [(r["index"], r["values"]["filter"]) for r in exclusions] + assert sorted(values) == [ + ("exclusion1", "resource.type=gce_instance"), + ("exclusion2", "severity=NOTICE"), + ] diff --git a/tests/modules/folder/test_plan_org_policies.py b/tests/modules/folder/test_plan_org_policies.py index 205ed3f54..af6233fea 100644 --- a/tests/modules/folder/test_plan_org_policies.py +++ b/tests/modules/folder/test_plan_org_policies.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. @@ -69,7 +69,7 @@ def test_exclussions(plan_runner): 'policy-a', 'policy-b', 'policy-c' ] assert values[0]['list_policy'][0]['allow'] == [ - {'all': True, 'values': None}] + {'all': True, 'values': None}] assert values[1]['list_policy'][0]['deny'] == [ - {'all': False, 'values': ["bar"]}] + {'all': False, 'values': ["bar"]}] assert values[2]['restore_policy'] == [{'default': True}] diff --git a/tests/modules/gcs/__init__.py b/tests/modules/gcs/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/gcs/__init__.py +++ b/tests/modules/gcs/__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. diff --git a/tests/modules/gcs/fixture/main.tf b/tests/modules/gcs/fixture/main.tf index 7e63ae0b4..ea2e994f6 100644 --- a/tests/modules/gcs/fixture/main.tf +++ b/tests/modules/gcs/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. diff --git a/tests/modules/gcs/fixture/variables.tf b/tests/modules/gcs/fixture/variables.tf index 44680c5e6..455d9a4bb 100644 --- a/tests/modules/gcs/fixture/variables.tf +++ b/tests/modules/gcs/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. diff --git a/tests/modules/gcs/test_plan.py b/tests/modules/gcs/test_plan.py index 79f86056d..8152067b2 100644 --- a/tests/modules/gcs/test_plan.py +++ b/tests/modules/gcs/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. @@ -19,6 +19,7 @@ import pytest FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'fixture') + def test_buckets(plan_runner): "Test bucket resources." _, resources = plan_runner(FIXTURES_DIR) @@ -28,6 +29,7 @@ def test_buckets(plan_runner): assert r['values']['name'] == 'bucket-a' assert r['values']['project'] == 'my-project' + def test_prefix(plan_runner): "Test bucket name when prefix is set." _, resources = plan_runner(FIXTURES_DIR, prefix='foo') @@ -37,9 +39,9 @@ def test_prefix(plan_runner): def test_config_values(plan_runner): "Test that variables set the correct attributes on buckets." variables = dict( - uniform_bucket_level_access='true', - force_destroy='true', - versioning='true' + uniform_bucket_level_access='true', + force_destroy='true', + versioning='true' ) _, resources = plan_runner(FIXTURES_DIR, **variables) assert len(resources) == 1 @@ -49,7 +51,7 @@ def test_config_values(plan_runner): assert r['values']['versioning'] == [{'enabled': True}] assert r['values']['logging'] == [{'log_bucket': 'foo'}] assert r['values']['retention_policy'] == [ - {'is_locked': False, 'retention_period': 5} + {'is_locked': False, 'retention_period': 5} ] diff --git a/tests/modules/gke_nodepool/__init__.py b/tests/modules/gke_nodepool/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/gke_nodepool/__init__.py +++ b/tests/modules/gke_nodepool/__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. diff --git a/tests/modules/gke_nodepool/fixture/main.tf b/tests/modules/gke_nodepool/fixture/main.tf index c9b6410d4..33a4f1650 100644 --- a/tests/modules/gke_nodepool/fixture/main.tf +++ b/tests/modules/gke_nodepool/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. diff --git a/tests/modules/gke_nodepool/fixture/variables.tf b/tests/modules/gke_nodepool/fixture/variables.tf index f4c9c1da9..cbb4331ba 100644 --- a/tests/modules/gke_nodepool/fixture/variables.tf +++ b/tests/modules/gke_nodepool/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. diff --git a/tests/modules/gke_nodepool/test_plan.py b/tests/modules/gke_nodepool/test_plan.py index e8f4ffdea..3a8e5b2f2 100644 --- a/tests/modules/gke_nodepool/test_plan.py +++ b/tests/modules/gke_nodepool/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. diff --git a/tests/modules/iam_service_account/__init__.py b/tests/modules/iam_service_account/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/iam_service_account/__init__.py +++ b/tests/modules/iam_service_account/__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. diff --git a/tests/modules/iam_service_account/fixture/main.tf b/tests/modules/iam_service_account/fixture/main.tf index 99707d0d5..535139836 100644 --- a/tests/modules/iam_service_account/fixture/main.tf +++ b/tests/modules/iam_service_account/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. diff --git a/tests/modules/iam_service_account/fixture/variables.tf b/tests/modules/iam_service_account/fixture/variables.tf index 71e6c2894..0a4781e07 100644 --- a/tests/modules/iam_service_account/fixture/variables.tf +++ b/tests/modules/iam_service_account/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. diff --git a/tests/modules/iam_service_account/test_plan.py b/tests/modules/iam_service_account/test_plan.py index 5686a0507..cea898073 100644 --- a/tests/modules/iam_service_account/test_plan.py +++ b/tests/modules/iam_service_account/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. @@ -36,7 +36,7 @@ def test_resources(plan_runner): def test_iam_roles(plan_runner): "Test iam roles with one member." - iam=('{"roles/iam.serviceAccountUser" = ["user:a@b.com"]}') + iam = ('{"roles/iam.serviceAccountUser" = ["user:a@b.com"]}') _, resources = plan_runner(FIXTURES_DIR, iam=iam) assert len(resources) == 2 iam_resources = [r for r in resources @@ -44,7 +44,7 @@ def test_iam_roles(plan_runner): assert len(iam_resources) == 1 iam_resource = iam_resources[0] - assert iam_resource['type'] == 'google_service_account_iam_binding' - assert iam_resource['index'] == 'roles/iam.serviceAccountUser' - assert iam_resource['values']['role'] == 'roles/iam.serviceAccountUser' - assert iam_resource['values']['members'] == ["user:a@b.com"] + assert iam_resource['type'] == 'google_service_account_iam_binding' + assert iam_resource['index'] == 'roles/iam.serviceAccountUser' + assert iam_resource['values']['role'] == 'roles/iam.serviceAccountUser' + assert iam_resource['values']['members'] == ["user:a@b.com"] diff --git a/tests/modules/kms/__init__.py b/tests/modules/kms/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/kms/__init__.py +++ b/tests/modules/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. diff --git a/tests/modules/kms/fixture/main.tf b/tests/modules/kms/fixture/main.tf index d60f1a4e7..42132f46a 100644 --- a/tests/modules/kms/fixture/main.tf +++ b/tests/modules/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. diff --git a/tests/modules/kms/fixture/outputs.tf b/tests/modules/kms/fixture/outputs.tf index a96b87ffe..523c5274c 100644 --- a/tests/modules/kms/fixture/outputs.tf +++ b/tests/modules/kms/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. diff --git a/tests/modules/kms/fixture/variables.tf b/tests/modules/kms/fixture/variables.tf index 7ec6f846c..aa03fd834 100644 --- a/tests/modules/kms/fixture/variables.tf +++ b/tests/modules/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. diff --git a/tests/modules/kms/test_plan.py b/tests/modules/kms/test_plan.py index 53e7b0874..011b7d4b9 100644 --- a/tests/modules/kms/test_plan.py +++ b/tests/modules/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. diff --git a/tests/modules/logging_bucket/__init__.py b/tests/modules/logging_bucket/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/logging_bucket/__init__.py +++ b/tests/modules/logging_bucket/__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. diff --git a/tests/modules/logging_bucket/fixture/main.tf b/tests/modules/logging_bucket/fixture/main.tf index 335bd7825..25ddc2299 100644 --- a/tests/modules/logging_bucket/fixture/main.tf +++ b/tests/modules/logging_bucket/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. diff --git a/tests/modules/logging_bucket/fixture/variables.tf b/tests/modules/logging_bucket/fixture/variables.tf index ef53e30d8..bfb80a188 100644 --- a/tests/modules/logging_bucket/fixture/variables.tf +++ b/tests/modules/logging_bucket/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. diff --git a/tests/modules/logging_bucket/test_plan.py b/tests/modules/logging_bucket/test_plan.py index 45793b8a8..d0e62ddae 100644 --- a/tests/modules/logging_bucket/test_plan.py +++ b/tests/modules/logging_bucket/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,66 +21,67 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "fixture") def test_project_logging_bucket(plan_runner): - "Test project logging bucket." - _, resources = plan_runner(FIXTURES_DIR, parent_type="project", parent="myproject") - assert len(resources) == 1 + "Test project logging bucket." + _, resources = plan_runner( + FIXTURES_DIR, 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", - "project": "myproject", - "location": "global", - "retention_days": 30, - } + resource = resources[0] + assert resource["type"] == "google_logging_project_bucket_config" + assert resource["values"] == { + "bucket_id": "mybucket", + "project": "myproject", + "location": "global", + "retention_days": 30, + } def test_folder_logging_bucket(plan_runner): - "Test project logging bucket." - _, resources = plan_runner( - FIXTURES_DIR, parent_type="folder", parent="folders/0123456789" - ) - assert len(resources) == 1 + "Test project logging bucket." + _, resources = plan_runner( + FIXTURES_DIR, 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", - "folder": "folders/0123456789", - "location": "global", - "retention_days": 30, - } + resource = resources[0] + assert resource["type"] == "google_logging_folder_bucket_config" + assert resource["values"] == { + "bucket_id": "mybucket", + "folder": "folders/0123456789", + "location": "global", + "retention_days": 30, + } def test_organization_logging_bucket(plan_runner): - "Test project logging bucket." - _, resources = plan_runner( - FIXTURES_DIR, parent_type="organization", parent="organizations/0123456789" - ) - assert len(resources) == 1 + "Test project logging bucket." + _, resources = plan_runner( + FIXTURES_DIR, 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", - "organization": "organizations/0123456789", - "location": "global", - "retention_days": 30, - } + resource = resources[0] + assert resource["type"] == "google_logging_organization_bucket_config" + assert resource["values"] == { + "bucket_id": "mybucket", + "organization": "organizations/0123456789", + "location": "global", + "retention_days": 30, + } def test_billing_account_logging_bucket(plan_runner): - "Test project logging bucket." - _, resources = plan_runner( - FIXTURES_DIR, parent_type="billing_account", parent="0123456789" - ) - assert len(resources) == 1 + "Test project logging bucket." + _, resources = plan_runner( + FIXTURES_DIR, 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", - "billing_account": "0123456789", - "location": "global", - "retention_days": 30, - } + resource = resources[0] + assert resource["type"] == "google_logging_billing_account_bucket_config" + assert resource["values"] == { + "bucket_id": "mybucket", + "billing_account": "0123456789", + "location": "global", + "retention_days": 30, + } diff --git a/tests/modules/naming_convention/__init__.py b/tests/modules/naming_convention/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/naming_convention/__init__.py +++ b/tests/modules/naming_convention/__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. diff --git a/tests/modules/naming_convention/fixture/main.tf b/tests/modules/naming_convention/fixture/main.tf index 051de0088..d0387f95b 100644 --- a/tests/modules/naming_convention/fixture/main.tf +++ b/tests/modules/naming_convention/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. diff --git a/tests/modules/naming_convention/test_plan.py b/tests/modules/naming_convention/test_plan.py index 1a77df0a4..ae19c176c 100644 --- a/tests/modules/naming_convention/test_plan.py +++ b/tests/modules/naming_convention/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. diff --git a/tests/modules/net_address/__init__.py b/tests/modules/net_address/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/net_address/__init__.py +++ b/tests/modules/net_address/__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. diff --git a/tests/modules/net_address/fixture/main.tf b/tests/modules/net_address/fixture/main.tf index 5e62fe136..e716ad1a4 100644 --- a/tests/modules/net_address/fixture/main.tf +++ b/tests/modules/net_address/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. diff --git a/tests/modules/net_address/fixture/outputs.tf b/tests/modules/net_address/fixture/outputs.tf index a96b87ffe..523c5274c 100644 --- a/tests/modules/net_address/fixture/outputs.tf +++ b/tests/modules/net_address/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. diff --git a/tests/modules/net_address/fixture/variables.tf b/tests/modules/net_address/fixture/variables.tf index 32813859b..d82728036 100644 --- a/tests/modules/net_address/fixture/variables.tf +++ b/tests/modules/net_address/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. diff --git a/tests/modules/net_address/test_plan.py b/tests/modules/net_address/test_plan.py index 6c6e413ed..1ecdfd803 100644 --- a/tests/modules/net_address/test_plan.py +++ b/tests/modules/net_address/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. diff --git a/tests/modules/net_ilb/__init__.py b/tests/modules/net_ilb/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/net_ilb/__init__.py +++ b/tests/modules/net_ilb/__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. diff --git a/tests/modules/net_ilb/fixture/main.tf b/tests/modules/net_ilb/fixture/main.tf index 79dc47661..c592421f9 100644 --- a/tests/modules/net_ilb/fixture/main.tf +++ b/tests/modules/net_ilb/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. diff --git a/tests/modules/net_ilb/fixture/variables.tf b/tests/modules/net_ilb/fixture/variables.tf index 9c2951375..b00b49a6c 100644 --- a/tests/modules/net_ilb/fixture/variables.tf +++ b/tests/modules/net_ilb/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. diff --git a/tests/modules/net_ilb/test_plan.py b/tests/modules/net_ilb/test_plan.py index 8114fd71d..d05a93eeb 100644 --- a/tests/modules/net_ilb/test_plan.py +++ b/tests/modules/net_ilb/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. diff --git a/tests/modules/net_interconnect_attachment_direct/__init__.py b/tests/modules/net_interconnect_attachment_direct/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/net_interconnect_attachment_direct/__init__.py +++ b/tests/modules/net_interconnect_attachment_direct/__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. diff --git a/tests/modules/net_interconnect_attachment_direct/fixture/main.tf b/tests/modules/net_interconnect_attachment_direct/fixture/main.tf index 58c3de4d8..c4b1be3e0 100644 --- a/tests/modules/net_interconnect_attachment_direct/fixture/main.tf +++ b/tests/modules/net_interconnect_attachment_direct/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. diff --git a/tests/modules/net_interconnect_attachment_direct/fixture/variables.tf b/tests/modules/net_interconnect_attachment_direct/fixture/variables.tf index 08126b344..55894d4e4 100644 --- a/tests/modules/net_interconnect_attachment_direct/fixture/variables.tf +++ b/tests/modules/net_interconnect_attachment_direct/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. diff --git a/tests/modules/net_interconnect_attachment_direct/test_plan.py b/tests/modules/net_interconnect_attachment_direct/test_plan.py index d7b399df6..f5591ed42 100644 --- a/tests/modules/net_interconnect_attachment_direct/test_plan.py +++ b/tests/modules/net_interconnect_attachment_direct/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. @@ -50,61 +50,61 @@ _VAR_ROUTER_CONFIG = ( def test_router_create_false(plan_runner): - "Test with no router creation." - _, resources = plan_runner(FIXTURES_DIR, router_create='false') - assert len(resources) == 3 + "Test with no router creation." + _, resources = plan_runner(FIXTURES_DIR, router_create='false') + assert len(resources) == 3 def test_vlanattachment(plan_runner): - "Test vlan attachment" - _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP, config=_VAR_CONFIG) - assert len(resources) == 4 - for r in resources: - if r['type'] != 'google_compute_interconnect_attachment': - continue - assert r['values']['interconnect'].endswith( - 'interconnects/mylab-interconnect-1') - assert r['values']['name'] == 'vlan-603' - assert r['values']['vlan_tag8021q'] == 603 - assert r['values']['candidate_subnets'] == ['169.254.63.0/29'] - assert r['values']['bandwidth'] == 'BPS_10G' - assert r['values']['mtu'] == '1440' - assert r['values']['admin_enabled'] == True + "Test vlan attachment" + _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP, config=_VAR_CONFIG) + assert len(resources) == 4 + for r in resources: + if r['type'] != 'google_compute_interconnect_attachment': + continue + assert r['values']['interconnect'].endswith( + 'interconnects/mylab-interconnect-1') + assert r['values']['name'] == 'vlan-603' + assert r['values']['vlan_tag8021q'] == 603 + assert r['values']['candidate_subnets'] == ['169.254.63.0/29'] + assert r['values']['bandwidth'] == 'BPS_10G' + assert r['values']['mtu'] == '1440' + assert r['values']['admin_enabled'] == True - def test_router(plan_runner): - "Test router" - _, resources = plan_runner(FIXTURES_DIR, router_config=_VAR_ROUTER_CONFIG) - assert len(resources) == 4 - for r in resources: - if r['type'] != 'google_compute_router': - continue - assert r['values']['name'] == 'router-vlan-attachment' - assert r['values']['network'] == 'my-vpc' - assert r['values']['bgp'] == [{ - 'advertise_mode': 'CUSTOM', - 'advertised_groups': ['ALL_SUBNETS'], - 'advertised_ip_ranges': [{'description': 'custom', 'range': '199.36.153.8/30'}], - 'asn': 65003, - }] + def test_router(plan_runner): + "Test router" + _, resources = plan_runner(FIXTURES_DIR, router_config=_VAR_ROUTER_CONFIG) + assert len(resources) == 4 + for r in resources: + if r['type'] != 'google_compute_router': + continue + assert r['values']['name'] == 'router-vlan-attachment' + assert r['values']['network'] == 'my-vpc' + assert r['values']['bgp'] == [{ + 'advertise_mode': 'CUSTOM', + 'advertised_groups': ['ALL_SUBNETS'], + 'advertised_ip_ranges': [{'description': 'custom', 'range': '199.36.153.8/30'}], + 'asn': 65003, + }] - def test_router_peer(plan_runner): - "Test router peer" - _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP) - assert len(resources) == 4 - for r in resources: - if r['type'] != 'google_compute_router_peer': - continue - assert r['values']['peer_ip_address'] == '169.254.63.2' - assert r['values']['peer_asn'] == 65418 - assert r['values']['interface'] == 'vlan-603' + def test_router_peer(plan_runner): + "Test router peer" + _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP) + assert len(resources) == 4 + for r in resources: + if r['type'] != 'google_compute_router_peer': + continue + assert r['values']['peer_ip_address'] == '169.254.63.2' + assert r['values']['peer_asn'] == 65418 + assert r['values']['interface'] == 'vlan-603' - def test_router_interface(plan_runner): - "Test router interface" - _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP) - assert len(resources) == 4 - for r in resources: - if r['type'] != 'google_compute_router_interface': - continue - assert r['values']['name'] == 'interface-vlan-603' - assert r['values']['ip_range'] == '169.254.63.1/29' - assert r['values']['interconnect_attachment'] == 'vlan-603' + def test_router_interface(plan_runner): + "Test router interface" + _, resources = plan_runner(FIXTURES_DIR, bgp=_VAR_BGP) + assert len(resources) == 4 + for r in resources: + if r['type'] != 'google_compute_router_interface': + continue + assert r['values']['name'] == 'interface-vlan-603' + assert r['values']['ip_range'] == '169.254.63.1/29' + assert r['values']['interconnect_attachment'] == 'vlan-603' diff --git a/tests/modules/net_vpc/__init__.py b/tests/modules/net_vpc/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/net_vpc/__init__.py +++ b/tests/modules/net_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. diff --git a/tests/modules/net_vpc/fixture/data/factory-subnet.yaml b/tests/modules/net_vpc/fixture/data/factory-subnet.yaml index dd70105a9..03bd1f989 100644 --- a/tests/modules/net_vpc/fixture/data/factory-subnet.yaml +++ b/tests/modules/net_vpc/fixture/data/factory-subnet.yaml @@ -1,23 +1,23 @@ -# 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. # 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. -region: europe-west1 -description: Sample description -ip_cidr_range: 10.128.0.0/24 -private_ip_google_access: false -iam_users: ["foobar@example.com"] -iam_groups: ["lorem@example.com"] +region: europe-west1 +description: Sample description +ip_cidr_range: 10.128.0.0/24 +private_ip_google_access: false +iam_users: ["foobar@example.com"] +iam_groups: ["lorem@example.com"] iam_service_accounts: ["foobar@project-id.iam.gserviceaccount.com"] -secondary_ip_range: - secondary-range-a: 192.168.128.0/24 \ No newline at end of file +secondary_ip_range: + secondary-range-a: 192.168.128.0/24 diff --git a/tests/modules/net_vpc/fixture/main.tf b/tests/modules/net_vpc/fixture/main.tf index f959c3bb3..3c36af9a0 100644 --- a/tests/modules/net_vpc/fixture/main.tf +++ b/tests/modules/net_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. diff --git a/tests/modules/net_vpc/fixture/variables.tf b/tests/modules/net_vpc/fixture/variables.tf index d23497e27..918521b54 100644 --- a/tests/modules/net_vpc/fixture/variables.tf +++ b/tests/modules/net_vpc/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. diff --git a/tests/modules/net_vpc/test_plan.py b/tests/modules/net_vpc/test_plan.py index e04d62a5d..540663ac1 100644 --- a/tests/modules/net_vpc/test_plan.py +++ b/tests/modules/net_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. diff --git a/tests/modules/net_vpc/test_plan_psn.py b/tests/modules/net_vpc/test_plan_psn.py index f80cd1d97..e76ff4ad6 100644 --- a/tests/modules/net_vpc/test_plan_psn.py +++ b/tests/modules/net_vpc/test_plan_psn.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. diff --git a/tests/modules/net_vpc/test_plan_subnets.py b/tests/modules/net_vpc/test_plan_subnets.py index 166487b73..0333fb81d 100644 --- a/tests/modules/net_vpc/test_plan_subnets.py +++ b/tests/modules/net_vpc/test_plan_subnets.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. diff --git a/tests/modules/net_vpc_firewall/__init__.py b/tests/modules/net_vpc_firewall/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/net_vpc_firewall/__init__.py +++ b/tests/modules/net_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. diff --git a/tests/modules/net_vpc_firewall/fixture/config/cidr_template.yaml b/tests/modules/net_vpc_firewall/fixture/config/cidr_template.yaml index b33125de8..b150c3050 100644 --- a/tests/modules/net_vpc_firewall/fixture/config/cidr_template.yaml +++ b/tests/modules/net_vpc_firewall/fixture/config/cidr_template.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. diff --git a/tests/modules/net_vpc_firewall/fixture/config/firewall/load_balancers.yaml b/tests/modules/net_vpc_firewall/fixture/config/firewall/load_balancers.yaml index 558e65b10..508c9efe1 100644 --- a/tests/modules/net_vpc_firewall/fixture/config/firewall/load_balancers.yaml +++ b/tests/modules/net_vpc_firewall/fixture/config/firewall/load_balancers.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. diff --git a/tests/modules/net_vpc_firewall/fixture/main.tf b/tests/modules/net_vpc_firewall/fixture/main.tf index 59201cb23..26237cd69 100644 --- a/tests/modules/net_vpc_firewall/fixture/main.tf +++ b/tests/modules/net_vpc_firewall/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. diff --git a/tests/modules/net_vpc_firewall/fixture/variables.tf b/tests/modules/net_vpc_firewall/fixture/variables.tf index 7f261a6f3..1ff9cff33 100644 --- a/tests/modules/net_vpc_firewall/fixture/variables.tf +++ b/tests/modules/net_vpc_firewall/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. diff --git a/tests/modules/net_vpc_firewall/test_plan.py b/tests/modules/net_vpc_firewall/test_plan.py index 8159a7fcd..b54d23b07 100644 --- a/tests/modules/net_vpc_firewall/test_plan.py +++ b/tests/modules/net_vpc_firewall/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. diff --git a/tests/modules/organization/__init__.py b/tests/modules/organization/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/organization/__init__.py +++ b/tests/modules/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. diff --git a/tests/modules/organization/fixture/data/firewall-cidrs.yaml b/tests/modules/organization/fixture/data/firewall-cidrs.yaml index 61291fcd8..939bec324 100644 --- a/tests/modules/organization/fixture/data/firewall-cidrs.yaml +++ b/tests/modules/organization/fixture/data/firewall-cidrs.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. diff --git a/tests/modules/organization/fixture/data/firewall-rules.yaml b/tests/modules/organization/fixture/data/firewall-rules.yaml index 62d4798b7..1b90983e5 100644 --- a/tests/modules/organization/fixture/data/firewall-rules.yaml +++ b/tests/modules/organization/fixture/data/firewall-rules.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. diff --git a/tests/modules/organization/fixture/main.tf b/tests/modules/organization/fixture/main.tf index e875cae2a..3a57a7900 100644 --- a/tests/modules/organization/fixture/main.tf +++ b/tests/modules/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. diff --git a/tests/modules/organization/fixture/variables.tf b/tests/modules/organization/fixture/variables.tf index bd3d2ce36..6881f15e8 100644 --- a/tests/modules/organization/fixture/variables.tf +++ b/tests/modules/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. diff --git a/tests/modules/organization/test_plan.py b/tests/modules/organization/test_plan.py index 5fd1b0ab4..06f80bbc2 100644 --- a/tests/modules/organization/test_plan.py +++ b/tests/modules/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. diff --git a/tests/modules/organization/test_plan_firewall.py b/tests/modules/organization/test_plan_firewall.py index 1aa8c1cb6..a5ffb032d 100644 --- a/tests/modules/organization/test_plan_firewall.py +++ b/tests/modules/organization/test_plan_firewall.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. diff --git a/tests/modules/organization/test_plan_logging.py b/tests/modules/organization/test_plan_logging.py index fdb592e40..a8a64c994 100644 --- a/tests/modules/organization/test_plan_logging.py +++ b/tests/modules/organization/test_plan_logging.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. diff --git a/tests/modules/project/__init__.py b/tests/modules/project/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/project/__init__.py +++ b/tests/modules/project/__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. diff --git a/tests/modules/project/fixture/main.tf b/tests/modules/project/fixture/main.tf index 73263e0a5..2d2e53da3 100644 --- a/tests/modules/project/fixture/main.tf +++ b/tests/modules/project/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. diff --git a/tests/modules/project/fixture/variables.tf b/tests/modules/project/fixture/variables.tf index 2417fe626..4af03a1ee 100644 --- a/tests/modules/project/fixture/variables.tf +++ b/tests/modules/project/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. diff --git a/tests/modules/project/test_iam.py b/tests/modules/project/test_iam.py index 273dfc938..ecc32fb03 100644 --- a/tests/modules/project/test_iam.py +++ b/tests/modules/project/test_iam.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. diff --git a/tests/modules/project/test_plan.py b/tests/modules/project/test_plan.py index 892d662e2..3a58dec79 100644 --- a/tests/modules/project/test_plan.py +++ b/tests/modules/project/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. diff --git a/tests/modules/project/test_plan_logging.py b/tests/modules/project/test_plan_logging.py index cf5c992eb..cc96230f4 100644 --- a/tests/modules/project/test_plan_logging.py +++ b/tests/modules/project/test_plan_logging.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,8 +22,8 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "fixture") def test_sinks(plan_runner): - "Test folder-level sinks." - logging_sinks = """ { + "Test folder-level sinks." + logging_sinks = """ { warning = { type = "gcs" destination = "mybucket" @@ -61,110 +61,111 @@ def test_sinks(plan_runner): } } """ - _, resources = plan_runner(FIXTURES_DIR, logging_sinks=logging_sinks) - assert len(resources) == 9 + _, resources = plan_runner(FIXTURES_DIR, logging_sinks=logging_sinks) + assert len(resources) == 9 - resource_types = Counter([r["type"] for r in resources]) - assert resource_types == { - "google_logging_project_sink": 4, - "google_bigquery_dataset_iam_member": 1, - "google_project": 1, - "google_project_iam_member": 1, - "google_pubsub_topic_iam_member": 1, - "google_storage_bucket_iam_member": 1, - } + resource_types = Counter([r["type"] for r in resources]) + assert resource_types == { + "google_logging_project_sink": 4, + "google_bigquery_dataset_iam_member": 1, + "google_project": 1, + "google_project_iam_member": 1, + "google_pubsub_topic_iam_member": 1, + "google_storage_bucket_iam_member": 1, + } - sinks = [r for r in resources if r["type"] == "google_logging_project_sink"] - assert sorted([r["index"] for r in sinks]) == [ - "debug", - "info", - "notice", - "warning", - ] - values = [ - ( - r["index"], - r["values"]["filter"], - r["values"]["destination"], - r["values"]["unique_writer_identity"], - ) - for r in sinks - ] - assert sorted(values) == [ - ( - "debug", - "severity=DEBUG", - "logging.googleapis.com/projects/myproject/locations/global/buckets/mybucket", - True, - ), - ( - "info", - "severity=INFO", - "bigquery.googleapis.com/projects/myproject/datasets/mydataset", - False, - ), - ( - "notice", - "severity=NOTICE", - "pubsub.googleapis.com/projects/myproject/topics/mytopic", - False, - ), - ("warning", "severity=WARNING", "storage.googleapis.com/mybucket", False), - ] + sinks = [r for r in resources if r["type"] == "google_logging_project_sink"] + assert sorted([r["index"] for r in sinks]) == [ + "debug", + "info", + "notice", + "warning", + ] + values = [ + ( + r["index"], + r["values"]["filter"], + r["values"]["destination"], + r["values"]["unique_writer_identity"], + ) + for r in sinks + ] + assert sorted(values) == [ + ( + "debug", + "severity=DEBUG", + "logging.googleapis.com/projects/myproject/locations/global/buckets/mybucket", + True, + ), + ( + "info", + "severity=INFO", + "bigquery.googleapis.com/projects/myproject/datasets/mydataset", + False, + ), + ( + "notice", + "severity=NOTICE", + "pubsub.googleapis.com/projects/myproject/topics/mytopic", + False, + ), + ("warning", "severity=WARNING", "storage.googleapis.com/mybucket", False), + ] - bindings = [r for r in resources if "member" in r["type"]] - values = [(r["index"], r["type"], r["values"]["role"]) for r in bindings] - assert sorted(values) == [ - ("debug", "google_project_iam_member", "roles/logging.bucketWriter"), - ("info", "google_bigquery_dataset_iam_member", "roles/bigquery.dataEditor"), - ("notice", "google_pubsub_topic_iam_member", "roles/pubsub.publisher"), - ("warning", "google_storage_bucket_iam_member", "roles/storage.objectCreator"), - ] + bindings = [r for r in resources if "member" in r["type"]] + values = [(r["index"], r["type"], r["values"]["role"]) for r in bindings] + assert sorted(values) == [ + ("debug", "google_project_iam_member", "roles/logging.bucketWriter"), + ("info", "google_bigquery_dataset_iam_member", "roles/bigquery.dataEditor"), + ("notice", "google_pubsub_topic_iam_member", "roles/pubsub.publisher"), + ("warning", "google_storage_bucket_iam_member", "roles/storage.objectCreator"), + ] - exclusions = [(r["index"], r["values"]["exclusions"]) for r in sinks] - assert sorted(exclusions) == [ - ( - "debug", - [ - { - "description": None, - "disabled": False, - "filter": "logName:compute", - "name": "no-compute", - }, - { - "description": None, - "disabled": False, - "filter": "logName:container", - "name": "no-container", - }, - ], - ), - ("info", []), - ("notice", []), - ("warning", []), - ] + exclusions = [(r["index"], r["values"]["exclusions"]) for r in sinks] + assert sorted(exclusions) == [ + ( + "debug", + [ + { + "description": None, + "disabled": False, + "filter": "logName:compute", + "name": "no-compute", + }, + { + "description": None, + "disabled": False, + "filter": "logName:container", + "name": "no-container", + }, + ], + ), + ("info", []), + ("notice", []), + ("warning", []), + ] def test_exclusions(plan_runner): - "Test folder-level logging exclusions." - logging_exclusions = ( - "{" - 'exclusion1 = "resource.type=gce_instance", ' - 'exclusion2 = "severity=NOTICE", ' - "}" - ) - _, resources = plan_runner(FIXTURES_DIR, logging_exclusions=logging_exclusions) - assert len(resources) == 3 - exclusions = [ - r for r in resources if r["type"] == "google_logging_project_exclusion" - ] - assert sorted([r["index"] for r in exclusions]) == [ - "exclusion1", - "exclusion2", - ] - values = [(r["index"], r["values"]["filter"]) for r in exclusions] - assert sorted(values) == [ - ("exclusion1", "resource.type=gce_instance"), - ("exclusion2", "severity=NOTICE"), - ] + "Test folder-level logging exclusions." + logging_exclusions = ( + "{" + 'exclusion1 = "resource.type=gce_instance", ' + 'exclusion2 = "severity=NOTICE", ' + "}" + ) + _, resources = plan_runner( + FIXTURES_DIR, logging_exclusions=logging_exclusions) + assert len(resources) == 3 + exclusions = [ + r for r in resources if r["type"] == "google_logging_project_exclusion" + ] + assert sorted([r["index"] for r in exclusions]) == [ + "exclusion1", + "exclusion2", + ] + values = [(r["index"], r["values"]["filter"]) for r in exclusions] + assert sorted(values) == [ + ("exclusion1", "resource.type=gce_instance"), + ("exclusion2", "severity=NOTICE"), + ] diff --git a/tests/modules/project/test_plan_org_policies.py b/tests/modules/project/test_plan_org_policies.py index 995781ad2..1d125a431 100644 --- a/tests/modules/project/test_plan_org_policies.py +++ b/tests/modules/project/test_plan_org_policies.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. diff --git a/tests/modules/pubsub/__init__.py b/tests/modules/pubsub/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/pubsub/__init__.py +++ b/tests/modules/pubsub/__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. diff --git a/tests/modules/pubsub/fixture/main.tf b/tests/modules/pubsub/fixture/main.tf index 2a1f1aec3..ef0682062 100644 --- a/tests/modules/pubsub/fixture/main.tf +++ b/tests/modules/pubsub/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. diff --git a/tests/modules/pubsub/fixture/variables.tf b/tests/modules/pubsub/fixture/variables.tf index dce4bd9f9..8371c619f 100644 --- a/tests/modules/pubsub/fixture/variables.tf +++ b/tests/modules/pubsub/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. diff --git a/tests/modules/pubsub/test_plan.py b/tests/modules/pubsub/test_plan.py index 3c60130a9..5e382bb70 100644 --- a/tests/modules/pubsub/test_plan.py +++ b/tests/modules/pubsub/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. diff --git a/tests/modules/secret_manager/__init__.py b/tests/modules/secret_manager/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/secret_manager/__init__.py +++ b/tests/modules/secret_manager/__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. diff --git a/tests/modules/secret_manager/fixture/main.tf b/tests/modules/secret_manager/fixture/main.tf index da0cb70d4..294504c76 100644 --- a/tests/modules/secret_manager/fixture/main.tf +++ b/tests/modules/secret_manager/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. diff --git a/tests/modules/secret_manager/fixture/variables.tf b/tests/modules/secret_manager/fixture/variables.tf index d38baef7e..ce6f5559b 100644 --- a/tests/modules/secret_manager/fixture/variables.tf +++ b/tests/modules/secret_manager/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. diff --git a/tests/modules/secret_manager/test_plan.py b/tests/modules/secret_manager/test_plan.py index 47c5426be..197e13260 100644 --- a/tests/modules/secret_manager/test_plan.py +++ b/tests/modules/secret_manager/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. diff --git a/tests/modules/service_directory/__init__.py b/tests/modules/service_directory/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/service_directory/__init__.py +++ b/tests/modules/service_directory/__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. diff --git a/tests/modules/service_directory/fixture/main.tf b/tests/modules/service_directory/fixture/main.tf index 6862ca219..007947789 100644 --- a/tests/modules/service_directory/fixture/main.tf +++ b/tests/modules/service_directory/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. diff --git a/tests/modules/service_directory/fixture/variables.tf b/tests/modules/service_directory/fixture/variables.tf index dce4bd9f9..8371c619f 100644 --- a/tests/modules/service_directory/fixture/variables.tf +++ b/tests/modules/service_directory/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. diff --git a/tests/modules/service_directory/test_plan.py b/tests/modules/service_directory/test_plan.py index dd2397242..1c040ac7a 100644 --- a/tests/modules/service_directory/test_plan.py +++ b/tests/modules/service_directory/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. diff --git a/tests/modules/source_repository/__init__.py b/tests/modules/source_repository/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/source_repository/__init__.py +++ b/tests/modules/source_repository/__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. diff --git a/tests/modules/source_repository/fixture/main.tf b/tests/modules/source_repository/fixture/main.tf index ecceb3f12..00dd7bd34 100644 --- a/tests/modules/source_repository/fixture/main.tf +++ b/tests/modules/source_repository/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. diff --git a/tests/modules/source_repository/fixture/variables.tf b/tests/modules/source_repository/fixture/variables.tf index 612bbf9f6..a1c540a5b 100644 --- a/tests/modules/source_repository/fixture/variables.tf +++ b/tests/modules/source_repository/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. diff --git a/tests/modules/source_repository/test_plan.py b/tests/modules/source_repository/test_plan.py index 0728b5f7f..792b30614 100644 --- a/tests/modules/source_repository/test_plan.py +++ b/tests/modules/source_repository/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. diff --git a/tests/modules/vpc_sc/__init__.py b/tests/modules/vpc_sc/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/modules/vpc_sc/__init__.py +++ b/tests/modules/vpc_sc/__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. diff --git a/tests/modules/vpc_sc/fixture/main.tf b/tests/modules/vpc_sc/fixture/main.tf index f13f5f82a..e7501b762 100644 --- a/tests/modules/vpc_sc/fixture/main.tf +++ b/tests/modules/vpc_sc/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. diff --git a/tests/modules/vpc_sc/test_plan.py b/tests/modules/vpc_sc/test_plan.py index b4b885477..cb5082e6b 100644 --- a/tests/modules/vpc_sc/test_plan.py +++ b/tests/modules/vpc_sc/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. diff --git a/tests/networking/__init__.py b/tests/networking/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/__init__.py +++ b/tests/networking/__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. diff --git a/tests/networking/decentralized_firewall/__init__.py b/tests/networking/decentralized_firewall/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/decentralized_firewall/__init__.py +++ b/tests/networking/decentralized_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. diff --git a/tests/networking/decentralized_firewall/fixture/main.tf b/tests/networking/decentralized_firewall/fixture/main.tf index 9bef2d737..df0aee3f5 100644 --- a/tests/networking/decentralized_firewall/fixture/main.tf +++ b/tests/networking/decentralized_firewall/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. diff --git a/tests/networking/decentralized_firewall/fixture/variables.tf b/tests/networking/decentralized_firewall/fixture/variables.tf index 9646fe1b7..59933f9aa 100644 --- a/tests/networking/decentralized_firewall/fixture/variables.tf +++ b/tests/networking/decentralized_firewall/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. diff --git a/tests/networking/decentralized_firewall/test_plan.py b/tests/networking/decentralized_firewall/test_plan.py index cb1764a9d..d9b5d08c5 100644 --- a/tests/networking/decentralized_firewall/test_plan.py +++ b/tests/networking/decentralized_firewall/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,7 +21,7 @@ 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) == 8 - assert len(resources) == 50 + "Test that plan works and the numbers of resources is as expected." + modules, resources = e2e_plan_runner(FIXTURES_DIR) + assert len(modules) == 8 + assert len(resources) == 50 diff --git a/tests/networking/filtering_proxy/__init__.py b/tests/networking/filtering_proxy/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/filtering_proxy/__init__.py +++ b/tests/networking/filtering_proxy/__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. diff --git a/tests/networking/filtering_proxy/fixture/main.tf b/tests/networking/filtering_proxy/fixture/main.tf index 62451c801..01ed4f709 100644 --- a/tests/networking/filtering_proxy/fixture/main.tf +++ b/tests/networking/filtering_proxy/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. diff --git a/tests/networking/filtering_proxy/fixture/variables.tf b/tests/networking/filtering_proxy/fixture/variables.tf index a01f36741..f4b4c588c 100644 --- a/tests/networking/filtering_proxy/fixture/variables.tf +++ b/tests/networking/filtering_proxy/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. diff --git a/tests/networking/filtering_proxy/test_plan.py b/tests/networking/filtering_proxy/test_plan.py index 9fff1c434..d0d9ac427 100644 --- a/tests/networking/filtering_proxy/test_plan.py +++ b/tests/networking/filtering_proxy/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. diff --git a/tests/networking/hub_and_spoke_peering/__init__.py b/tests/networking/hub_and_spoke_peering/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/hub_and_spoke_peering/__init__.py +++ b/tests/networking/hub_and_spoke_peering/__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. diff --git a/tests/networking/hub_and_spoke_peering/fixture/main.tf b/tests/networking/hub_and_spoke_peering/fixture/main.tf index 899a622e1..aa4e5be02 100644 --- a/tests/networking/hub_and_spoke_peering/fixture/main.tf +++ b/tests/networking/hub_and_spoke_peering/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. diff --git a/tests/networking/hub_and_spoke_peering/fixture/variables.tf b/tests/networking/hub_and_spoke_peering/fixture/variables.tf index da4bff27f..626af0119 100644 --- a/tests/networking/hub_and_spoke_peering/fixture/variables.tf +++ b/tests/networking/hub_and_spoke_peering/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. diff --git a/tests/networking/hub_and_spoke_peering/test_plan.py b/tests/networking/hub_and_spoke_peering/test_plan.py index 22872449d..5778d0553 100644 --- a/tests/networking/hub_and_spoke_peering/test_plan.py +++ b/tests/networking/hub_and_spoke_peering/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. diff --git a/tests/networking/hub_and_spoke_vpn/__init__.py b/tests/networking/hub_and_spoke_vpn/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/hub_and_spoke_vpn/__init__.py +++ b/tests/networking/hub_and_spoke_vpn/__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. diff --git a/tests/networking/hub_and_spoke_vpn/fixture/main.tf b/tests/networking/hub_and_spoke_vpn/fixture/main.tf index 423db6bab..211568f16 100644 --- a/tests/networking/hub_and_spoke_vpn/fixture/main.tf +++ b/tests/networking/hub_and_spoke_vpn/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. diff --git a/tests/networking/hub_and_spoke_vpn/fixture/variables.tf b/tests/networking/hub_and_spoke_vpn/fixture/variables.tf index da4bff27f..626af0119 100644 --- a/tests/networking/hub_and_spoke_vpn/fixture/variables.tf +++ b/tests/networking/hub_and_spoke_vpn/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. diff --git a/tests/networking/hub_and_spoke_vpn/test_plan.py b/tests/networking/hub_and_spoke_vpn/test_plan.py index d27f74180..b261ae08d 100644 --- a/tests/networking/hub_and_spoke_vpn/test_plan.py +++ b/tests/networking/hub_and_spoke_vpn/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. diff --git a/tests/networking/ilb_next_hop/__init__.py b/tests/networking/ilb_next_hop/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/ilb_next_hop/__init__.py +++ b/tests/networking/ilb_next_hop/__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. diff --git a/tests/networking/ilb_next_hop/fixture/main.tf b/tests/networking/ilb_next_hop/fixture/main.tf index f53b1258b..bfa8b2c51 100644 --- a/tests/networking/ilb_next_hop/fixture/main.tf +++ b/tests/networking/ilb_next_hop/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. diff --git a/tests/networking/ilb_next_hop/fixture/variables.tf b/tests/networking/ilb_next_hop/fixture/variables.tf index d071e3088..3d884c252 100644 --- a/tests/networking/ilb_next_hop/fixture/variables.tf +++ b/tests/networking/ilb_next_hop/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. diff --git a/tests/networking/ilb_next_hop/test_plan.py b/tests/networking/ilb_next_hop/test_plan.py index 74be0e564..77c815bd2 100644 --- a/tests/networking/ilb_next_hop/test_plan.py +++ b/tests/networking/ilb_next_hop/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. diff --git a/tests/networking/onprem_google_access_dns/__init__.py b/tests/networking/onprem_google_access_dns/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/onprem_google_access_dns/__init__.py +++ b/tests/networking/onprem_google_access_dns/__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. diff --git a/tests/networking/onprem_google_access_dns/fixture/main.tf b/tests/networking/onprem_google_access_dns/fixture/main.tf index e8a0b8d07..427dd6a9f 100644 --- a/tests/networking/onprem_google_access_dns/fixture/main.tf +++ b/tests/networking/onprem_google_access_dns/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. diff --git a/tests/networking/onprem_google_access_dns/fixture/variables.tf b/tests/networking/onprem_google_access_dns/fixture/variables.tf index da4bff27f..626af0119 100644 --- a/tests/networking/onprem_google_access_dns/fixture/variables.tf +++ b/tests/networking/onprem_google_access_dns/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. diff --git a/tests/networking/onprem_google_access_dns/test_plan.py b/tests/networking/onprem_google_access_dns/test_plan.py index e1b1fb714..25c2ea72a 100644 --- a/tests/networking/onprem_google_access_dns/test_plan.py +++ b/tests/networking/onprem_google_access_dns/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. diff --git a/tests/networking/private_cloud_function_from_onprem/__init__.py b/tests/networking/private_cloud_function_from_onprem/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/private_cloud_function_from_onprem/__init__.py +++ b/tests/networking/private_cloud_function_from_onprem/__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. diff --git a/tests/networking/private_cloud_function_from_onprem/fixture/main.tf b/tests/networking/private_cloud_function_from_onprem/fixture/main.tf index 9c87eebe8..201a4b38d 100644 --- a/tests/networking/private_cloud_function_from_onprem/fixture/main.tf +++ b/tests/networking/private_cloud_function_from_onprem/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. diff --git a/tests/networking/private_cloud_function_from_onprem/test_plan.py b/tests/networking/private_cloud_function_from_onprem/test_plan.py index ca01efe1c..7b9bd1b84 100644 --- a/tests/networking/private_cloud_function_from_onprem/test_plan.py +++ b/tests/networking/private_cloud_function_from_onprem/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. diff --git a/tests/networking/shared_vpc_gke/__init__.py b/tests/networking/shared_vpc_gke/__init__.py index d46dbae5e..6d6d1266c 100644 --- a/tests/networking/shared_vpc_gke/__init__.py +++ b/tests/networking/shared_vpc_gke/__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. diff --git a/tests/networking/shared_vpc_gke/fixture/main.tf b/tests/networking/shared_vpc_gke/fixture/main.tf index 4d35ff3c2..4a19e0c97 100644 --- a/tests/networking/shared_vpc_gke/fixture/main.tf +++ b/tests/networking/shared_vpc_gke/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. diff --git a/tests/networking/shared_vpc_gke/fixture/variables.tf b/tests/networking/shared_vpc_gke/fixture/variables.tf index 9646fe1b7..59933f9aa 100644 --- a/tests/networking/shared_vpc_gke/fixture/variables.tf +++ b/tests/networking/shared_vpc_gke/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. diff --git a/tests/networking/shared_vpc_gke/test_plan.py b/tests/networking/shared_vpc_gke/test_plan.py index d367412ef..fb4244a7c 100644 --- a/tests/networking/shared_vpc_gke/test_plan.py +++ b/tests/networking/shared_vpc_gke/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. diff --git a/third-party-solutions/openshift/prepare.py b/third-party-solutions/openshift/prepare.py index 73fcf70e5..3c513a2ff 100755 --- a/third-party-solutions/openshift/prepare.py +++ b/third-party-solutions/openshift/prepare.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/third-party-solutions/openshift/tf/bootstrap.tf b/third-party-solutions/openshift/tf/bootstrap.tf index e5ae8cf68..346ac9d24 100644 --- a/third-party-solutions/openshift/tf/bootstrap.tf +++ b/third-party-solutions/openshift/tf/bootstrap.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. diff --git a/third-party-solutions/openshift/tf/dns.tf b/third-party-solutions/openshift/tf/dns.tf index 12b818bfe..4e7968f6f 100644 --- a/third-party-solutions/openshift/tf/dns.tf +++ b/third-party-solutions/openshift/tf/dns.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. diff --git a/third-party-solutions/openshift/tf/firewall.tf b/third-party-solutions/openshift/tf/firewall.tf index bfc3060d0..19456fbdd 100644 --- a/third-party-solutions/openshift/tf/firewall.tf +++ b/third-party-solutions/openshift/tf/firewall.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. diff --git a/third-party-solutions/openshift/tf/iam.tf b/third-party-solutions/openshift/tf/iam.tf index 7b11f0fd3..8b8135288 100644 --- a/third-party-solutions/openshift/tf/iam.tf +++ b/third-party-solutions/openshift/tf/iam.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. diff --git a/third-party-solutions/openshift/tf/ilb.tf b/third-party-solutions/openshift/tf/ilb.tf index cfa4c2fe9..df83f1ce1 100644 --- a/third-party-solutions/openshift/tf/ilb.tf +++ b/third-party-solutions/openshift/tf/ilb.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. diff --git a/third-party-solutions/openshift/tf/main.tf b/third-party-solutions/openshift/tf/main.tf index 7bfb88350..d06cb4d28 100644 --- a/third-party-solutions/openshift/tf/main.tf +++ b/third-party-solutions/openshift/tf/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. diff --git a/third-party-solutions/openshift/tf/masters.tf b/third-party-solutions/openshift/tf/masters.tf index 82fbc789c..97209b4ae 100644 --- a/third-party-solutions/openshift/tf/masters.tf +++ b/third-party-solutions/openshift/tf/masters.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. diff --git a/third-party-solutions/openshift/tf/outputs.tf b/third-party-solutions/openshift/tf/outputs.tf index 9ff82b600..e1fcb2972 100644 --- a/third-party-solutions/openshift/tf/outputs.tf +++ b/third-party-solutions/openshift/tf/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. diff --git a/third-party-solutions/openshift/tf/variables.tf b/third-party-solutions/openshift/tf/variables.tf index 53496eb1f..3017403e3 100644 --- a/third-party-solutions/openshift/tf/variables.tf +++ b/third-party-solutions/openshift/tf/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. diff --git a/third-party-solutions/openshift/tf/versions.tf b/third-party-solutions/openshift/tf/versions.tf index 1cc6bf899..290412687 100644 --- a/third-party-solutions/openshift/tf/versions.tf +++ b/third-party-solutions/openshift/tf/versions.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. diff --git a/tools/__init__.py b/tools/__init__.py index c3c623b11..bb545f476 100644 --- a/tools/__init__.py +++ b/tools/__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,4 +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. - diff --git a/tools/check_boilerplate.py b/tools/check_boilerplate.py index 230703b8c..6bbd4cb2c 100755 --- a/tools/check_boilerplate.py +++ b/tools/check_boilerplate.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/tools/check_documentation.py b/tools/check_documentation.py index 144787adc..1968f3b46 100755 --- a/tools/check_documentation.py +++ b/tools/check_documentation.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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. diff --git a/tools/tfutils.py b/tools/tfutils.py index c426c90c6..053e06641 100755 --- a/tools/tfutils.py +++ b/tools/tfutils.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# 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.