Go SDK provider (#156)

Rewrite Command Provider using the pulumi-go-provider library.
Co-authored-by: Ian Wahbe <[email protected]>

Author: Kyle Dixler

Makefile

@@ -7,6 +7,7 @@ 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
@@ -24,6 +25,8 @@ ensure::
 
 codegen::
 	(cd provider && VERSION=${VERSION} go generate cmd/${PROVIDER}/main.go)
+	(cd provider && go build -o $(WORKING_DIR)/bin/${CODEGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/$(CODEGEN))
+	$(WORKING_DIR)/bin/${CODEGEN} $(SCHEMA_FILE) --version ${VERSION} 
 
 provider::
 	(cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" $(PROJECT)/${PROVIDER_PATH}/cmd/$(PROVIDER))

README.md

@@ -53,7 +53,7 @@ import (
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
 
-		random, err := local.NewCommand(ctx, "my-bucket", &local.CommandArgs{
+		random, err := local.NewCommand(ctx, "my-bucket", &local.CommandInput{
 			Create: pulumi.String("openssl rand -hex 16"),
 		})
 		if err != nil {
@@ -116,7 +116,7 @@ const server = new aws.ec2.Instance("server", {
 
 // Now set up a connection to the instance and run some provisioning operations on the instance.
 
-const connection: types.input.remote.ConnectionArgs = {
+const connection: types.input.remote.ConnectionInput = {
     host: server.publicIp,
     user: "ec2-user",
     privateKey: privateKey,

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

@@ -0,0 +1,94 @@
+// Copyright 2016-2022, Pulumi Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+
+	command "github.com/pulumi/pulumi-command/provider/pkg/provider"
+	providerVersion "github.com/pulumi/pulumi-command/provider/pkg/version"
+)
+
+// copied from encoding/json for use with JSONMarshal above
+func MarshalIndent(v any) ([]byte, error) {
+
+	// json.Marshal normally escapes HTML. This one doesn't
+	// https://stackoverflow.com/questions/28595664/how-to-stop-json-marshal-from-escaping-and
+	buffer := &bytes.Buffer{}
+	encoder := json.NewEncoder(buffer)
+	encoder.SetEscapeHTML(false)
+	err := encoder.Encode(v)
+	if err != nil {
+		return nil, err
+	}
+	b := buffer.Bytes()
+
+	// serialize and pretty print
+	var buf bytes.Buffer
+	prefix, indent := "", "    "
+	err = json.Indent(&buf, b, prefix, indent)
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func main() {
+	flag.Usage = func() {
+		const usageFormat = "Usage: %s <schema-file>"
+		fmt.Fprintf(flag.CommandLine.Output(), usageFormat, os.Args[0])
+		flag.PrintDefaults()
+	}
+
+	var version string
+	flag.StringVar(&version, "version", providerVersion.Version, "the provider version to record in the generated code")
+
+	flag.Parse()
+	args := flag.Args()
+	if len(args) < 1 {
+		flag.Usage()
+		return
+	}
+	s, err := command.Schema(version)
+	if err != nil {
+		panic(err)
+	}
+
+	// sort keys
+	var arg map[string]any
+	err = json.Unmarshal([]byte(s), &arg)
+	if err != nil {
+		panic(err)
+	}
+
+	// remove version key
+	delete(arg, "version")
+
+	// use custom marshal indent to skip html escaping
+	out, err := MarshalIndent(arg)
+	if err != nil {
+		panic(err)
+	}
+
+	schemaPath := args[0]
+	err = os.WriteFile(schemaPath, out, 0600)
+	if err != nil {
+		panic(err)
+	}
+}

provider/cmd/pulumi-resource-command/generate.go

@@ -1,4 +1,4 @@
-// Copyright 2016-2021, Pulumi Corporation.
+// Copyright 2016-2022, Pulumi Corporation.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,20 +12,34 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run ./generate.go
-
 package main
 
 import (
-	_ "embed"
+	"fmt"
+	"os"
+	"strings"
+
+	p "github.com/pulumi/pulumi-go-provider"
 
-	"github.com/pulumi/pulumi-command/provider/pkg/provider"
+	command "github.com/pulumi/pulumi-command/provider/pkg/provider"
 	"github.com/pulumi/pulumi-command/provider/pkg/version"
 )
 
-//go:embed schema-embed.json
-var pulumiSchema []byte
-
+// A provider is a program that listens for requests from the Pulumi engine
+// to interact with cloud providers using a CRUD-based model.
 func main() {
-	provider.Serve("command", version.Version, pulumiSchema)
+	version := version.Version
+	if strings.HasPrefix(version, "v") {
+		version = version[1:]
+	}
+
+	// This method defines the provider implemented in this repository.
+	commandProvider := command.NewProvider()
+
+	// This method starts serving requests using the Command provider.
+	err := p.RunProvider("command", version, commandProvider)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: %s", err.Error())
+		os.Exit(1)
+	}
 }