Housekeeping (#8)

* Rename the provider to dockerbuild.
* Add Makefile targets required by CI.
* Add per-language test targets compatible with CI.
* Fix broken example yaml.
* Add gitignore exclusions to fix SDK generation in CI.
* Fix lint errors.
* Vendor pulumi CLI via `tools.go` instead of `.pulumi`.
* Consolidate `go.mod`s into one file, with a minimal `go.mod` for the
Go SDK.
* Add codecov.

examples/dotnet/Program.cs

@@ -1,21 +1,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using Pulumi;
-using DockerNative = Pulumi.DockerNative;
+using Dockerbuild = Pulumi.Dockerbuild;
 
 return await Deployment.RunAsync(() => 
 {
-    var myRandomResource = new DockerNative.Random("myRandomResource", new()
+    var myRandomResource = new Dockerbuild.Random("myRandomResource", new()
     {
         Length = 24,
     });
 
     return new Dictionary<string, object?>
     {
-        ["output"] = 
-        {
-            { "value", myRandomResource.Result },
-        },
+        ["value"] = myRandomResource.Result,
     };
 });
 

examples/dotnet/Pulumi.yaml

@@ -1,6 +1,6 @@
-name: provider-docker-native
+name: provider-dockerbuild
 runtime: dotnet
 plugins:
   providers:
-    - name: docker-native
+    - name: dockerbuild
       path: ../../bin

examples/dotnet/provider-dockerbuild.csproj

@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="Pulumi.DockerNative" Version="0.0.1-alpha.1709857395+e809180b" />
+		<PackageReference Include="Pulumi.Dockerbuild" Version="*" />
 	</ItemGroup>
 
-</Project>
+</Project>

examples/dotnet_test.go

@@ -0,0 +1,39 @@
+//go:build dotnet || all
+// +build dotnet all
+
+package examples
+
+import (
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDotNetExample(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	nuget := filepath.Join(cwd, "../nuget")
+	t.Setenv("PULUMI_LOCAL_NUGET", nuget)
+
+	cmd := exec.Command("dotnet", "nuget", "add", "source", nuget)
+	_ = cmd.Run()
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "dotnet"),
+		Dependencies: []string{
+			"Pulumi.Dockerbuild",
+		},
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+		NoParallel: true,
+	}
+
+	integration.ProgramTest(t, &test)
+}

examples/go/Pulumi.yaml

@@ -1,6 +1,6 @@
-name: provider-docker-native
+name: provider-dockerbuild
 runtime: go
 plugins:
   providers:
-    - name: docker-native
+    - name: dockerbuild
       path: ../../bin

examples/go/go.mod

@@ -1,92 +1,7 @@
-module provider-docker-native
+module provider-dockerbuild
 
-go 1.21
+go 1.20
 
 require (
-	github.com/pulumi/pulumi-docker-native/sdk v0.0.0-20240308002904-3d6936144927
-	github.com/pulumi/pulumi/sdk/v3 v3.108.1
-)
-
-require (
-	dario.cat/mergo v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
-	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
-	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/charmbracelet/bubbles v0.16.1 // indirect
-	github.com/charmbracelet/bubbletea v0.24.2 // indirect
-	github.com/charmbracelet/lipgloss v0.7.1 // indirect
-	github.com/cheggaaa/pb v1.0.29 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/djherbis/times v1.5.0 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.11.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.1.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mitchellh/go-ps v1.0.0 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
-	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.15.2 // indirect
-	github.com/opentracing/basictracer-go v1.1.0 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pgavlin/fx v0.1.6 // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg/term v1.1.0 // indirect
-	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
-	github.com/pulumi/esc v0.6.2 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
-	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
-	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/skeema/knownhosts v1.2.1 // indirect
-	github.com/spf13/cobra v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/texttheater/golang-levenshtein v1.0.1 // indirect
-	github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
-	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
-	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	github.com/zclconf/go-cty v1.13.2 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/grpc v1.57.1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/frand v1.4.2 // indirect
+	github.com/pulumi/pulumi/sdk/v3 v3.111.1
 )

examples/go/main.go

@@ -1,21 +1,19 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi-docker-native/sdk/go/docker"
+	"github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
-		myRandomResource, err := docker.NewRandom(ctx, "myRandomResource", &docker.RandomArgs{
+		myRandomResource, err := dockerbuild.NewRandom(ctx, "myRandomResource", &dockerbuild.RandomArgs{
 			Length: pulumi.Int(24),
 		})
 		if err != nil {
 			return err
 		}
-		ctx.Export("output", map[string]interface{}{
-			"value": myRandomResource.Result,
-		})
+		ctx.Export("value", myRandomResource.Result)
 		return nil
 	})
 }

examples/go_test.go

@@ -0,0 +1,30 @@
+//go:build go || all
+// +build go all
+
+package examples
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGoExample(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "go"),
+		Dependencies: []string{
+			"github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild=../sdk/go/dockerbuild",
+		},
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}

examples/java/Pulumi.yaml

@@ -0,0 +1,6 @@
+name: provider-dockerbuild
+runtime: java
+plugins:
+  providers:
+    - name: dockerbuild
+      path: ../../bin

examples/java/pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+		<project xmlns="http://maven.apache.org/POM/4.0.0"
+				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+			<modelVersion>4.0.0</modelVersion>
+
+			<groupId>com.pulumi</groupId>
+			<artifactId>provider-dockerbuild</artifactId>
+			<version>1.0-SNAPSHOT</version>
+
+			<properties>
+				<encoding>UTF-8</encoding>
+				<maven.compiler.source>11</maven.compiler.source>
+				<maven.compiler.target>11</maven.compiler.target>
+				<maven.compiler.release>11</maven.compiler.release>
+				<mainClass>generated_program.App</mainClass>
+				<mainArgs/>
+			</properties>
+
+			<dependencies>
+				<dependency>
+					<groupId>com.pulumi</groupId>
+					<artifactId>pulumi</artifactId>
+					<version>(,1.0]</version>
+				</dependency>
+				<dependency>
+            		<groupId>com.pulumi</groupId>
+            		<artifactId>dockerbuild</artifactId>
+                    <version>[0.0.0,)</version>
+        		</dependency>
+			</dependencies>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.2.2</version>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+									<mainClass>${mainClass}</mainClass>
+								</manifest>
+							</archive>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+									<mainClass>${mainClass}</mainClass>
+								</manifest>
+							</archive>
+							<descriptorRefs>
+								<descriptorRef>jar-with-dependencies</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+						<executions>
+							<execution>
+								<id>make-my-jar-with-dependencies</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>3.1.0</version>
+						<configuration>
+							<mainClass>${mainClass}</mainClass>
+							<commandlineArgs>${mainArgs}</commandlineArgs>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-wrapper-plugin</artifactId>
+						<version>3.1.1</version>
+						<configuration>
+							<mavenVersion>3.8.5</mavenVersion>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</project>

examples/java/src/main/java/generated_program/App.java

@@ -0,0 +1,27 @@
+package generated_program;
+
+import com.pulumi.Context;
+import com.pulumi.Pulumi;
+import com.pulumi.core.Output;
+import com.pulumi.dockerbuild.Random;
+import com.pulumi.dockerbuild.RandomArgs;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class App {
+    public static void main(String[] args) {
+        Pulumi.run(App::stack);
+    }
+
+    public static void stack(Context ctx) {
+        var myRandomResource = new Random("myRandomResource", RandomArgs.builder()        
+            .length(24)
+            .build());
+
+        ctx.export("value", myRandomResource.result());
+    }
+}

examples/java_test.go

@@ -0,0 +1,29 @@
+//go:build java || all
+// +build java all
+
+package examples
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestJavaExample(t *testing.T) {
+	t.Skip("not working yet")
+
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "java"),
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}

examples/nodejs/Pulumi.yaml

@@ -1,6 +1,6 @@
-name: provider-docker-native
+name: provider-dockerbuild
 runtime: nodejs
 plugins:
   providers:
-    - name: docker-native
+    - name: dockerbuild
       path: ../../bin

examples/nodejs/index.ts

@@ -1,7 +1,5 @@
 import * as pulumi from "@pulumi/pulumi";
-import * as docker_native from "@pulumi/docker-native";
+import * as dockerbuild from "@pulumi/dockerbuild";
 
-const myRandomResource = new docker_native.Random("myRandomResource", {length: 24});
-export const output = {
-    value: myRandomResource.result,
-};
+const myRandomResource = new dockerbuild.Random("myRandomResource", {length: 24});
+export const value = myRandomResource.result;

examples/nodejs/package.json

@@ -1,11 +1,11 @@
 {
-	"name": "provider-docker-native",
-	"devDependencies": {
-		"@types/node": "^14"
-	},
-	"dependencies": {
-		"typescript": "^4.0.0",
-		"@pulumi/pulumi": "^3.0.0",
-		"@pulumi/docker-native": "0.0.1-alpha.1709857395+e809180b"
-	}
-}
+  "name": "provider-dockerbuild",
+  "devDependencies": {
+    "@types/node": "^18"
+  },
+  "dependencies": {
+    "typescript": "^4.0.0",
+    "@pulumi/pulumi": "^3.0.0"
+  }
+}
+

examples/nodejs_test.go

@@ -0,0 +1,28 @@
+//go:build nodejs || all
+// +build nodejs all
+
+package examples
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNodeExample(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir:          path.Join(cwd, "nodejs"),
+		Dependencies: []string{"@pulumi/dockerbuild"},
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}

examples/python/Pulumi.yaml

@@ -1,6 +1,6 @@
-name: provider-docker-native
+name: provider-dockerbuild
 runtime: python
 plugins:
   providers:
-    - name: docker-native
+    - name: dockerbuild
       path: ../../bin

examples/python/__main__.py

@@ -1,7 +1,5 @@
 import pulumi
-import pulumi_docker_native as docker_native
+import pulumi_dockerbuild as dockerbuild
 
-my_random_resource = docker_native.Random("myRandomResource", length=24)
-pulumi.export("output", {
-    "value": my_random_resource.result,
-})
+my_random_resource = dockerbuild.Random("myRandomResource", length=24)
+pulumi.export("value", my_random_resource.result)

examples/python/requirements.txt

@@ -1,2 +1 @@
 pulumi>=3.0.0,<4.0.0
-pulumi-docker-native==0.0.1-alpha.1709857395+e809180b

examples/python_test.go

@@ -0,0 +1,30 @@
+//go:build python || all
+// +build python all
+
+package examples
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPythonExample(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "python"),
+		Dependencies: []string{
+			path.Join("..", "sdk", "python", "bin"),
+		},
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}

examples/yaml/Pulumi.yaml

@@ -1,16 +1,15 @@
-name: provider-docker-native
+name: provider-dockerbuild
 runtime: yaml
 plugins:
   providers:
-    - name: docker-native
+    - name: dockerbuild
       path: ../../bin
 
 resources:
   myRandomResource:
-    type: docker-native:Random
+    type: dockerbuild:Random
     properties:
       length: 24
 
 outputs:
-  output:
-    value: ${myRandomResource.result}
+  value: ${myRandomResource.result}

examples/yaml_test.go

@@ -0,0 +1,27 @@
+//go:build java || all
+// +build java all
+
+package examples
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func TestYAMLExample(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "yaml"),
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}