feat!: Bootstrap test integration and change in buckets creation #41

mariammartins · 2024-03-11T13:08:46Z

Hello folks,

This PR contains:

The integration test for the bootstrap step, with the following resources:

Buckets
Source Repositories
Cloud Build Triggers
Service Accounts

Add "location", "trigger_location" and "tf_apply_branches" variables in "tf_cloudbuild_workspace" module.
Change in bucket creation:

Add the "bkt" prefix
Creation of a state bucket for each step and each environment (development, production and non-production)

apeabody · 2024-03-11T15:02:38Z

test/integration/bootstrap/bootstrap_test.go

 	"github.com/stretchr/testify/assert"
+	"github.com/terraform-google-modules/terraform-example-foundation/test/integration/testutils"


IMHO the upstream isn't expecting external use, so I'd suggest we include the required function in this repo to minimize any future compatibility issues.

More ideally it would be added to blueprint-test utils

We are planning to move this function (and others we have on foundation) to this repo you mention.
We just didn't do yet to not block the PRs here.
But ASAP we will move all utils to toolkit.

apeabody · 2024-03-11T15:05:06Z

/gcbrun

1-bootstrap/main.tf

apeabody · 2024-03-11T15:16:17Z

From the INT test:

TestBootstrap 2024-03-11T15:13:59Z command.go:100: Running command gcloud with args [source repos get-iam-policy eab-applicationfactory --flatten bindings --filter bindings.role:roles/viewer --format json]
TestBootstrap 2024-03-11T15:14:00Z command.go:185: ERROR: (gcloud.source.repos.get-iam-policy) PERMISSION_DENIED: The caller does not have permission
TestBootstrap 2024-03-11T15:14:00Z command.go:185: - '@type': type.googleapis.com/google.rpc.RequestInfo
TestBootstrap 2024-03-11T15:14:00Z command.go:185:   requestId: 8ff955bda0df4baf8de7be978eb5cb68

test/integration/bootstrap/bootstrap_test.go

Samir-Cit · 2024-03-15T00:13:57Z

/gcbrun

Samir-Cit

Made some comments on things that I think we can improve.

1-bootstrap/variables.tf

test/integration/bootstrap/bootstrap_test.go

test/integration/go.mod

…ation-tests

apeabody

LGTM - A few minor nits to resolve prior to merging

@gtsorbo - Ready for your review

1-bootstrap/backend.tf.example

1-bootstrap/main.tf

test/integration/bootstrap/bootstrap_test.go

mariammartins · 2024-03-21T19:53:47Z

Hi, @gtsorbo
Could you take a look at the PR please? Whether it will be necessary to make any changes before merging. Thanks.

apeabody

LGTM, one nit

@gtsorbo, ready for your review

apeabody · 2024-03-25T15:24:54Z

test/integration/testutils/utils.go

@@ -0,0 +1,31 @@
+// Copyright 2022 Google LLC


Suggested change

// Copyright 2022 Google LLC

// Copyright 2024 Google LLC

Can we fix this on the PR #61 ?
This build is green and ready to merge.

mariammartins and others added 10 commits March 6, 2024 12:33

bootstraps integrantion tests and change in buckets creation

7b12ff0

Merging tfstate buckets

f8cf6af

Lint

ef136a6

changes in buckets integration tests

8021264

fix merge

31d4109

boostrap test

3e7b364

Backend fix

6f714cc

Fix gcs backend

bc1e732

Merge branch 'main' into feat/bootstrap-integration-tests-bucket-change

f78a132

fix merge

f5faacd

mariammartins requested review from gtsorbo and a team as code owners March 11, 2024 13:08

apeabody changed the title ~~feat!: Bootstrat test integration and change in buckets creation~~ feat!: Bootstrap test integration and change in buckets creation Mar 11, 2024

apeabody reviewed Mar 11, 2024

View reviewed changes

1-bootstrap/main.tf Outdated Show resolved Hide resolved

Samir-Cit reviewed Mar 11, 2024

View reviewed changes

test/integration/bootstrap/bootstrap_test.go Outdated Show resolved Hide resolved

mariammartins added 3 commits March 14, 2024 10:13

Merge branch 'main' into feat/bootstrap-integration-tests-bucket-change

d15d7e9

fix bootstrap tests

c2050ad

bootstrap test

c3085bb

Samir-Cit reviewed Mar 15, 2024

View reviewed changes

Samir-Cit and others added 7 commits March 15, 2024 14:20

CR fix.

8dbdc79

Project parameter

d7eb94e

fix merge

0a09f74

fix go.mod

c5cc339

Add backend config on multitenant test

fa393c3

Merge branch 'main' into test/bootstrap-integration-tests

37951c0

Merge branch 'main' into test/bootstrap-integration-tests

3c75817

mariammartins and others added 19 commits March 18, 2024 14:56

fix remote state

334823f

fix conflicts

32145f6

fix go.mod

f0d6aa2

fix DefineTeardown

222fb63

fix DefineApply

423eb05

Remove create and remove backend files

39c5a1a

fix import

7d939d0

fix import

735291e

Test SA constant

aa6828f

CI SA on builds

65bf02d

Test permission

4b2194b

Adding backend on bootstrap

0fe1172

Change bucket selflink to bucket name

42d7b9e

Remove unused import

b9acc29

Backend on remaning tests

1f230a6

Merge branch 'main' into test/bootstrap-integration-tests

8e46c94

Merge branch 'main' into test/bootstrap-integration-tests

6c4635e

Merge remote-tracking branch 'origin/main' into test/bootstrap-integr…

c56245d

…ation-tests

Fix go.sum

8720462

apeabody approved these changes Mar 19, 2024

View reviewed changes

1-bootstrap/backend.tf.example Outdated Show resolved Hide resolved

1-bootstrap/main.tf Outdated Show resolved Hide resolved

test/integration/bootstrap/bootstrap_test.go Outdated Show resolved Hide resolved

Samir-Cit added 2 commits March 20, 2024 07:56

Suggestions

122f0f7

Lint

e22d3bc

apeabody approved these changes Mar 25, 2024

View reviewed changes

gtsorbo approved these changes Mar 26, 2024

View reviewed changes

Merge branch 'main' into test/bootstrap-integration-tests

3faeb70

apeabody merged commit 6f5421e into GoogleCloudPlatform:main Mar 26, 2024
4 checks passed

release-please bot mentioned this pull request Mar 25, 2024

chore(main): release 0.1.0 #7

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: Bootstrap test integration and change in buckets creation #41

feat!: Bootstrap test integration and change in buckets creation #41

mariammartins commented Mar 11, 2024

apeabody Mar 11, 2024 •

edited

Loading

Samir-Cit Mar 15, 2024

apeabody commented Mar 11, 2024

apeabody commented Mar 11, 2024 •

edited

Loading

Samir-Cit commented Mar 15, 2024

Samir-Cit left a comment

apeabody left a comment

mariammartins commented Mar 21, 2024

apeabody left a comment

apeabody Mar 25, 2024 •

edited

Loading

Samir-Cit Mar 26, 2024

apeabody Mar 26, 2024

		"github.com/stretchr/testify/assert"
		"github.com/terraform-google-modules/terraform-example-foundation/test/integration/testutils"

feat!: Bootstrap test integration and change in buckets creation #41

feat!: Bootstrap test integration and change in buckets creation #41

Conversation

mariammartins commented Mar 11, 2024

apeabody Mar 11, 2024 • edited Loading

Choose a reason for hiding this comment

Samir-Cit Mar 15, 2024

Choose a reason for hiding this comment

apeabody commented Mar 11, 2024

apeabody commented Mar 11, 2024 • edited Loading

Samir-Cit commented Mar 15, 2024

Samir-Cit left a comment

Choose a reason for hiding this comment

apeabody left a comment

Choose a reason for hiding this comment

mariammartins commented Mar 21, 2024

apeabody left a comment

Choose a reason for hiding this comment

apeabody Mar 25, 2024 • edited Loading

Choose a reason for hiding this comment

Samir-Cit Mar 26, 2024

Choose a reason for hiding this comment

apeabody Mar 26, 2024

Choose a reason for hiding this comment

apeabody Mar 11, 2024 •

edited

Loading

apeabody commented Mar 11, 2024 •

edited

Loading

apeabody Mar 25, 2024 •

edited

Loading