From ce593bdbb1cf1b7dc4251bcc4ffe04172c383821 Mon Sep 17 00:00:00 2001 From: Jordan Stephens Date: Thu, 6 Mar 2025 11:26:56 -0800 Subject: [PATCH] try to configure package names in schema metadata This does not appear to be working yet, so we are still using sed to replace the nodejs package name --- Makefile | 8 ++++---- metadata.json | 12 ++++++++++-- provider/cmd/pulumi-resource-defang/schema.json | 10 +++++++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8e30e74..f72c81e 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ 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) +dotnet_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema rm -rf sdk/dotnet pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language dotnet cd ${PACKDIR}/dotnet/&& \ @@ -76,13 +76,13 @@ dotnet_sdk: $(WORKING_DIR)/bin/$(PROVIDER) dotnet build /p:Version=${DOTNET_VERSION} .PHONY: go_sdk -go_sdk: $(WORKING_DIR)/bin/$(PROVIDER) +go_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema 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) +nodejs_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema rm -rf sdk/nodejs pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language nodejs cd ${PACKDIR}/nodejs/ && \ @@ -95,7 +95,7 @@ nodejs_sdk: $(WORKING_DIR)/bin/$(PROVIDER) .PHONY: python_sdk python_sdk: PYPI_VERSION := $(shell pulumictl get version --language python) -python_sdk: $(WORKING_DIR)/bin/$(PROVIDER) +python_sdk: $(WORKING_DIR)/bin/$(PROVIDER) schema rm -rf sdk/python pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language python cp README.md ${PACKDIR}/python/ diff --git a/metadata.json b/metadata.json index 2467e5a..2d68c3c 100644 --- a/metadata.json +++ b/metadata.json @@ -5,5 +5,13 @@ "homepage": "https://github.com/DefangLabs/pulumi-defang", "license": "Apache-2.0", "repository": "https://github.com/DefangLabs/pulumi-defang", - "logoUrl": "https://raw.githubusercontent.com/DefangLabs/pulumi-defang/refs/heads/v1/docs/logo.png" -} \ No newline at end of file + "logoUrl": "https://raw.githubusercontent.com/DefangLabs/pulumi-defang/refs/heads/v1/docs/logo.png", + "language": { + "csharp": { + "rootNamespace": "Defang" + }, + "nodejs": { + "packageName": "@defang-io/pulumi-defang" + } + } +} diff --git a/provider/cmd/pulumi-resource-defang/schema.json b/provider/cmd/pulumi-resource-defang/schema.json index 58dbf95..39e9284 100644 --- a/provider/cmd/pulumi-resource-defang/schema.json +++ b/provider/cmd/pulumi-resource-defang/schema.json @@ -69,5 +69,13 @@ "homepage": "https://github.com/DefangLabs/pulumi-defang", "license": "Apache-2.0", "repository": "https://github.com/DefangLabs/pulumi-defang", - "logoUrl": "https://raw.githubusercontent.com/DefangLabs/pulumi-defang/refs/heads/v1/docs/logo.png" + "logoUrl": "https://raw.githubusercontent.com/DefangLabs/pulumi-defang/refs/heads/v1/docs/logo.png", + "language": { + "csharp": { + "rootNamespace": "Defang" + }, + "nodejs": { + "packageName": "@defang-io/pulumi-defang" + } + } }