Skip to content
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

chore: updated Makefile and mmv builder #20827

Conversation

modular-magician
Copy link
Collaborator

  • Chain the two go run commands in the mmv1 make target with && (edit: did a narrower fix here than in the initial PR)
    With this, the error in the linked ticket will now exit on provider build failure instead of continuing to the next step and exiting 0:
F1112 22:07:54.227629   53015 examples.go:300] template: artifact_registry_repository.go.tmpl:12: function "project" not defined
2024/11/12 22:07:54 products/dialogflowcx not specified, skipping generation
2024/11/12 22:07:54 products/iambeta not specified, skipping generation
2024/11/12 22:07:54 products/securitycenter not specified, skipping generation
2024/11/12 22:07:54 products/privateca not specified, skipping generation
exit status 1
make[1]: *** [mmv1] Error 1
make: *** [provider] Error 2
% echo $?
2
  • Added the product being built in the case where forceProvider is set to an empty string, and changed prefix to "Building" vs "Using"

This avoids the extra space and missing provider type that show up when building the default (Terraform) provider:

2024/11/12 20:14:47 Using ga version
2024/11/12 20:14:47 Using  provider

in favor of:

2024/11/12 22:23:30 Building ga version
2024/11/12 22:23:30 Building default (terraform) provider
  • Also fixed missing space here:
2024/11/12 22:40:26 Unexpected output folder (--version) detectedwhen deciding to add HashiCorp copyright headers.

Fixes #20317

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.


Derived from GoogleCloudPlatform/magic-modules#12314

[upstream:4bee7caa8b6a7d0842a72b10121f55b1e2e32225]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician modular-magician requested a review from a team as a code owner January 6, 2025 21:40
@modular-magician modular-magician merged commit d717904 into hashicorp:main Jan 6, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provider make target not exiting immediately or exiting 0 on fatal build error
1 participant