Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions .kitchen.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ docker_test_integration:
-e SERVICE_ACCOUNT_JSON \
-v "$(CURDIR)":/workspace \
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
/usr/local/bin/test_integration.sh
cft test run all

# Execute lint tests within the docker container
.PHONY: docker_test_lint
Expand Down
31 changes: 17 additions & 14 deletions build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,14 @@ steps:
- 'TF_VAR_org_id=$_ORG_ID'
- 'TF_VAR_folder_id=$_FOLDER_ID'
- 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
- id: create
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
- id: create-all
- id: init-all
waitFor:
- prepare
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run all --stage init --verbose']
- id: converge
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge']
- id: verify
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify']
- id: destroy
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy']
- id: apply simple-sa
waitFor:
- create-all
- init-all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleSA --stage apply --verbose']
- id: verify simple-sa
Expand All @@ -56,6 +44,21 @@ steps:
- verify simple-sa
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleSA --stage teardown --verbose']
- id: single-service-account
waitFor:
- init-all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSingleServiceAccount --verbose']
- id: multiple-service-accounts
waitFor:
- init-all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestMultipleServiceAccounts --verbose']
- id: key-distributor
waitFor:
- init-all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestKeyDistributor --verbose']
tags:
- 'ci'
- 'integration'
Expand Down
1 change: 1 addition & 0 deletions examples/multiple_service_accounts/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ output "iam_emails" {
output "keys" {
description = "The service account keys."
value = module.service_accounts.keys
sensitive = true
}

21 changes: 0 additions & 21 deletions test/fixtures/multiple_service_accounts/main.tf

This file was deleted.

42 changes: 0 additions & 42 deletions test/fixtures/multiple_service_accounts/outputs.tf

This file was deleted.

21 changes: 0 additions & 21 deletions test/fixtures/multiple_service_accounts/variables.tf

This file was deleted.

19 changes: 0 additions & 19 deletions test/fixtures/multiple_service_accounts/versions.tf

This file was deleted.

21 changes: 0 additions & 21 deletions test/fixtures/single_service_account/main.tf

This file was deleted.

31 changes: 0 additions & 31 deletions test/fixtures/single_service_account/outputs.tf

This file was deleted.

21 changes: 0 additions & 21 deletions test/fixtures/single_service_account/variables.tf

This file was deleted.

19 changes: 0 additions & 19 deletions test/fixtures/single_service_account/versions.tf

This file was deleted.

2 changes: 1 addition & 1 deletion test/integration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ toolchain go1.24.7
require (
github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.9
github.com/stretchr/testify v1.11.1
github.com/tidwall/gjson v1.18.0
)

require (
Expand Down Expand Up @@ -42,7 +43,6 @@ require (
github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
Expand Down
27 changes: 0 additions & 27 deletions test/integration/key_distributor/controls/gcp.rb

This file was deleted.

19 changes: 0 additions & 19 deletions test/integration/key_distributor/inspec.yml

This file was deleted.

Loading