Fix ts main and add generate python (#13)

* Fix ts main and add generate python

* Fix version

* Fix version

* New version for release

.github/actions/generate_sdk/action.yml

@@ -11,5 +11,5 @@ runs:
   - name: Generate SDKs
     run: |
       # Generate the SDKs
-      make generate_go_client_sdk generate_ts_client_sdk
+      make generate_sdks
     shell: bash

.github/workflows/stage-publish-sdk.yml

@@ -99,6 +99,9 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+      - id: version
+        name: Set SDK Version
+        uses: pulumi/provider-version-action@v1
       - name: Generate SDKs
         uses: ./.github/actions/generate_sdk
         env:
@@ -109,8 +112,8 @@ jobs:
       - name: Build Python SDK
         run: make build_python
         env:
-          VERSION: ${{ inputs.version }}
-          PULUMI_VERSION: ${{ inputs.version }}
+          VERSION: ${{ steps.version.outputs.version }}
+          PULUMI_VERSION: ${{ steps.version.outputs.version }}
       - name: Publish PyPi Package
         run: >
           twine upload

.version

@@ -1 +1 @@
-0.9.0
+0.9.1

Makefile

@@ -1,4 +1,5 @@
 VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell ./scripts/pulumi-version.sh))
+PYTHON_SDK_VERSION := $(shell echo "$(VERSION)" | sed 's/-/./g')
 
 CONCURRENCY := 10
 SHELL := sh
@@ -40,7 +41,7 @@ build_debug:: ensure_go
 	cd sdk && ${GO} build -gcflags="all=-N -l" -ldflags "-X github.com/pulumi/esc/cmd/internal/version.Version=${VERSION}" ./...
 
 build_python::
-	PYPI_VERSION=$(VERSION) ./scripts/build_python_sdk.sh
+	PYPI_VERSION=$(PYTHON_SDK_VERSION) ./scripts/build_python_sdk.sh
 
 test_go:: build_go
 	cd sdk && ${GO} test --timeout 30m -short -count 1 -parallel ${CONCURRENCY} ./...
@@ -64,7 +65,7 @@ generate_ts_client_sdk:
 
 .PHONY: generate_python_client_sdk
 generate_python_client_sdk:
-	PYTHON_POST_PROCESS_FILE="/usr/local/bin/yapf -i" openapi-generator-cli generate -i ./sdk/swagger.yaml -p packageName=pulumi_esc_sdk,httpUserAgent=esc-sdk/python/${VERSION},packageVersion=${VERSION} -t ./sdk/templates/python -g python -o ./sdk/python --git-repo-id esc --git-user-id pulumi
+	PYTHON_POST_PROCESS_FILE="/usr/local/bin/yapf -i" openapi-generator-cli generate -i ./sdk/swagger.yaml -p packageName=pulumi_esc_sdk,httpUserAgent=esc-sdk/python/${VERSION},packageVersion=${PYTHON_SDK_VERSION} -t ./sdk/templates/python -g python -o ./sdk/python --git-repo-id esc --git-user-id pulumi
 
 .phony: generate_sdks
 generate_sdks:: generate_go_client_sdk generate_ts_client_sdk generate_python_client_sdk

sdk/python/pulumi_esc_sdk/__init__.py

@@ -16,7 +16,7 @@
 """  # noqa: E501
 
 
-__version__ = "0.9.0-dev.0"
+__version__ = "0.9.1.dev.0"
 
 # import extensions
 from pulumi_esc_sdk.esc_client import EscClient

sdk/python/pulumi_esc_sdk/api_client.py

@@ -90,7 +90,7 @@ def __init__(
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'esc-sdk/python/0.9.0-dev.0'
+        self.user_agent = 'esc-sdk/python/0.9.1-dev.0'
         self.default_headers['X-Pulumi-Source'] = 'esc-sdk'
         self.client_side_validation = configuration.client_side_validation
 

sdk/python/pulumi_esc_sdk/configuration.py

@@ -385,7 +385,7 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "SDK Package Version: 0.9.0-dev.0".\
+               "SDK Package Version: 0.9.1.dev.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

sdk/python/setup.py

@@ -23,7 +23,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "pulumi-esc-sdk"
-VERSION = "0.9.0-dev.0"
+VERSION = "0.9.1.dev.0"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 2.1.0",

sdk/typescript/esc/raw/api.ts

@@ -15,7 +15,7 @@
  */
 
 
-const userAgent = 'esc-sdk/ts/0.9.0-dev.0';
+const userAgent = 'esc-sdk/ts/0.9.1-dev.0';
 
 import type { Configuration } from './configuration';
 import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';

sdk/typescript/package.json

@@ -8,7 +8,7 @@
         "sdk",
         "category/cloud"
     ],
-    "main": "esc/src",
+    "main": "esc/index.js",
     "repository": {
         "type": "git",
         "url": "https://github.com/pulumi/esc-sdk.git",