8000 feat: release new version by tng1-equinix · Pull Request #349 · equinix/pulumi-equinix · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
61c9d41
Update Makefile
tng1-equinix Aug 26, 2026
1ba15ea
go get github.com/equinix/equinix-sdk-go@v0.67.0 && go mod tidy
tng1-equinix Aug 26, 2026
b5be1fb
use v5.2.0 of provider
tng1-equinix Aug 26, 2026
b776407
Add flake files
tng1-equinix Sep 3, 2026
e9b7599
Update Makefile
tng1-equinix Aug 26, 2026
f10243c
make build
tng1-equinix Aug 26, 2026
8afd8ae
Remove metal examples
tng1-equinix Sep 3, 2026
223c056
Add go install goimports to pipelines
tng1-equinix Sep 3, 2026
9cd80a6
Add generate-only to go step
tng1-equinix Sep 4, 2026
febcd7b
make build
tng1-equinix Sep 3, 2026
56092bd
Add patch python step
tng1-equinix Sep 4, 2026
7f64177
Update go.mod to use go 1.26.0
tng1-equinix Sep 4, 2026
877ff25
make build
tng1-equinix Sep 4, 2026
09fe587
Remove deprecated color flag from golangci-lint in pipeline
tng1-equinix Sep 4, 2026
5e3efa3
Commit pyi file
tng1-equinix Sep 4, 2026
f991ec9
Upgrade node version to v22 from v20
tng1-equinix Sep 4, 2026
e5a9106
Upgrade golangci-lint in pipeline
tng1-equinix Sep 4, 2026
5b6232d
Migrate golangci-lint config
tng1-equinix Sep 4, 2026
f4164a7
Commit provider
tng1-equinix Sep 4, 2026
33d24f7
Specify yarn registry in Makefile
tng1-equinix Sep 4, 2026
d1f1d1a
Remove setup USER and HOME variables in flake
tng1-equinix Sep 4, 2026
4718b3e
Streamline substitution step in Makefile
tng1-equinix Sep 4, 2026
47dab7f
Revert "Specify yarn registry in Makefile"
tng1-equinix Sep 17, 2026
0eaf768
Revert "Streamline substitution step in Makefile"
tng1-equinix Sep 22, 2026
44db906
Unstage flakes
tng1-equinix Sep 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Install go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
# The versions of golangci-lint and setup-go here cross-depend and need to update together.
go-version-file: provider/go.mod
Expand All @@ -35,11 +35,11 @@ jobs:
continue-on-error: true
run: make upstream
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v9
Copy link
Copy Markdown
Contributor

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 .github as part of pulling in a newer terraform-provider-equinix release. Were these changes sourced from https://github.com/pulumi/pulumi-tf-provider-boilerplate or somewhere else?

Copy link
Copy Markdown
Contributor Author

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

with:
version: v1.55.2
version: v2.13.2
working-directory: provider
args: --timeout=30m --out-format=colored-line-number --skip-dirs "/opt|upstream|go/pkg/mod"
args: --timeout=30m --skip-dirs "/opt|upstream|go/pkg/mod"
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ jobs:
uses: actions/setup-go@v5
with:
go-version-file: provider/go.mod
- name: Install goimports
run: go install golang.org/x/tools/cmd/goimports@latest
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.10.0
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
PR_COMMIT_SHA: ${{ github.event.client_payload.pull_request.head.sha }}
DOTNETVERSION: 7.0.x
JAVAVERSION: "11"
NODEVERSION: 20.x
NODEVERSION: 22.x
PYTHONVERSION: "3.9"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # TODO
Expand Down Expand Up @@ -53,6 +53,8 @@ jobs:
cache-dependency-path: |
sdk/go.sum
go-version-file: provider/go.mod
- name: Install goimports
run: go install golang.org/x/tools/cmd/goimports@latest
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.10.0
with:
Expand Down
27 changes: 16 additions & 11 deletions .golangci.yml
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
15 changes: 13 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand All @@ -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)" && \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What bug does this refer to?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The 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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The 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 . && \
Expand All @@ -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)
Expand Down Expand Up @@ -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 && \
Expand Down
Loading
Loading
0