From 5a94f260c13202d9a902a11732f56c88a5e51aeb Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Sat, 15 May 2021 01:05:07 -0500 Subject: [PATCH] chore: update template for 0.13 (#49) --- .../README.md | 4 ++-- .../examples/simple_example/main.tf | 4 ++-- .../examples/simple_example/outputs.tf | 2 +- .../examples/simple_example/variables.tf | 2 +- .../examples/simple_example/versions.tf | 4 ++-- .../kitchen.yml | 2 +- .../main.tf | 2 +- .../outputs.tf | 2 +- .../test/fixtures/simple_example/main.tf | 2 +- .../test/fixtures/simple_example/outputs.tf | 2 +- .../test/fixtures/simple_example/variables.tf | 2 +- .../test/fixtures/simple_example/versions.tf | 4 ++-- .../integration/simple_example/controls/gcloud.rb | 2 +- .../integration/simple_example/controls/gcp.rb | 2 +- .../integration/simple_example/controls/gsutil.rb | 2 +- .../variables.tf | 2 +- .../versions.tf | 14 ++++++++++++-- 17 files changed, 32 insertions(+), 22 deletions(-) diff --git a/terraform-google-{{cookiecutter.module_name}}/README.md b/terraform-google-{{cookiecutter.module_name}}/README.md index 01b3f8d..4831aba 100644 --- a/terraform-google-{{cookiecutter.module_name}}/README.md +++ b/terraform-google-{{cookiecutter.module_name}}/README.md @@ -47,8 +47,8 @@ These sections describe requirements for using this module. The following dependencies must be available: -- [Terraform][terraform] v0.12 -- [Terraform Provider for GCP][terraform-provider-gcp] plugin v2.0 +- [Terraform][terraform] v0.13 +- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0 ### Service Account diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf index 244947a..b274d3b 100644 --- a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf +++ b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. @@ -15,7 +15,7 @@ */ provider "google" { - version = "~> 2.0" + version = "~> 3.0" } module "{{ cookiecutter.module_name|replace('-', '_') }}" { diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf index 88c2fbe..5346cb7 100644 --- a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf +++ b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf index eeadd9d..5047731 100644 --- a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf +++ b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf index 832ec1d..c001c4e 100644 --- a/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf +++ b/terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" } diff --git a/terraform-google-{{cookiecutter.module_name}}/kitchen.yml b/terraform-google-{{cookiecutter.module_name}}/kitchen.yml index f3c9c35..a31bc2c 100644 --- a/terraform-google-{{cookiecutter.module_name}}/kitchen.yml +++ b/terraform-google-{{cookiecutter.module_name}}/kitchen.yml @@ -1,4 +1,4 @@ -# Copyright 2018 Google LLC +# 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/main.tf b/terraform-google-{{cookiecutter.module_name}}/main.tf index bcf1cd9..26eb7c0 100644 --- a/terraform-google-{{cookiecutter.module_name}}/main.tf +++ b/terraform-google-{{cookiecutter.module_name}}/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/outputs.tf index fdad215..70fcb9b 100644 --- a/terraform-google-{{cookiecutter.module_name}}/outputs.tf +++ b/terraform-google-{{cookiecutter.module_name}}/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf index 7b799c2..987b9b1 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf +++ b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf index 2e41354..b6a04e1 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf +++ b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf index c1a5c77..f140b47 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf +++ b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf index 832ec1d..c001c4e 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf +++ b/terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" } diff --git a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb index d2a2609..eadaa18 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb +++ b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcloud.rb @@ -1,4 +1,4 @@ -# Copyright 2018 Google LLC +# 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb index 3b5382b..e08d1e9 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb +++ b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gcp.rb @@ -1,4 +1,4 @@ -# Copyright 2018 Google LLC +# 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb index 692309f..25e90a4 100644 --- a/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb +++ b/terraform-google-{{cookiecutter.module_name}}/test/integration/simple_example/controls/gsutil.rb @@ -1,4 +1,4 @@ -# Copyright 2018 Google LLC +# 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/variables.tf b/terraform-google-{{cookiecutter.module_name}}/variables.tf index 65ec922..5341c4e 100644 --- a/terraform-google-{{cookiecutter.module_name}}/variables.tf +++ b/terraform-google-{{cookiecutter.module_name}}/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. diff --git a/terraform-google-{{cookiecutter.module_name}}/versions.tf b/terraform-google-{{cookiecutter.module_name}}/versions.tf index 1a9363a..0f99d4c 100644 --- a/terraform-google-{{cookiecutter.module_name}}/versions.tf +++ b/terraform-google-{{cookiecutter.module_name}}/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2018 Google LLC + * 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. @@ -15,5 +15,15 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 3.53" + } + } + + provider_meta "google" { + module_name = "blueprints/terraform/{{ cookiecutter.module_name }}/v0.0.1" + } }