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

Respect schema version #1539

Merged
merged 3 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pulumi.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.110.0
3.116.1
22 changes: 8 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,31 +80,26 @@ generate_nodejs: .pulumi/bin/pulumi
rm -rf sdk/nodejs
mkdir sdk/nodejs
echo "module fake_nodejs_module // Exclude this directory from Go tools\n\ngo 1.17" > 'sdk/nodejs/go.mod'
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language nodejs
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language nodejs --version "$(VERSION_GENERIC)"

build_nodejs:: NODE_VERSION := $(shell pulumictl convert-version --language javascript -v "$(VERSION_GENERIC)")
build_nodejs::
cd ${PACKDIR}/nodejs/ && \
yarn install && \
yarn run build && \
cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ && \
sed -i.bak -e "s/\$${VERSION}/$(NODE_VERSION)/g" ./bin/package.json
cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/

generate_python: .pulumi/bin/pulumi
rm -rf sdk/python
mkdir sdk/python
echo "module fake_python_module // Exclude this directory from Go tools\n\ngo 1.17" > 'sdk/python/go.mod'
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language python
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language python --version "$(VERSION_GENERIC)"

build_python:: PYPI_VERSION := $(shell pulumictl convert-version --language python -v "$(VERSION_GENERIC)")
build_python::
# Delete files not tracked in Git
cd sdk/python/ && git clean -fxd
cd sdk/python/ && \
cp ../../README.md . && \
rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \
sed -i.bak -e 's/^ version = .*/ version = "$(PYPI_VERSION)"/g' ./bin/pyproject.toml && \
rm ./bin/pyproject.toml.bak && \
python3 -m venv venv && \
./venv/bin/python -m pip install build && \
cd ./bin && \
Expand All @@ -114,13 +109,12 @@ generate_dotnet: .pulumi/bin/pulumi
rm -rf sdk/dotnet
mkdir sdk/dotnet
echo "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17" > 'sdk/dotnet/go.mod'
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language dotnet
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language dotnet --version "$(VERSION_GENERIC)"

build_dotnet:: DOTNET_VERSION := $(shell pulumictl convert-version --language dotnet -v "$(VERSION_GENERIC)")
build_dotnet::
cd ${PACKDIR}/dotnet/ && \
echo "${PACK}\n${DOTNET_VERSION}" >version.txt && \
dotnet build /p:Version=${DOTNET_VERSION}
echo "${PACK}\n${VERSION_GENERIC}" > version.txt && \
dotnet build

generate_java:: bin/pulumi-java-gen
rm -rf sdk/java
Expand All @@ -135,13 +129,13 @@ build_java::

generate_go: .pulumi/bin/pulumi
rm -rf sdk/go && mkdir sdk/go
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language go
.pulumi/bin/pulumi package gen-sdk provider/cmd/pulumi-resource-aws-native/schema.json --language go --version "$(VERSION_GENERIC)"

build_go::
cd sdk/ && go build github.com/pulumi/pulumi-aws-native/sdk/go/aws/...

bin/pulumi-java-gen::
$(shell pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java)
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java

clean::
rm -rf sdk/nodejs && mkdir sdk/nodejs && echo "module fake_nodejs_module // Exclude this directory from Go tools\n\ngo 1.17" > 'sdk/nodejs/go.mod'
Expand Down
13 changes: 9 additions & 4 deletions provider/cmd/pulumi-resource-aws-native/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,27 +231,32 @@
},
"packageReferences": {
"Pulumi": "3.*"
}
},
"respectSchemaVersion": true
},
"go": {
"importBasePath": "github.com/pulumi/pulumi-aws-native/sdk/go/aws",
"packageImportAliases": {
"github.com/pulumi/pulumi-aws-native/sdk/go/aws/aws-native": "aws"
}
},
"respectSchemaVersion": true
},
"java": {
"packages": {
"aws-native": "awsnative"
}
},
"nodejs": {},
"nodejs": {
"respectSchemaVersion": true
},
"python": {
"pyproject": {
"enabled": true
},
"requires": {
"pulumi": "\u003e=3.0.0,\u003c4.0.0"
}
},
"respectSchemaVersion": true
}
},
"config": {
Expand Down
9 changes: 7 additions & 2 deletions provider/pkg/schema/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,17 @@ func GatherPackage(supportedResourceTypes []string, jsonSchemas []*jsschema.Sche
"packages": javaPackages,
})
p.Language["go"] = rawMessage(map[string]interface{}{
"importBasePath": "github.com/pulumi/pulumi-aws-native/sdk/go/aws",
"respectSchemaVersion": true,
"importBasePath": "github.com/pulumi/pulumi-aws-native/sdk/go/aws",
"packageImportAliases": map[string]string{
"github.com/pulumi/pulumi-aws-native/sdk/go/aws/aws-native": "aws",
},
})
p.Language["nodejs"] = rawMessage(map[string]interface{}{})
p.Language["nodejs"] = rawMessage(map[string]interface{}{
"respectSchemaVersion": true,
})
p.Language["python"] = rawMessage(map[string]interface{}{
"respectSchemaVersion": true,
"requires": map[string]string{
"pulumi": ">=3.0.0,<4.0.0",
},
Expand Down Expand Up @@ -493,6 +497,7 @@ func GatherPackage(supportedResourceTypes []string, jsonSchemas []*jsschema.Sche
}

p.Language["csharp"] = rawMessage(map[string]interface{}{
"respectSchemaVersion": true,
"packageReferences": map[string]string{
"Pulumi": "3.*",
},
Expand Down
1 change: 1 addition & 0 deletions sdk/dotnet/Pulumi.AwsNative.csproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion sdk/dotnet/pulumi-plugin.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/go/aws/internal/pulumiUtilities.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion sdk/go/aws/pulumi-plugin.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions sdk/nodejs/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion sdk/python/pulumi_aws_native/pulumi-plugin.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/python/pyproject.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading