Repository navigation
feat: release new version #349
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
Changes from all commits
61c9d41
1ba15ea
b5be1fb
b776407
e9b7599
f10243c
8afd8ae
223c056
9cd80a6
febcd7b
56092bd
7f64177
877ff25
09fe587
5e3efa3
f991ec9
e5a9106
5b6232d
f4164a7
33d24f7
d1f1d1a
4718b3e
47dab7f
0eaf768
44db906
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,29 @@ | ||
| version: "2" | ||
|
|
||
| linters: | ||
| default: none | ||
| enable: | ||
| - deadcode | ||
| - errcheck | ||
| - goconst | ||
| - gofmt | ||
| - golint | ||
| - gosec | ||
| - govet | ||
| - ineffassign | ||
| - interfacer | ||
| - lll | ||
| - megacheck | ||
| - staticcheck # replaces megacheck | ||
| - misspell | ||
| - nakedret | ||
| - structcheck | ||
| - unconvert | ||
| - varcheck | ||
| enable-all: false | ||
| - unused # replaces deadcode, structcheck, varcheck | ||
|
|
||
| exclusions: | ||
| paths: | ||
| - schema.go | ||
| - resources.go | ||
| - pulumiManifest.go | ||
|
|
||
| formatters: | ||
| enable: | ||
| - gofmt | ||
|
|
||
| run: | ||
| skip-files: | ||
| - schema.go | ||
| - pulumiManifest.go | ||
| timeout: 20m |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,9 +72,11 @@ generate_sdks build_sdks: clean build_nodejs build_python build_go build_dotnet | |
| build_nodejs: upstream $(PULUMICTL_BIN) | ||
| $(WORKING_DIR)/bin/$(TFGEN) nodejs --overlays provider/overlays/nodejs --out sdk/nodejs/ | ||
| echo "patch_nodejs: find and replace wrong imports in examples" && \ | ||
| find ./sdk/nodejs/ -type f -name "*.ts" -not \( -path "*/bin/*" -o -path "*/node_modules/*" -o -path "*/@types/*" \) -print -exec sed -i.bak 's/import \* as ${PACK} from "@pulumi\/${PACK}"/import \* as ${PACK} from "@${ORG}-labs\/${NODE_PACK}"/g; s/import \* as ${NODE_PACK_ALIAS} from "@${ORG}\/${NODE_PACK}"/import \* as ${PACK} from "@${ORG}-labs\/${NODE_PACK}"/g' {} \; | ||
| find ./sdk/nodejs/ -mindepth 2 -type f -name "*.ts" -not \( -path "*/bin/*" -o -path "*/node_modules/*" -o -path "*/@types/*" \) -print -exec sed -i.bak 's/import \* as ${PACK} from "@pulumi\/${PACK}"/import \* as ${PACK} from "@${ORG}-labs\/${NODE_PACK}"/g; s/import \* as ${NODE_PACK_ALIAS} from "@${ORG}\/${NODE_PACK}"/import \* as ${PACK} from "@${ORG}-labs\/${NODE_PACK}"/g; s|from "\./utilities"|from "../utilities"|g; s|from "\./types/|from "../types/|g' {} \; | ||
| echo "patch_nodejs: delete duplicate imports in examples" && \ | ||
| find ./sdk/nodejs/ -type f -name "*.ts" -not \( -path "*/bin/*" -o -path "*/node_modules/*" -o -path "*/@types/*" \) -exec sed -i.bak '/@${ORG}-labs\/${NODE_PACK}/N;/^\(.*\)\n\1$$/!P; D' {} \; | ||
| echo "patch_nodejs: fix relative imports in subdirectory modules (codegen bug)" && \ | ||
| find ./sdk/nodejs/ -mindepth 2 -maxdepth 2 -type f -name "*.ts" -not \( -path "*/bin/*" -o -path "*/node_modules/*" -o -path "*/@types/*" \) -print -exec sed -i.bak 's|from "\./utilities"|from "../utilities"|g; s|from "\./types/|from "../types/|g' {} \; | ||
| echo "patch_nodejs: remove backup files" && \ | ||
| find ./sdk/nodejs/ -type f -name "*.ts.bak" -not \( -path "*/bin/*" -o -path "*/node_modules/*" -o -path "*/@types/*" \) -print -exec /bin/rm {} \; | ||
| cd sdk/nodejs/ && \ | ||
|
|
@@ -87,6 +89,11 @@ build_nodejs: upstream $(PULUMICTL_BIN) | |
| build_python: upstream $(PULUMICTL_BIN) | ||
| rm -rf sdk/python/ | ||
| $(WORKING_DIR)/bin/$(TFGEN) python --overlays provider/overlays/python --out sdk/python/ | ||
| echo "patch_python: fix relative _utilities import in subpackage modules (codegen bug)" && \ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What bug does this refer to?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Somehow, the generated code has the wrong import, even when building on master https://github.com/equinix/pulumi-equinix/actions/runs/28552186430
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK; when the other changes are backed out of this file, this one and the other patches for incorrect imports should stay in. |
||
| find ./sdk/python/pulumi_equinix -mindepth 2 -maxdepth 2 -type f \( -name "*.py" -o -name "*.pyi" \) -print \ | ||
| -exec sed -i.bak 's/^from \. import _utilities$$/from .. import _utilities/' {} \; | ||
| echo "patch_python: remove backup files" && \ | ||
| find ./sdk/python/pulumi_equinix -mindepth 2 -maxdepth 2 -type f \( -name "*.py.bak" -o -name "*.pyi.bak" \) -exec /bin/rm {} \; | ||
| cd sdk/python/ && \ | ||
| printf "module fake_python_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \ | ||
| cp ../../README.md . && \ | ||
|
|
@@ -104,8 +111,8 @@ build_dotnet: upstream $(PULUMICTL_BIN) | |
| dotnet build /p:Version=${DOTNET_VERSION} | ||
|
|
||
| build_go:: upstream | ||
| go env -w GOPROXY=direct | ||
| $(WORKING_DIR)/bin/$(TFGEN) go --overlays provider/overlays/go --out sdk/go/ | ||
| go install golang.org/x/tools/cmd/goimports@latest | ||
| cd sdk && goimports -w . && go list "$$(grep -e "^module" go.mod | cut -d ' ' -f 2)/go/..." | xargs go build | ||
|
|
||
| build_java: bin/pulumi-java-gen patch_java_schema upstream $(PULUMICTL_BIN) | ||
|
|
@@ -139,6 +146,10 @@ build_java: bin/pulumi-java-gen patch_java_schema upstream $(PULUMICTL_BIN) | |
| awk '/repositories \{/ && !x {print; print " mavenLocal()"; x=1; next}1' \ | ||
| ./sdk/java/settings.gradle > ./sdk/java/settings.gradle.tmp && \ | ||
| mv ./sdk/java/settings.gradle.tmp ./sdk/java/settings.gradle | ||
| echo "patch_java: remove nexus publish plugin" && \ | ||
| sed -i.bak '/io.github.gradle-nexus.publish-plugin/d' \ | ||
| sdk/java/build.gradle && \ | ||
| rm -f sdk/java/build.gradle.bak | ||
| cd sdk/java/ && \ | ||
| printf "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \ | ||
| gradle --console=plain build && \ | ||
|
|
||
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.
I wouldn't expect changes to anything at
.githubas part of pulling in a newerterraform-provider-equinixrelease. Were these changes sourced from https://github.com/pulumi/pulumi-tf-provider-boilerplate or somewhere else?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.
The GHA is warning about deprecated node version for this action, so I just upgraded it