Switch to pulumi-go-provider as a provider framework

.gradle/build.gradle

@@ -0,0 +1,105 @@
+// *** WARNING: this file was generated. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+plugins {
+    id("java-library")
+    id("maven-publish")
+}
+
+var gprUser = project.findProperty("gpr.user")  ?: System.getenv("GPR_USER")
+var gprToken = project.findProperty("gpr.token") ?: System.getenv("GPR_TOKEN")
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileJava {
+    options.fork = true
+    options.forkOptions.jvmArgs.addAll(["-Xmx4g"])
+}
+
+repositories {
+    maven { // The google mirror is less flaky than mavenCentral()
+        url("https://maven-central.storage-download.googleapis.com/maven2/")
+    }
+    mavenCentral()
+    mavenLocal()
+    if (gprUser) {
+        repositories {
+            maven {
+                url = uri("https://maven.pkg.github.com/pulumi/pulumi-java")
+                credentials {
+                    username = gprUser
+                    password = gprToken
+                }
+            }
+        }
+    }
+}
+
+var pulumiJavaSdkVersion = System.getenv("PULUMI_JAVA_SDK_VERSION") ?: "0.0.1"
+
+dependencies {
+    implementation "com.pulumi:pulumi:$pulumiJavaSdkVersion"
+    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    api("com.google.guava:guava:30.1-jre") // FIXME: do we really want to expose this dep?
+    api("com.google.code.gson:gson:2.8.6") // make sure we don't clash with grpc deps
+
+    implementation("com.google.protobuf:protobuf-java:3.12.0") // make sure we don't clash with grpc deps
+    implementation("com.google.protobuf:protobuf-java-util:3.12.0") // make sure we don't clash with grpc deps
+
+    def junitVersion = "5.7.2"
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:${junitVersion}")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
+    testImplementation("org.assertj:assertj-core:3.20.2")
+    testImplementation("org.mockito:mockito-core:3.12.4")
+}
+
+test {
+    useJUnitPlatform()
+	testLogging {
+		showStandardStreams = true
+        exceptionFormat = 'full'
+
+        // set options for log level LIFECYCLE
+        events = ['failed']
+
+        info {
+            events = ['failed', 'skipped']
+        }
+
+        debug {
+            events = ['started', 'skipped', 'failed']
+        }
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId = 'com.pulumi'
+            artifactId = 'pulumiservice'
+            version = System.getenv("SDK_VERSION") ?: "0.0.0-unset"
+            from components.java
+        }
+    }
+    // from https://docs.github.com/en/actions/publishing-packages/publishing-java-packages-with-gradle
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/pulumi/pulumi-pulumiservice"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
+
+javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
+}

.gradle/settings.gradle

@@ -0,0 +1,14 @@
+// *** WARNING: this file was generated. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+pluginManagement {
+  repositories {
+    maven { // The google mirror is less flaky than mavenCentral()
+      url("https://maven-central.storage-download.googleapis.com/maven2/")
+    }
+    gradlePluginPortal()
+  }
+}
+
+rootProject.name = "com.pulumi.pulumiservice"
+include("lib")

Makefile

@@ -7,7 +7,6 @@ NODE_MODULE_NAME := @pulumi/pulumi-service
 NUGET_PKG_NAME   := Pulumi.PulumiService
 
 PROVIDER        := pulumi-resource-${PACK}
-CODEGEN         := pulumi-gen-${PACK}
 VERSION         ?= $(shell pulumictl get version)
 PROVIDER_PATH   := provider
 VERSION_PATH     := ${PROVIDER_PATH}/pkg/version.Version
@@ -18,13 +17,21 @@ GOPATH			:= $(shell go env GOPATH)
 WORKING_DIR     := $(shell pwd)
 TESTPARALLELISM := 4
 
+# The pulumi binary to use during generation
+PULUMI := .pulumi/bin/pulumi
+
+export PULUMI_IGNORE_AMBIENT_PLUGINS = true
+
 ensure::
 	cd provider && go mod tidy
 	cd sdk && go mod tidy
 	cd examples && go mod tidy
 
 gen::
-	(cd provider && go build -o $(WORKING_DIR)/bin/${CODEGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/$(CODEGEN))
+
+build_sdks: dotnet_sdk go_sdk nodejs_sdk python_sdk java_sdk
+
+gen_sdk_prerequisites: $(PULUMI)
 
 provider::
 	(cd provider && VERSION=${VERSION} go generate cmd/${PROVIDER}/main.go)
@@ -36,32 +43,32 @@ provider_debug::
 test_provider::
 	cd provider/pkg && go test -short -v -count=1 -cover -timeout 2h -parallel ${TESTPARALLELISM} ./...
 
-dotnet_sdk:: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
-dotnet_sdk::
+dotnet_sdk: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
+dotnet_sdk: gen_sdk_prerequisites
 	rm -rf sdk/dotnet
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${DOTNET_VERSION} dotnet $(SCHEMA_FILE) $(CURDIR)
+	$(PULUMI) package gen-sdk $(SCHEMA_FILE) --language dotnet
 	cd ${PACKDIR}/dotnet/&& \
 		echo "${DOTNET_VERSION}" >version.txt && \
 		dotnet build /p:Version=${DOTNET_VERSION}
 
-go_sdk::
+go_sdk: gen_sdk_prerequisites
 	rm -rf sdk/go
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} go $(SCHEMA_FILE) $(CURDIR)
+	$(PULUMI) package gen-sdk $(SCHEMA_FILE) --language go
 
-nodejs_sdk:: VERSION := $(shell pulumictl get version --language javascript)
-nodejs_sdk::
+nodejs_sdk: VERSION := $(shell pulumictl get version --language javascript)
+nodejs_sdk: gen_sdk_prerequisites
 	rm -rf sdk/nodejs
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} nodejs $(SCHEMA_FILE) $(CURDIR)
+	$(PULUMI) package gen-sdk $(SCHEMA_FILE) --language nodejs
 	cd ${PACKDIR}/nodejs/ && \
 		yarn install && \
 		yarn run tsc && \
 		cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ && \
 		sed -i.bak -e 's/\$${VERSION}/$(VERSION)/g' ./bin/package.json
 
-python_sdk:: PYPI_VERSION := $(shell pulumictl get version --language python)
-python_sdk::
+python_sdk: PYPI_VERSION := $(shell pulumictl get version --language python)
+python_sdk: gen_sdk_prerequisites
 	rm -rf sdk/python
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} python $(SCHEMA_FILE) $(CURDIR)
+	$(PULUMI) package gen-sdk $(SCHEMA_FILE) --language python
 	cp README.md ${PACKDIR}/python/
 	cd ${PACKDIR}/python/ && \
 		python3 setup.py clean --all 2>/dev/null && \
@@ -70,16 +77,20 @@ python_sdk::
 		rm ./bin/setup.py.bak && \
 		cd ./bin && python3 setup.py build sdist
 
-java_sdk:: RESOURCE_FOLDER := src/main/resources/com/pulumi/pulumiservice
-java_sdk::
+GRADLE_DIR := $(WORKING_DIR)/.gradle
+GRADLE := $(GRADLE_DIR)/gradlew
+java_sdk: RESOURCE_FOLDER := src/main/resources/com/pulumi/pulumiservice
+java_sdk: gen_sdk_prerequisites
 	rm -rf sdk/java/{.gradle,build,src}
-	$(WORKING_DIR)/bin/$(CODEGEN) -version=${VERSION} java $(SCHEMA_FILE) $(CURDIR)
+	$(PULUMI) package gen-sdk $(SCHEMA_FILE) --language java
+	cp $(GRADLE_DIR)/settings.gradle sdk/java/settings.gradle
+	cp $(GRADLE_DIR)/build.gradle sdk/java/build.gradle
 	cd sdk/java && \
-      mkdir -p $(RESOURCE_FOLDER) && \
+	mkdir -p $(RESOURCE_FOLDER) && \
 	  echo "$(VERSION)" > $(RESOURCE_FOLDER)/version.txt && \
 	  echo '{"resource": true,"name": "pulumiservice","version": "$(VERSION)"}' > $(RESOURCE_FOLDER)/plugin.json && \
-	  PULUMI_JAVA_SDK_VERSION=0.10.0 ./gradlew --console=plain build && \
-	  PULUMI_JAVA_SDK_VERSION=0.10.0 ./gradlew --console=plain publishToMavenLocal
+	  PULUMI_JAVA_SDK_VERSION=0.10.0 $(GRADLE) --console=plain build && \
+	  PULUMI_JAVA_SDK_VERSION=0.10.0 $(GRADLE) --console=plain publishToMavenLocal
 
 .PHONY: build
 build:: gen provider dotnet_sdk go_sdk nodejs_sdk python_sdk java_sdk
@@ -96,7 +107,7 @@ lint::
 install:: install_nodejs_sdk install_dotnet_sdk
 	cp $(WORKING_DIR)/bin/${PROVIDER} ${GOPATH}/bin
 
-GO_TEST 	 := go test -v -count=1 -cover -timeout 2h -parallel ${TESTPARALLELISM}
+GO_TEST := go test -v -count=1 -cover -timeout 2h -parallel ${TESTPARALLELISM}
 
 install_dotnet_sdk::
 	rm -rf $(WORKING_DIR)/nuget/$(NUGET_PKG_NAME).*.nupkg
@@ -114,4 +125,22 @@ install_nodejs_sdk::
 	yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin
 
 install_java_sdk::
-	cd sdk/java && ./gradlew publishToMavenLocal
+	cd sdk/java && $(GRADLE) publishToMavenLocal
+
+
+# Keep the version of the pulumi binary used for code generation in sync with the version
+# of the dependency used by github.com/pulumi/pulumi-pulumiservice/provider
+
+$(PULUMI): HOME := $(WORKING_DIR)
+$(PULUMI): provider/go.mod
+	@ PULUMI_VERSION="$$(cd provider && go list -m github.com/pulumi/pulumi/pkg/v3 | awk '{print $$2}')"; \
+	if [ -x $(PULUMI) ]; then \
+		CURRENT_VERSION="$$($(PULUMI) version)"; \
+		if [ "$${CURRENT_VERSION}" != "$${PULUMI_VERSION}" ]; then \
+			echo "Upgrading $(PULUMI) from $${CURRENT_VERSION} to $${PULUMI_VERSION}"; \
+			rm $(PULUMI); \
+		fi; \
+	fi; \
+	if ! [ -x $(PULUMI) ]; then \
+		curl -fsSL https://get.pulumi.com | sh -s -- --version "$${PULUMI_VERSION#v}"; \
+	fi

examples/examples_yaml_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/pulumi/pulumi/pkg/v3/engine"
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 )
 
@@ -128,24 +129,20 @@ func TestYamlStackTagsExample(t *testing.T) {
 
 	// Set up tmpdir with a Pulumi.yml with no resources
 	// mimicking the deletion of resource
-	newProgram := YamlProgram{
+	tmpdir := writePulumiYaml(t, YamlProgram{
 		Name:        "yaml-stack-tags-example",
 		Runtime:     "yaml",
 		Description: "A minimal Pulumi YAML program",
-	}
-
-	tmpdir := writePulumiYaml(t, newProgram)
+		Runtime:     "yaml",
+	})
 
-	cwd, _ := os.Getwd()
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
 
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Quick:       true,
 		SkipRefresh: true,
 		Dir:         path.Join(cwd, ".", "yaml-stack-tags"),
-		StackName:   "test-stack",
-		PrepareProject: func(_ *engine.Projinfo) error {
-			return nil
-		},
 		EditDirs: []integration.EditDir{
 			{
 				Dir: tmpdir,
@@ -220,12 +217,7 @@ func TestYamlTeamStackPermissionsExample(t *testing.T) {
 	cwd, _ := os.Getwd()
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Quick: true,
-		// Name is specified in yaml-team-stack-permissions/Pulumi.yaml, so this has to be consistent
-		StackName: "dev",
-		Dir:       path.Join(cwd, ".", "yaml-team-stack-permissions"),
-		PrepareProject: func(_ *engine.Projinfo) error {
-			return nil
-		},
+		Dir:   path.Join(cwd, ".", "yaml-team-stack-permissions"),
 	})
 }
 

examples/yaml-stack-tags/Pulumi.yaml

@@ -7,6 +7,6 @@ resources:
     properties:
       organization: service-provider-test-org
       project: yaml-stack-tags-example
-      stack: test-stack
+      stack: ${pulumi.stack}
       name: testing-tag
       value: bar

examples/yaml-team-stack-permissions/Pulumi.yaml

@@ -24,7 +24,7 @@ resources:
     properties:
       organization: ${team.organizationName}
       project: yaml-team-stack-example
-      stack: dev
+      stack: ${pulumi.stack}
       team: ${team.name}
       # edit access
       permission: 102