test

Author: miton18

.github/workflows/release.yml

@@ -7,11 +7,15 @@ on:
 
 permissions:
   contents: write
+  # Required for OIDC authentication with PyPI
+  id-token: write
 
 jobs:
   release:
     name: Create Release
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.VERSION }}
 
     steps:
     - name: Checkout code
@@ -25,6 +29,13 @@ jobs:
         go-version: '1.24'
         cache-dependency-path: provider/go.sum
 
+    - name: Install pulumictl
+      run: |
+        PULUMICTL_VERSION=v0.0.50
+        curl -fsSL https://github.com/pulumi/pulumictl/releases/download/${PULUMICTL_VERSION}/pulumictl-${PULUMICTL_VERSION}-linux-amd64.tar.gz | tar -xz
+        sudo mv pulumictl /usr/local/bin/
+        pulumictl version
+
     - name: Get version
       id: version
       run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
@@ -39,8 +50,7 @@ jobs:
     - name: Create Release
       uses: softprops/action-gh-release@v1
       with:
-        files: |
-          bin/pulumi-resource-clevercloud-${{ steps.version.outputs.VERSION }}-linux-amd64.tar.gz
+        files: bin/pulumi-resource-clevercloud-${{ steps.version.outputs.VERSION }}-linux-amd64.tar.gz
         generate_release_notes: true
         draft: false
         prerelease: ${{ contains(steps.version.outputs.VERSION, '-') }}
@@ -49,15 +59,12 @@ jobs:
     name: Publish SDKs
     needs: release
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      # Required for OIDC authentication with PyPI
-      id-token: write
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
+        ref: ${{ needs.release.outputs.version }}
         fetch-depth: 0
 
     - name: Set up Go
@@ -69,22 +76,32 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '24'
         registry-url: 'https://registry.npmjs.org'
 
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
+    - name: Install pulumictl
+      run: |
+        PULUMICTL_VERSION=v0.0.50
+        curl -fsSL https://github.com/pulumi/pulumictl/releases/download/${PULUMICTL_VERSION}/pulumictl-${PULUMICTL_VERSION}-linux-amd64.tar.gz | tar -xz
+        sudo mv pulumictl /usr/local/bin/
+        pulumictl version
+
+    - name: Install Python build tools
+      run: pip install build
+
     - name: Set up .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0'
+        dotnet-version: '10.0'
 
     - name: Install pulumictl
       run: |
-        PULUMICTL_VERSION=v0.0.46
+        PULUMICTL_VERSION=v0.0.50
         curl -fsSL https://github.com/pulumi/pulumictl/releases/download/${PULUMICTL_VERSION}/pulumictl-${PULUMICTL_VERSION}-linux-amd64.tar.gz | tar -xz
         sudo mv pulumictl /usr/local/bin/
         pulumictl version
@@ -94,21 +111,28 @@ jobs:
 
     - name: Publish to npm
       working-directory: sdk/nodejs
-      run: npm publish
-
-    - name: Build Python package
-      working-directory: sdk/python
-      run: |
-        pip install build
-        python -m build
+      run: npm publish --access public --verbose
 
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         packages-dir: sdk/python/dist/
+      env:
+        name: pypi
+        url: https://pypi.org/p/pulumi-clevercloud
+
+    # Get a short-lived NuGet API key
+    # https://learn.microsoft.com/en-us/nuget/nuget-org/trusted-publishing
+    - name: NuGet login (OIDC → temp API key)
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: "${{ secrets.NUGET_USER }}"
 
     - name: Publish to NuGet
       working-directory: sdk/dotnet
       run: |
-        dotnet pack
-        dotnet nuget push bin/Release/*.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
+        dotnet nuget push bin/Release/*.nupkg \
+        --skip-duplicate \
+        --api-key ${{steps.login.outputs.NUGET_API_KEY}} \
+        --source https://api.nuget.org/v3/index.json

.gitignore

@@ -24,14 +24,7 @@ Pulumi.*.yaml
 schema.json
 
 # Build artifacts
-sdk/nodejs/bin/
-sdk/python/build/
-sdk/python/dist/
-sdk/python/*.egg-info/
-sdk/dotnet/bin/
-sdk/dotnet/obj/
-sdk/go/clevercloud/
-sdk/java/target/
+sdk/
 
 # Logs
 *.log

Makefile

@@ -1,5 +1,8 @@
 PROJECT_NAME := clevercloud
-VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "v0.0.1-dev")
+VERSION ?= $(shell git describe --tags --always 2>/dev/null || echo "v0.0.1-dev")
+VERSION_DOTNET := $(shell pulumictl convert-version --language dotnet --version "$(VERSION)")
+VERSION_JS := $(shell pulumictl convert-version --language javascript --version "$(VERSION)")
+VERSION_PYTHON := $(shell pulumictl convert-version --language python --version "$(VERSION)")
 PROVIDER_PATH := provider
 WORKING_DIR := $(shell pwd)
 PROVIDER_BIN := pulumi-resource-$(PROJECT_NAME)
@@ -14,6 +17,7 @@ deps:
 
 .PHONY: build_provider
 build_provider:
+	@echo "building version ${VERSION}"
 	cd $(PROVIDER_PATH) && go build \
 		-mod=mod \
 		-o $(WORKING_DIR)/bin/$(PROVIDER_BIN) \
@@ -29,18 +33,18 @@ check_tools:
 
 .PHONY: build_sdks
 build_sdks: build_provider
-	@echo "Generating SDKs..."
-	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER_BIN)
-	@echo "Updating SDK versions and metadata..."
-	VERSION_JS=$$(command -v pulumictl >/dev/null 2>&1 && pulumictl get version --language javascript || echo "$(VERSION:v%=%)")
-	VERSION_PY=$$(command -v pulumictl >/dev/null 2>&1 && pulumictl get version --language python || echo "$(VERSION:v%=%)")
-	jq \
-		--arg version "$$VERSION_JS" '.version = $$version | .main = "bin/index.js" | .types = "bin/index.d.ts" | .publishConfig = {"access": "public"}' \
-		sdk/nodejs/package.json > sdk/nodejs/package.json.tmp
-	mv sdk/nodejs/package.json.tmp sdk/nodejs/package.json
-	sed -i "s|require('./package.json')|require('../package.json')|g" sdk/nodejs/utilities.ts
-	cd sdk/nodejs && npm install && npm run build
-	sed -i "s/version = \".*\"/version = \"$$VERSION_PY\"/g" sdk/python/setup.py 2>/dev/null || true
+	@echo "Generating SDKs (${VERSION})..."
+	pulumi package gen-sdk -e --color always --language nodejs $(WORKING_DIR)/bin/$(PROVIDER_BIN)
+	pulumi package gen-sdk -e --color always --language python $(WORKING_DIR)/bin/$(PROVIDER_BIN)
+	pulumi package gen-sdk -e --color always --language dotnet $(WORKING_DIR)/bin/$(PROVIDER_BIN)
+	cd sdk/nodejs && npm pkg set version="$(VERSION_JS)"
+	@echo "$(VERSION_DOTNET)" > sdk/dotnet/version.txt
+	@sed -i 's/VERSION = "0.0.0"/VERSION = "$(VERSION_PYTHON)"/' sdk/python/setup.py
+	cd sdk/nodejs && npm install && npm run build && npm pkg fix
+	cd sdk/python && python3 -m build
+	cd sdk/dotnet && dotnet build -c Release && dotnet pack -c Release --no-build --version ${VERSION_DOTNET}
+	@cp sdk/nodejs/package.json sdk/nodejs/bin/package.json
+
 
 .PHONY: install
 install: build
@@ -84,14 +88,13 @@ lint:
 
 .PHONY: clean
 clean:
-	rm -rf bin/
-	rm -rf sdk/dotnet/bin sdk/dotnet/obj
-	rm -rf sdk/nodejs/bin
-	rm -rf sdk/python/build
+	rm -rf bin/*
+	rm -rf sdk
+	rm schema.json
 
 .PHONY: generate_schema
 generate_schema: build_provider
-	$(WORKING_DIR)/bin/$(PROVIDER_BIN) schema > $(SCHEMA_PATH)
+	pulumi package get-schema $(WORKING_DIR)/bin/$(PROVIDER_BIN) > $(SCHEMA_PATH)
 
 .PHONY: dev
 dev: build install