Skip to content

Commit

Permalink
feat: add --skip-examples (#112)
Browse files Browse the repository at this point in the history
* feat: add --skip-examples
  • Loading branch information
dirien committed Jul 2, 2023
1 parent b08cbdd commit 63c06e2
Show file tree
Hide file tree
Showing 88 changed files with 192 additions and 2,916 deletions.
4 changes: 1 addition & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 pulumi/pulumi:3.71.0
FROM --platform=linux/amd64 pulumi/pulumi:3.74.0

# Install pulumictl and set to PATH
RUN curl -fsSL https://get.pulumi.com | sh
Expand All @@ -9,5 +9,3 @@ RUN mkdir -p /root/pulumictl && cd /root/pulumictl/
RUN wget https://github.com/pulumi/pulumictl/releases/download/v0.0.42/pulumictl-v0.0.42-linux-amd64.tar.gz -O /root/pulumictl/pulumictl-v0.0.42-linux-amd64.tar.gz
RUN tar -xvf /root/pulumictl/pulumictl-v0.0.42-linux-amd64.tar.gz -C /root/pulumictl/
ENV PATH="//root/pulumictl/:${PATH}"

RUN go install github.com/pulumi/upgrade-provider@main
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ only_build:: build

tfgen:: install_plugins
(cd provider && go build -o $(WORKING_DIR)/bin/${TFGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/${TFGEN})
$(WORKING_DIR)/bin/${TFGEN} schema --out provider/cmd/${PROVIDER}
$(WORKING_DIR)/bin/${TFGEN} schema --out provider/cmd/${PROVIDER} --skip-examples
(cd provider && VERSION=$(VERSION) go generate cmd/${PROVIDER}/main.go)

provider:: tfgen install_plugins # build the provider binary
Expand All @@ -66,7 +66,7 @@ build_sdks:: install_plugins provider build_nodejs build_python build_go build_d

build_nodejs:: VERSION := $(shell pulumictl get version --language javascript)
build_nodejs:: install_plugins tfgen # build the node sdk
$(WORKING_DIR)/bin/$(TFGEN) nodejs --overlays provider/overlays/nodejs --out sdk/nodejs/
$(WORKING_DIR)/bin/$(TFGEN) nodejs --overlays provider/overlays/nodejs --out sdk/nodejs/ --skip-examples
cd sdk/nodejs/ && \
yarn install && \
yarn run tsc && \
Expand All @@ -76,7 +76,7 @@ build_nodejs:: install_plugins tfgen # build the node sdk

build_python:: PYPI_VERSION := $(shell pulumictl get version --language python)
build_python:: install_plugins tfgen # build the python sdk
$(WORKING_DIR)/bin/$(TFGEN) python --overlays provider/overlays/python --out sdk/python/
$(WORKING_DIR)/bin/$(TFGEN) python --overlays provider/overlays/python --out sdk/python/ --skip-examples
cd sdk/python/ && \
cp ../../README.md . && \
python3 setup.py clean --all 2>/dev/null && \
Expand All @@ -88,17 +88,17 @@ build_python:: install_plugins tfgen # build the python sdk
build_dotnet:: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
build_dotnet:: install_plugins tfgen # build the dotnet sdk
pulumictl get version --language dotnet
$(WORKING_DIR)/bin/$(TFGEN) dotnet --overlays provider/overlays/dotnet --out sdk/dotnet/
$(WORKING_DIR)/bin/$(TFGEN) dotnet --overlays provider/overlays/dotnet --out sdk/dotnet/ --skip-examples
cd sdk/dotnet/ && \
echo "${DOTNET_VERSION}" >version.txt && \
dotnet build /p:Version=${DOTNET_VERSION}

build_go:: install_plugins tfgen # build the go sdk
$(WORKING_DIR)/bin/$(TFGEN) go --overlays provider/overlays/go --out sdk/go/
$(WORKING_DIR)/bin/$(TFGEN) go --overlays provider/overlays/go --out sdk/go/ --skip-examples

build_java:: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
build_java:: $(WORKING_DIR)/bin/$(JAVA_GEN)
$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus
$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus --skip-examples
cd sdk/java/ && \
echo "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
gradle --console=plain build
Expand Down
42 changes: 22 additions & 20 deletions provider/cmd/pulumi-resource-harbor/schema.json

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ module github.com/pulumiverse/pulumi-harbor/provider/v3

go 1.20

replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230327102345-3fa930f86570

require (
github.com/goharbor/terraform-provider-harbor v1.4.1-0.20230612135319-b2e9f761a36e
github.com/pulumi/pulumi-terraform-bridge/v3 v3.50.1
github.com/pulumi/pulumi/sdk/v3 v3.73.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.53.0
github.com/pulumi/pulumi/sdk/v3 v3.74.0
)

require (
Expand Down Expand Up @@ -38,6 +38,7 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
Expand Down Expand Up @@ -150,7 +151,7 @@ require (
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mitchellh/cli v1.1.4 // indirect
github.com/mitchellh/cli v1.1.5 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
Expand All @@ -177,9 +178,9 @@ require (
github.com/pulumi/pulumi-java/pkg v0.9.4 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 // indirect
github.com/pulumi/pulumi-yaml v1.1.1 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.72.2 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.74.0 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand Down

0 comments on commit 63c06e2

Please sign in to comment.