Modify Makefile to use pulumi package gen-sdk (#147)

Author: Kyle Dixler

.github/workflows/build.yml

@@ -80,7 +80,6 @@ jobs:
     - name: Tar provider binaries
       run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }}
-        pulumi-gen-${{ env.PROVIDER}}
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

.github/workflows/prerelease.yml

@@ -71,7 +71,6 @@ jobs:
     - name: Tar provider binaries
       run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }}
-        pulumi-gen-${{ env.PROVIDER}}
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

.github/workflows/release.yml

@@ -72,7 +72,6 @@ jobs:
     - name: Tar provider binaries
       run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }}
-        pulumi-gen-${{ env.PROVIDER}}
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

.github/workflows/run-acceptance-tests.yml

@@ -96,7 +96,6 @@ jobs:
     - name: Tar provider binaries
       run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }}
-        pulumi-gen-${{ env.PROVIDER}}
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

Makefile

@@ -7,14 +7,10 @@ NODE_MODULE_NAME := @pulumi/command
 NUGET_PKG_NAME   := Pulumi.Command
 
 PROVIDER        := pulumi-resource-${PACK}
-CODEGEN         := pulumi-gen-${PACK}
 VERSION         ?= $(shell pulumictl get version)
 PROVIDER_PATH   := provider
 VERSION_PATH    := ${PROVIDER_PATH}/pkg/version.Version
 
-JAVA_GEN 		 := pulumi-java-gen
-JAVA_GEN_VERSION := v0.5.0
-
 SCHEMA_FILE     := provider/cmd/pulumi-resource-command/schema.json
 GOPATH			:= $(shell go env GOPATH)
 
@@ -27,7 +23,6 @@ ensure::
 	cd examples && go mod tidy
 
 codegen::
-	(cd provider && go build -o $(WORKING_DIR)/bin/${CODEGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/$(CODEGEN))
 	(cd provider && VERSION=${VERSION} go generate cmd/${PROVIDER}/main.go)
 
 provider::
@@ -42,19 +37,19 @@ test_provider::
 dotnet_sdk:: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
 dotnet_sdk::
 	rm -rf sdk/dotnet
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${DOTNET_VERSION} dotnet $(SCHEMA_FILE) $(CURDIR)
+	pulumi package gen-sdk --language dotnet $(SCHEMA_FILE)
 	cd ${PACKDIR}/dotnet/&& \
 		echo "${DOTNET_VERSION}" >version.txt && \
 		dotnet build /p:Version=${DOTNET_VERSION}
 
 go_sdk::
 	rm -rf sdk/go
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} go $(SCHEMA_FILE) $(CURDIR)
+	pulumi package gen-sdk --language go $(SCHEMA_FILE)
 
 nodejs_sdk:: VERSION := $(shell pulumictl get version --language javascript)
 nodejs_sdk::
 	rm -rf sdk/nodejs
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} nodejs $(SCHEMA_FILE) $(CURDIR)
+	pulumi package gen-sdk --language nodejs $(SCHEMA_FILE)
 	cd ${PACKDIR}/nodejs/ && \
 		yarn install && \
 		yarn run tsc
@@ -64,7 +59,7 @@ nodejs_sdk::
 python_sdk:: PYPI_VERSION := $(shell pulumictl get version --language python)
 python_sdk::
 	rm -rf sdk/python
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} python $(SCHEMA_FILE) $(CURDIR)
+	pulumi package gen-sdk --language python $(SCHEMA_FILE)
 	cp README.md ${PACKDIR}/python/
 	cd ${PACKDIR}/python/ && \
 		python3 setup.py clean --all 2>/dev/null && \
@@ -74,11 +69,12 @@ python_sdk::
 		cd ./bin && python3 setup.py build sdist
 
 bin/pulumi-java-gen::
-	$(shell pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java)
+	echo pulumi-java-gen is no longer necessary
 
 java_sdk:: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
-java_sdk:: bin/pulumi-java-gen
-	$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema $(SCHEMA_FILE) --out sdk/java  --build gradle-nexus
+java_sdk::
+	rm -rf sdk/java
+	pulumi package gen-sdk --language java $(SCHEMA_FILE)
 	cd sdk/java/ && \
 		gradle --console=plain build
 

provider/cmd/pulumi-gen-command/main.go

@@ -446,6 +446,14 @@
         }
     },
     "language": {
+        "java": {
+            "buildFiles": "gradle",
+            "dependencies": {
+                "com.pulumi:pulumi": "0.6.0",
+                "com.google.code.gson:gson": "2.8.9",
+                "com.google.code.findbugs:jsr305": "3.0.2"
+            }
+        },
         "csharp": {
             "packageReferences": {
                 "Pulumi": "3.*"

provider/cmd/pulumi-resource-command/schema.json

@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumigen. ***
+// *** WARNING: this file was generated by pulumi. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 using System;

sdk/dotnet/Local/Command.cs

@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumigen. ***
+// *** WARNING: this file was generated by pulumi. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 using System;

sdk/dotnet/Local/Run.cs

@@ -1,4 +1,4 @@
-// *** WARNING: this file was generated by pulumigen. ***
+// *** WARNING: this file was generated by pulumi. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 using System;