Merge pull request #11 from pulumiverse/feat/upgrade-tfpf

.github/workflows/pull-request.yml

@@ -0,0 +1,91 @@
+name: build
+
+on:
+  pull_request:
+    paths-ignore:
+      - docs
+      - .devcontainer
+      - examples
+
+jobs:
+  build_sdk:
+    name: build_sdk
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        dotnetversion:
+          - 6.0.x
+        goversion:
+          - 1.20.x
+        nodeversion:
+          - 16.x
+        pythonversion:
+          - "3.9"
+        # javaversion:
+        # - "11"
+        language:
+        - nodejs
+        - python
+        - dotnet
+        - go
+        # - java
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v2
+
+    - name: Unshallow clone for tags
+      run: git fetch --prune --unshallow --tags
+    - name: Install Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: ${{matrix.goversion}}
+
+    - name: Install pulumictl
+      uses: jaxxstorm/[email protected]
+      with:
+        repo: pulumi/pulumictl
+
+    - name: Install pulumi
+      uses: pulumi/actions@v4
+
+    - if: ${{ matrix.language == 'nodejs'}}
+      name: Setup Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{matrix.nodeversion}}
+        registry-url: https://registry.npmjs.org
+
+    - if: ${{ matrix.language == 'dotnet'}}
+      name: Setup DotNet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: ${{matrix.dotnetversion}}
+
+    - if: ${{ matrix.language == 'python'}}
+      name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{matrix.pythonversion}}
+
+    - if: ${{ matrix.language == 'java'}}
+      name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        cache: gradle
+        distribution: temurin
+        java-version: ${{matrix.javaversion}}
+
+    - name: Build SDK
+      run: make build_${{ matrix.language }}
+
+    - name: Check worktree clean
+      run: |
+        git update-index -q --refresh
+        if ! git diff-files --quiet; then
+            >&2 echo "error: working tree is not clean, aborting!"
+            git status
+            git diff
+            exit 1
+        fi

.github/workflows/release.yml

@@ -1,10 +1,15 @@
 name: release
+
 on:
   push:
     tags:
       - v*.*.*
+    paths-ignore:
+      - docs
+      - .devcontainer
+      - examples
+
 env:
-  # THIS GITHUB_TOKEN IS A REQUIREMENT TO BE ABLE TO WRITE TO GH RELEASES
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # IF YOU NEED TO PUBLISH A NPM PACKAGE THEN ENSURE A NPM_TOKEN SECRET IS SET
   # AND PUBLISH_NPM: TRUE. IF YOU WANT TO PUBLISH TO A PRIVATE NPM REGISTRY
@@ -28,6 +33,7 @@ env:
   PYPI_USERNAME: "__token__"
   PYPI_REPOSITORY_URL: ""
   PUBLISH_PYPI: true
+
 jobs:
   publish_binary:
     name: publish
@@ -37,62 +43,88 @@ jobs:
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
+
     - name: Unshallow clone for tags
       run: git fetch --prune --unshallow --tags
+
     - name: Install Go
       uses: actions/setup-go@v3
       with:
         go-version: ${{matrix.goversion}}
+
     - name: Install pulumictl
-      uses: jaxxstorm/action-install-gh-release@v1.5.0
+      uses: jaxxstorm/action-install-gh-release@v1.10.0
       with:
         repo: pulumi/pulumictl
+
     - name: Set PreRelease Version
       run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> $GITHUB_ENV
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
         args: -p 3 release --rm-dist
         version: latest
+
     strategy:
       fail-fast: true
       matrix:
         goversion:
         - 1.20.x
+
   publish_sdk:
     name: Publish SDKs
     runs-on: ubuntu-latest
     needs: publish_binary
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
+
       - name: Unshallow clone for tags
         run: git fetch --prune --unshallow --tags
+
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.goversion }}
+
       - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.5.0
+        uses: jaxxstorm/action-install-gh-release@v1.10.0
         with:
           repo: pulumi/pulumictl
-      - name: Install Pulumi CLI
-        uses: pulumi/[email protected]
-      - name: Setup Node
+
+      - name: Install pulumi
+        uses: pulumi/actions@v4
+
+      - if: ${{ matrix.language == 'nodejs'}}
+        name: Setup Node
         uses: actions/setup-node@v1
         with:
           node-version: ${{matrix.nodeversion}}
           registry-url: ${{env.NPM_REGISTRY_URL}}
-      - name: Setup DotNet
+
+      - if: ${{ matrix.language == 'dotnet'}}
+        name: Setup DotNet
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{matrix.dotnetversion}}
-      - name: Setup Python
+
+      - if: ${{ matrix.language == 'java'}}
+        name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          cache: gradle
+          distribution: temurin
+          java-version: ${{matrix.javaversion}}
+
+      - if: ${{ matrix.language == 'python'}}
+        name: Setup Python
         uses: actions/setup-python@v1
         with:
           python-version: ${{matrix.pythonversion}}
+
       - name: Build SDK
         run: make build_${{ matrix.language }}
+
       - name: Check worktree clean
         run: |
           git update-index -q --refresh
@@ -102,37 +134,44 @@ jobs:
               git diff
               exit 1
           fi
+
       - if: ${{ matrix.language == 'python' && env.PUBLISH_PYPI == 'true' }}
         name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: ${{ env.PYPI_USERNAME }}
           password: ${{ env.PYPI_PASSWORD }}
           packages_dir: ${{github.workspace}}/sdk/python/bin/dist
+
       - if: ${{ matrix.language == 'nodejs' && env.PUBLISH_NPM == 'true' }}
         uses: JS-DevTools/npm-publish@v1
         with:
           access: "public"
           token: ${{ env.NPM_TOKEN }}
           package: ${{github.workspace}}/sdk/nodejs/bin/package.json
+
       - if: ${{ matrix.language == 'dotnet' && env.PUBLISH_NUGET == 'true' }}
         name: publish nuget package
         run: |
           dotnet nuget push ${{github.workspace}}/sdk/dotnet/bin/Debug/*.nupkg -s ${{ env.NUGET_FEED_URL }} -k ${{ env.NUGET_PUBLISH_KEY }}
           echo "done publishing packages"
+
     strategy:
       fail-fast: true
       matrix:
         dotnetversion:
           - 6.0.x
         goversion:
           - 1.20.x
+        nodeversion:
+          - 16.x
+        pythonversion:
+          - "3.9"
+        # javaversion:
+        # - "11"
         language:
           - nodejs
           - python
           - dotnet
           - go
-        nodeversion:
-          - 16.x
-        pythonversion:
-          - "3.9"
+          # - java

Makefile

@@ -43,6 +43,9 @@ development:: install_plugins provider lint_provider build_sdks install_sdks cle
 build:: install_plugins provider build_sdks install_sdks
 only_build:: build
 
+generate::
+	go generate provider/resources.go
+
 tfgen:: install_plugins
 	(cd provider && go build -o $(WORKING_DIR)/bin/${TFGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/${TFGEN})
 	$(WORKING_DIR)/bin/${TFGEN} schema --out provider/cmd/${PROVIDER}
@@ -59,8 +62,7 @@ build_nodejs:: install_plugins tfgen # build the node sdk
 	cd sdk/nodejs/ && \
         yarn install && \
         yarn run tsc && \
-		cp -R scripts/ bin && \
-        cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ && \
+		    cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ && \
 		sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json
 
 build_python:: PYPI_VERSION := $(shell pulumictl get version --language python)