Skip to content

Commit a482a8a

Browse files
authored
chore: update tests to CFT 1.5, allow TPG 4+, and tests project-factory ~> 13.0 (#55)
* chore: update to CFT 1.5 * Update lint.cloudbuild.yaml * Update Makefile * Update main.tf * Update versions.tf * Update versions.tf * Update versions.tf * Delete versions.tf * Delete versions.tf * Delete versions.tf * Create versions.tf * Update versions.tf * Update versions.tf * Delete versions.tf * Delete versions.tf * Update kitchen.yml
1 parent 5773c77 commit a482a8a

File tree

11 files changed

+11
-103
lines changed

11 files changed

+11
-103
lines changed

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 := 1.0
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.5
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ tags:
106106
- 'integration'
107107
substitutions:
108108
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
109-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
109+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'

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: '1.0'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'

examples/airflow_connection/versions.tf

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/airflow_pool/versions.tf

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/simple_composer_env_v1/versions.tf

Lines changed: 0 additions & 29 deletions
This file was deleted.

examples/simple_composer_env_v2/versions.tf

Lines changed: 0 additions & 29 deletions
This file was deleted.

kitchen.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# limitations under the License.
1414

1515
---
16+
driver:
17+
name: terraform
18+
verify_version: false
19+
1620
provisioner:
1721
name: terraform
1822

modules/airflow_storage/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020

2121
google = {
2222
source = "hashicorp/google"
23-
version = "~> 3.53"
23+
version = ">= 3.53, < 5.0"
2424
}
2525
}
2626

test/setup/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
module "project" {
1818
source = "terraform-google-modules/project-factory/google"
19-
version = "~> 10.0"
19+
version = "~> 13.0"
2020

2121
name = "ci-composer"
2222
random_project_id = "true"

0 commit comments

Comments
 (0)