describe provider metadata with infer

Author: jordanstephens

Makefile

@@ -53,12 +53,6 @@ provider: $(WORKING_DIR)/bin/$(PROVIDER)
 $(WORKING_DIR)/bin/$(PROVIDER): $(shell find . -name "*.go")
 	go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" $(PROJECT)/${PROVIDER_PATH}/cmd/$(PROVIDER)
 
-schema: ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json
-${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json: metadata.json provider
-	pulumi package get-schema $(WORKING_DIR)/bin/${PROVIDER} > ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json
-	jq -s '.[0] * .[1]' ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json metadata.json > ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json.tmp
-	mv ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json.tmp ${PROVIDER_PATH}/cmd/$(PROVIDER)/schema.json
-
 .PHONY: provider_debug
 provider_debug:
 	(cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -gcflags="all=-N -l" -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" $(PROJECT)/${PROVIDER_PATH}/cmd/$(PROVIDER))
@@ -68,42 +62,37 @@ test_provider:
 	cd tests && go test -short -v -count=1 -cover -timeout 5m -parallel ${TESTPARALLELISM} ./...
 
 dotnet_sdk: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
-dotnet_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema
+dotnet_sdk: provider
 	rm -rf sdk/dotnet
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language dotnet
 	cd ${PACKDIR}/dotnet/&& \
 		echo "${DOTNET_VERSION}" >version.txt && \
 		dotnet build /p:Version=${DOTNET_VERSION}
 
 .PHONY: go_sdk
-go_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema
+go_sdk: provider
 	rm -rf sdk/go
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language go
 
 .PHONY: nodejs_sdk
 nodejs_sdk: VERSION := $(shell pulumictl get version --language javascript)
-nodejs_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema
+nodejs_sdk: provider
 	rm -rf sdk/nodejs
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language nodejs
 	cd ${PACKDIR}/nodejs/ && \
-		sed -i.bak 's/$${VERSION}/$(VERSION)/g' package.json && \
-		sed -i.bak 's|@pulumi/defang|${NODE_MODULE_NAME}|g' package.json && \
 		yarn install && \
 		yarn run tsc && \
-		cp ../../README.md ../../LICENSE package.json yarn.lock bin/ && \
-		rm ./package.json.bak
+		cp ../../README.md ../../LICENSE package.json yarn.lock bin/
 
 .PHONY: python_sdk
 python_sdk: PYPI_VERSION := $(shell pulumictl get version --language python)
-python_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema
+python_sdk: provider
 	rm -rf sdk/python
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language python
 	cp README.md ${PACKDIR}/python/
 	cd ${PACKDIR}/python/ && \
 		python3 setup.py clean --all 2>/dev/null && \
 		rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \
-		sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \
-		rm ./bin/setup.py.bak && \
 		cd ./bin && python3 setup.py build sdist
 
 .PHONY: examples
@@ -112,21 +101,7 @@ examples: go_example \
 		python_example \
 		dotnet_example
 
-go_example: clean_go_example
-clean_go_example: build_go_example
-	# intentionally blank
-nodejs_example: clean_nodejs_example
-clean_nodejs_example: build_nodejs_example
-	sed -i -e 's|@pulumi/defang|@defang-io/pulumi-defang|' examples/nodejs/package.json examples/nodejs/index.ts
-python_example: clean_python_example
-clean_python_example: build_python_example
-	# intentionally blank
-dotnet_example: clean_dotnet_example
-clean_dotnet_example: build_dotnet_example
-	# intentionally blank
-
-.PHONY: build_go_example build_nodejs_example build_python_example build_dotnet_example
-build_%_example:
+%_example:
 	rm -rf ${WORKING_DIR}/examples/$*
 	pulumi convert \
 		--cwd ${WORKING_DIR}/examples/yaml \

examples/dotnet/Program.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Pulumi;
-using Defang = Pulumi.Defang;
+using Defang = DefangLabs.Defang;
 
 return await Deployment.RunAsync(() => 
 {

examples/dotnet/provider-defang.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="Pulumi.Defang" Version="1.1.0-alpha.1741220968+0411d9f3" />
+		<PackageReference Include="DefangLabs.Defang" Version="1.1.0-alpha.1741714232+8d1865e8" />
 	</ItemGroup>
 
 </Project>

examples/go/go.mod

@@ -4,5 +4,5 @@ go 1.20
 
 require (
 	github.com/pulumi/pulumi/sdk/v3 v3.30.0
-	example.com/pulumi-defang/sdk v1.1.0-alpha.1741220968+0411d9f3
+	github.com/DefangLabs/pulumi-defang/sdk v1.1.0-alpha.1741714232+8d1865e8
 )

examples/go/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"example.com/pulumi-defang/sdk/go/defang"
+	"github.com/DefangLabs/pulumi-defang/sdk/go/defang"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 

examples/nodejs/package.json

@@ -6,6 +6,6 @@
 	"dependencies": {
 		"typescript": "^4.0.0",
 		"@pulumi/pulumi": "^3.0.0",
-		"@defang-io/pulumi-defang": "1.1.0-alpha.1741220968+0411d9f3"
+		"@defang-io/pulumi-defang": "1.1.0-alpha.1741714232+8d1865e8"
 	}
 }

examples/python/requirements.txt

@@ -1,2 +1,2 @@
-pulumi-defang==1.1.0-alpha.1741220968+0411d9f3
+pulumi-defang==1.1.0-alpha.1741714232+8d1865e8
 pulumi>=3.0.0,<4.0.0

go.mod

@@ -6,9 +6,10 @@ require (
 	github.com/DefangLabs/defang/src v0.0.0-20250311052902-1d12330e66fe
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/pulumi/pulumi-go-provider v0.24.1
-	github.com/pulumi/pulumi-random/sdk/v4 v4.17.0
-	github.com/pulumi/pulumi/sdk/v3 v3.150.0
+	github.com/pulumi/pulumi/pkg/v3 v3.154.0
+	github.com/pulumi/pulumi/sdk/v3 v3.154.0
 	github.com/stretchr/testify v1.10.0
+	google.golang.org/protobuf v1.35.1
 )
 
 require (
@@ -79,6 +80,7 @@ require (
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set/v2 v2.5.0 // indirect
 	github.com/digitalocean/godo v1.131.1 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/djherbis/times v1.5.0 // indirect
@@ -112,6 +114,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
+	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -148,7 +151,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
 	github.com/pulumi/esc v0.10.0 // indirect
-	github.com/pulumi/pulumi/pkg/v3 v3.142.0 // indirect
+	github.com/pulumi/inflector v0.1.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/ross96D/cancelreader v0.2.6 // indirect
@@ -159,6 +162,7 @@ require (
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/texttheater/golang-levenshtein v1.0.1 // indirect
@@ -196,7 +200,6 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
 	google.golang.org/grpc v1.68.0 // indirect
 	google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect