-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add make command to upgrade DCL, use it to see if it works. #5201
Conversation
Might crash in generation - not sure how prickly go is about tabs and spaces and formatting in there. Can't seem to get a tab in sed in the makefile, not sure why, think it's using a different sed than my system sed. |
Works On My Machine ™️ :) |
@@ -52,5 +52,16 @@ serialize: | |||
go run . --path "api" --overrides "overrides" --mode "serialization" > temp.serial;\ | |||
mv -f temp.serial serialization.go;\ | |||
|
|||
upgrade-dcl: | |||
cd tpgtools && \ | |||
go mod edit -require=github.com/GoogleCloudPlatform/declarative-resource-client-library@latest &&\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this do vs running go get github.com/GoogleCloudPlatform/declarative-resource-client-library@latest
? Will it just avoid getting the new version on the user's machine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, that's all!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, also it doesn't depend on what version of go you're running or your setting of GO111MODULES (or whatever that env var is called)
MOD_LINE=$$(grep declarative-resource-client-library go.mod);\ | ||
SUM_LINE=$$(grep declarative-resource-client-library go.sum);\ | ||
cd ../mmv1/third_party/terraform && \ | ||
sed -i "/declarative-resource-client-library/c$$(printf '\t')$$MOD_LINE" go.mod.erb; echo -e "$$SUM_LINE" >> go.sum |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Echoing to go.sum
is allowed because you can have multiple versions of a library in there, right? So running go mod tidy
on a downstream and copypasting up will clean those up when there's a lot of them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes!
I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeForwardingRule_update You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=205772 |
Great, this works! |
Minor tpgtools usability enhancement to make it easier to upgrade to the newest version of the DCL. Inspired by kcctools' similar version of the same thing.
If this PR is for Terraform, I acknowledge that I have:
make test
andmake lint
to ensure it passes unit and linter tests.Release Note Template for Downstream PRs (will be copied)