From a4614d12203ea2870a4afbd9e0b468e75ea64915 Mon Sep 17 00:00:00 2001
From: cloud-foundation-bot
 <60107303+cloud-foundation-bot@users.noreply.github.com>
Date: Sun, 14 Nov 2021 20:28:40 -0600
Subject: [PATCH] chore: update tests to use 1.0 image and update compat note
 (#49)

---
 .github/release-please.yml                 | 14 ++++++++++++++
 .github/workflows/stale.yml                | 14 ++++++++++++++
 .gitignore                                 |  3 +++
 Makefile                                   |  2 +-
 README.md                                  |  3 ++-
 build/int.cloudbuild.yaml                  |  2 +-
 build/lint.cloudbuild.yaml                 |  2 +-
 test/fixtures/simple_example/outputs.tf    |  2 +-
 test/integration/simple_example/inspec.yml | 14 ++++++++++++++
 9 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 6366b9c..884357c 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,2 +1,16 @@
+# Copyright 2021 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.
+
 releaseType: terraform-module
 handleGHRelease: true
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index fcf18fe..de1fd4a 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,3 +1,17 @@
+# Copyright 2021 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.
+
 name: "Close stale issues"
 on:
   schedule:
diff --git a/.gitignore b/.gitignore
index 5df0df1..b8904dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ terraform.tfstate*
 *.pyc
 .kitchen
 credentials.json
+
+# tf lock file
+.terraform.lock.hcl
diff --git a/Makefile b/Makefile
index 6d34e48..5b71d3c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/README.md b/README.md
index 01d6b42..39d9b44 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@ The resources/services/activations/deletions that this module will create/trigge
 - Create IAM role bindings for owners, encrypters, decrypters
 
 ## Compatibility
-This module is meant for use with Terraform 0.13. If you haven't
+This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+. If you find incompatibilities using Terraform >=0.13, please open an issue.
+ If you haven't
 [upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
 0.12.x-compatible version of this module, the last released version
 intended for Terraform 0.12.x is [v1.2.0](https://registry.terraform.io/modules/terraform-google-modules/-kms/google/v1.2.0).
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index c3ceaac..218129e 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -37,4 +37,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index 7c1aecb..34d006d 100644
--- a/build/lint.cloudbuild.yaml
+++ b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
diff --git a/test/fixtures/simple_example/outputs.tf b/test/fixtures/simple_example/outputs.tf
index 6d573fb..b267a6e 100644
--- a/test/fixtures/simple_example/outputs.tf
+++ b/test/fixtures/simple_example/outputs.tf
@@ -31,5 +31,5 @@ output "location" {
 
 output "project_id" {
   description = "The ID of the project in which resources are provisioned."
-  value       = "${var.project_id}"
+  value       = var.project_id
 }
diff --git a/test/integration/simple_example/inspec.yml b/test/integration/simple_example/inspec.yml
index a3be216..bad5a01 100644
--- a/test/integration/simple_example/inspec.yml
+++ b/test/integration/simple_example/inspec.yml
@@ -1,3 +1,17 @@
+# Copyright 2021 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.
+
 name: simple_example
 depends:
   - name: inspec-gcp