tgc build on tpg-beta by iyabchen · Pull Request #7797 · GoogleCloudPlatform/magic-modules

iyabchen · 2023-04-21T14:29:28Z

terraform-google-conversion switch to tpg beta

other change is also required in tgc: tgc prep for beta terraform-google-conversion#1093
this might requires updating the generate downstream image.

If this PR is for Terraform, I acknowledge that I have:

Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

melinath

could you pull the formatting changes into a separate PR?

melinath · 2023-06-15T22:43:56Z

allowed ci changes /gcbrun

melinath

I think you might need to make additional changes as described in b/275715832

melinath

could you split the downstream-builder changes into a separate PR & also make changes to https://github.com/GoogleCloudPlatform/magic-modules/blob/main/.ci/gcb-push-downstream.yml to use beta for TGC

melinath · 2023-06-28T16:37:03Z

/gcbrun

iyabchen · 2023-06-29T15:35:37Z

tgc-base fails because HEAD~ is still ga, not beta. Not sure how to make this work? @melinath

melinath · 2023-07-12T23:18:50Z

testing this will be tricky since it modifies so many files. We'll need to test thoroughly to make sure everything works in the downstream code. I'm seeing some errors when I generate based on this (and switch over to beta) - is everything working fine for you?

modular-magician · 2023-07-14T18:43:08Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

TF Conversion: Diff ( 209 files changed, 19437 insertions(+), 284 deletions(-))

modular-magician · 2023-07-14T20:25:38Z

Tests analytics

Total tests: 2854
Passed tests 2555
Skipped tests: 297
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

modular-magician · 2023-07-14T20:28:44Z

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

melinath

This looks good - my one concern is that it will break older PRs, since the generation will happen with GA set as the version (but downstream uses beta). However, the code that's used for the generation will all be based on the head of the main branch.

In terms of how to work around this - my initial thought is that we could alter the downstream image to always use beta and then deal with any fallout in the ten minutes it takes the image to rebuild manually.

What do you think?

melinath · 2023-07-14T20:57:11Z

 	cd mmv1;\
 		bundle;\
-		bundle exec compiler -e terraform -f validator -o $(OUTPUT_PATH) $(mmv1_compile);\
+		bundle exec compiler -e terraform -f validator -v $(VERSION) -o $(OUTPUT_PATH) $(mmv1_compile);\


It turns out that adding this means that users have to provide a VERSION when running the command (which wasn't the case previously, and which isn't used) so we should probably revert this change. Sorry!

Suggested change

bundle exec compiler -e terraform -f validator -v $(VERSION) -o $(OUTPUT_PATH) $(mmv1_compile);\

bundle exec compiler -e terraform -f validator -o $(OUTPUT_PATH) $(mmv1_compile);\

melinath · 2023-07-20T17:32:00Z

@iyabchen could you resolve the conflicts

* tgc build on tpg-beta * gcb-push-downstream.yml change ga to beta for tgc * fix forward rule test file * Address comment * compute forwarding rule test file set to beta * switch tgc-base to use beta * tgc make always use beta * generate downstream always use beta for tgc --------- Co-authored-by: Stephen Lewis (Burrows) <stephenrlewis@google.com>

iyabchen marked this pull request as ready for review April 24, 2023 20:35

iyabchen requested a review from melinath April 24, 2023 20:35

melinath reviewed Apr 28, 2023

View reviewed changes

iyabchen force-pushed the tgc-beta-tpg branch from b36288a to 242e307 Compare June 12, 2023 22:08

iyabchen requested a review from melinath June 12, 2023 22:09

melinath requested changes Jun 16, 2023

View reviewed changes

iyabchen force-pushed the tgc-beta-tpg branch from 242e307 to 094cc23 Compare June 23, 2023 03:47

modular-magician requested a review from melinath June 23, 2023 03:48

melinath requested changes Jun 23, 2023

View reviewed changes

iyabchen force-pushed the tgc-beta-tpg branch from 094cc23 to c245d68 Compare June 23, 2023 19:22

modular-magician requested a review from melinath June 23, 2023 19:23

melinath reviewed Jul 14, 2023

View reviewed changes

Comment thread .ci/gcb-generate-diffs-new.yml

iyabchen added 5 commits July 14, 2023 14:11

tgc build on tpg-beta

8e5acef

gcb-push-downstream.yml change ga to beta for tgc

a720891

fix forward rule test file

2ffffb9

Address comment

14b247b

compute forwarding rule test file set to beta

87f2260

iyabchen force-pushed the tgc-beta-tpg branch from ef1edde to 87f2260 Compare July 14, 2023 18:26

modular-magician requested a review from melinath July 14, 2023 18:26

melinath requested changes Jul 14, 2023

View reviewed changes

switch tgc-base to use beta

ccf6690

modular-magician requested a review from melinath July 14, 2023 22:01

tgc make always use beta

1d49149

generate downstream always use beta for tgc

db751bd

Merge branch 'main' into tgc-beta-tpg

2b11562

melinath approved these changes Jul 20, 2023

View reviewed changes

melinath merged commit 9faed08 into GoogleCloudPlatform:main Jul 20, 2023

melinath mentioned this pull request Jul 20, 2023

test tgc build pipeline #8408

Closed

modular-magician mentioned this pull request Jul 20, 2023

tgc build on tpg-beta GoogleCloudPlatform/terraform-google-conversion#1183

Merged

5 tasks

shuyama1 mentioned this pull request Aug 3, 2023

Sync 5.0.0 with main Part 2 #8551

Merged

5 tasks

modular-magician mentioned this pull request Aug 3, 2023

Sync 5.0.0 with main Part 2 GoogleCloudPlatform/terraform-google-conversion#1247

Merged

5 tasks

	bundle exec compiler -e terraform -f validator -v $(VERSION) -o $(OUTPUT_PATH) $(mmv1_compile);\
	bundle exec compiler -e terraform -f validator -o $(OUTPUT_PATH) $(mmv1_compile);\

Uh oh!

Conversation

iyabchen commented Apr 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melinath left a comment

Choose a reason for hiding this comment

Uh oh!

melinath commented Jun 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melinath left a comment

Choose a reason for hiding this comment

Uh oh!

melinath left a comment

Choose a reason for hiding this comment

Uh oh!

melinath commented Jun 28, 2023

Uh oh!

iyabchen commented Jun 29, 2023

Uh oh!

melinath commented Jul 12, 2023

Uh oh!

Uh oh!

modular-magician commented Jul 14, 2023

Diff report

Uh oh!

modular-magician commented Jul 14, 2023

Tests analytics

Action taken

Uh oh!

modular-magician commented Jul 14, 2023

Uh oh!

melinath left a comment

Choose a reason for hiding this comment

Uh oh!

melinath Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

melinath commented Jul 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

iyabchen commented Apr 21, 2023 •

edited

Loading

melinath commented Jun 15, 2023 •

edited

Loading