Skip to content

Commit 11523d3

Browse files
chore: update tests to use 1.0 image and update compat note (#203)
1 parent bfacb0b commit 11523d3

File tree

9 files changed

+43
-12
lines changed

9 files changed

+43
-12
lines changed

.github/release-please.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
releaseType: terraform-module
216
handleGHRelease: true

.github/workflows/stale.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
name: "Close stale issues"
216
on:
317
schedule:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ __pycache__/
1919
**/.kitchen
2020
**/kitchen.local.yml
2121
**/Gemfile.lock
22+
23+
# tf lock file
24+
.terraform.lock.hcl

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ This is a collection of opinionated submodules that can be used as building bloc
77
* [Unmanaged instance group](modules/umig)
88

99
## Compatibility
10-
This module is meant for use with Terraform 0.13. If you haven't
10+
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.
11+
If you haven't
1112
[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
1213
0.12.x-compatible version of this module, the last released version
1314
intended for Terraform 0.12.x is [v5.1.0](https://registry.terraform.io/modules/terraform-google-modules/-vm/google/v5.1.0).

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,4 @@ tags:
246246
- 'integration'
247247
substitutions:
248248
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
249-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
249+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'

modules/instance_template/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ resource "google_compute_instance_template" "tpl" {
136136
# scheduling must have automatic_restart be false when preemptible is true.
137137
scheduling {
138138
preemptible = var.preemptible
139-
automatic_restart = ! var.preemptible
139+
automatic_restart = !var.preemptible
140140
on_host_maintenance = local.on_host_maintenance
141141
}
142142

test/setup/main.tf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ provider "random" {
3232

3333
module "project_ci_vm" {
3434
source = "terraform-google-modules/project-factory/google"
35-
version = "~> 9.0"
35+
version = "~> 11.0"
3636

37-
name = "ci-vm-module"
38-
random_project_id = true
39-
org_id = var.org_id
40-
folder_id = var.folder_id
41-
billing_account = var.billing_account
42-
skip_gcloud_download = true
37+
name = "ci-vm-module"
38+
random_project_id = true
39+
org_id = var.org_id
40+
folder_id = var.folder_id
41+
billing_account = var.billing_account
4342

4443
activate_apis = [
4544
"cloudresourcemanager.googleapis.com",

0 commit comments

Comments
 (0)