Generate AWS Makefile via this tool #551
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t to run the AWS upstream tools Add logic to template to allow for AWS specific Makefile needs
iwahbe
reviewed
Sep 6, 2023
Comment on lines
141
to
167
| #{{- if eq .Config.team "ecosystem" }}# | ||
|
|
||
| #{{- if .Config.XrunUpstreamTools }}# | ||
|
|
||
| upstream:: | ||
| # Use upstream.sh script to apply patches | ||
| ifneq ("$(wildcard upstream)","") | ||
| @$(SHELL) ./scripts/upstream.sh "$@" apply | ||
| endif | ||
|
|
||
| upstream:: | ||
|
|
||
| # Ensure tool is installed | ||
| cd upstream-tools && yarn install --frozen-lockfile | ||
| # Apply all automated changes | ||
| cd upstream-tools && yarn --silent run apply | ||
| # Check for any pending replacements | ||
| cd upstream-tools && yarn --silent run check | ||
|
|
||
| #{{- else }}# | ||
|
|
||
| upstream: | ||
| ifneq ("$(wildcard upstream)","") | ||
| @$(SHELL) ./scripts/upstream.sh "$@" apply | ||
| endif | ||
|
|
||
| #{{- end }}# |
There was a problem hiding this comment.
If we're going to bake the upstream-tools calls directly into the main template, we may as well just attach them to the upstream: target. Multiple targets :: are only needed for more generic solutions, like pulumi/pulumi-aws#2784 (comment).
Suggested change
| #{{- if eq .Config.team "ecosystem" }}# | |
| #{{- if .Config.XrunUpstreamTools }}# | |
| upstream:: | |
| # Use upstream.sh script to apply patches | |
| ifneq ("$(wildcard upstream)","") | |
| @$(SHELL) ./scripts/upstream.sh "$@" apply | |
| endif | |
| upstream:: | |
| # Ensure tool is installed | |
| cd upstream-tools && yarn install --frozen-lockfile | |
| # Apply all automated changes | |
| cd upstream-tools && yarn --silent run apply | |
| # Check for any pending replacements | |
| cd upstream-tools && yarn --silent run check | |
| #{{- else }}# | |
| upstream: | |
| ifneq ("$(wildcard upstream)","") | |
| @$(SHELL) ./scripts/upstream.sh "$@" apply | |
| endif | |
| #{{- end }}# | |
| #{{- if eq .Config.team "ecosystem" }}# | |
| upstream: | |
| # Use upstream.sh script to apply patches | |
| ifneq ("$(wildcard upstream)","") | |
| @$(SHELL) ./scripts/upstream.sh "$@" apply | |
| endif | |
| #{{- if .Config.XrunUpstreamTools }}# | |
| # Ensure tool is installed | |
| cd upstream-tools && yarn install --frozen-lockfile | |
| # Apply all automated changes | |
| cd upstream-tools && yarn --silent run apply | |
| # Check for any pending replacements | |
| cd upstream-tools && yarn --silent run check | |
| #{{- end }}# | |
| #{{- end }}# |
Comment on lines
118
to
134
| #{{- if .Config.extraTests }}# | ||
| test: | ||
| cd provider/shim && go test -v -coverprofile="coverage.txt" . | ||
| cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h | ||
| test.upgrade:: | ||
| cd examples && go test -v -tags=all -run TestProviderUpgrade -timeout 2h | ||
|
|
||
| test.upgrade.quick:: | ||
| cd examples && go test -v -tags=all -run TestProviderUpgrade/Quick | ||
|
|
||
| test.upgrade.record:: | ||
| cd examples && PULUMI_ACCEPT=true go test -v -tags all -run TestProviderUpgrade -timeout 2h | ||
| #{{- else }}# | ||
|
|
||
| test: | ||
| cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h | ||
| #{{- end }}# |
There was a problem hiding this comment.
Can we avoid repeating the test target?
Suggested change
| #{{- if .Config.extraTests }}# | |
| test: | |
| cd provider/shim && go test -v -coverprofile="coverage.txt" . | |
| cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h | |
| test.upgrade:: | |
| cd examples && go test -v -tags=all -run TestProviderUpgrade -timeout 2h | |
| test.upgrade.quick:: | |
| cd examples && go test -v -tags=all -run TestProviderUpgrade/Quick | |
| test.upgrade.record:: | |
| cd examples && PULUMI_ACCEPT=true go test -v -tags all -run TestProviderUpgrade -timeout 2h | |
| #{{- else }}# | |
| test: | |
| cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h | |
| #{{- end }}# | |
| test: | |
| #{{- if .Config.extraTests }}# | |
| # Run the shim test before the examples test, since we assume it is faster. | |
| cd provider/shim && go test -v -coverprofile="coverage.txt" . | |
| #{{- end }}# | |
| cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h | |
| #{{- if .Config.extraTests }}# | |
| test.upgrade:: | |
| cd examples && go test -v -tags=all -run TestProviderUpgrade -timeout 2h | |
| test.upgrade.quick:: | |
| cd examples && go test -v -tags=all -run TestProviderUpgrade/Quick | |
| test.upgrade.record:: | |
| cd examples && PULUMI_ACCEPT=true go test -v -tags all -run TestProviderUpgrade -timeout 2h | |
| #{{- end }}# |
iwahbe
approved these changes
Sep 6, 2023
t0yv0
approved these changes
Sep 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TO BE MERGED AFTER pulumi/pulumi-aws#2784.
Part of pulumi/pulumi-aws#2756
See corresponding PR: pulumi/pulumi-aws#2784