Update and clean up examples (#519)

* Remove outdated AWS container registry tests * disambiguate test name * Update versions and clarify purpose for target test * Update package versions for nginx-go * Update versions and disambiguate nginx test name
pulumi · Mar 7, 2023 · 24658ab · 24658ab
1 parent aedffd8
commit 24658ab
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 139 deletions.
diff --git a/examples/aws/Pulumi.yaml b/examples/aws/Pulumi.yaml
diff --git a/examples/aws/app/Dockerfile b/examples/aws/app/Dockerfile
diff --git a/examples/aws/app/Dockerfile-multistage b/examples/aws/app/Dockerfile-multistage
diff --git a/examples/aws/app/content/index.html b/examples/aws/app/content/index.html
diff --git a/examples/aws/index.ts b/examples/aws/index.ts
diff --git a/examples/aws/package.json b/examples/aws/package.json
diff --git a/...les/dockerfile-with-targets/.dockerignore → ...ples/dockerfile-with-target/.dockerignore b/...les/dockerfile-with-targets/.dockerignore → ...ples/dockerfile-with-target/.dockerignore
diff --git a/examples/dockerfile-with-targets/Dockerfile → examples/dockerfile-with-target/Dockerfile b/examples/dockerfile-with-targets/Dockerfile → examples/dockerfile-with-target/Dockerfile
diff --git a/examples/dockerfile-with-targets/Pulumi.yaml → examples/dockerfile-with-target/Pulumi.yaml b/examples/dockerfile-with-targets/Pulumi.yaml → examples/dockerfile-with-target/Pulumi.yaml
diff --git a/examples/dockerfile-with-targets/index.ts → examples/dockerfile-with-target/index.ts b/examples/dockerfile-with-targets/index.ts → examples/dockerfile-with-target/index.ts
diff --git a/...ples/dockerfile-with-targets/package.json → examples/dockerfile-with-target/package.json b/...ples/dockerfile-with-targets/package.json → examples/dockerfile-with-target/package.json
@@ -1,9 +1,9 @@
 {
     "name": "dockerfile-with-targets",
     "devDependencies": {
-        "@types/node": "^10.0.0"
+        "@types/node": "^14.0.0"
     },
     "dependencies": {
-        "@pulumi/pulumi": "^3.0.0-alpha.0"
+        "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/examples/aws/tsconfig.json → ...ples/dockerfile-with-target/tsconfig.json b/examples/aws/tsconfig.json → ...ples/dockerfile-with-target/tsconfig.json
diff --git a/examples/dockerfile-with-targets/tsconfig.json b/examples/dockerfile-with-targets/tsconfig.json
diff --git a/examples/examples_dotnet_test.go b/examples/examples_dotnet_test.go
@@ -74,7 +74,7 @@ func TestAwsContainerRegistryDotnet(t *testing.T) {
 	integration.ProgramTest(t, &test)
 }
 
-func TestDigitaloceanContainerRegistry(t *testing.T) {
+func TestDigitaloceanContainerRegistryDotnet(t *testing.T) {
 	token := os.Getenv("DIGITALOCEAN_TOKEN")
 	if token == "" {
 		t.Skipf("Skipping test due to missing DIGITALOCEAN_TOKEN environment variable")

diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
@@ -17,34 +17,14 @@
 package examples
 
 import (
-	"fmt"
 	"os"
 	"path"
 	"testing"
 
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 )
 
-func TestAws(t *testing.T) {
-	t.Skip("Skipping test due to updates in Image resource")
-	region := os.Getenv("AWS_REGION")
-	if region == "" {
-		t.Skipf("Skipping test due to missing AWS_REGION environment variable")
-	}
-	fmt.Printf("AWS Region: %v\n", region)
-
-	test := getJsOptions(t).
-		With(integration.ProgramTestOptions{
-			Config: map[string]string{
-				"aws:region": region,
-			},
-			Dir: path.Join(getCwd(t), "aws"),
-		})
-
-	integration.ProgramTest(t, &test)
-}
-
-func TestNginx(t *testing.T) {
+func TestNginxTs(t *testing.T) {
 	test := getJsOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: path.Join(getCwd(t), "nginx"),
@@ -53,10 +33,10 @@ func TestNginx(t *testing.T) {
 	integration.ProgramTest(t, &test)
 }
 
-func TestDockerfileWithMultipleTargets(t *testing.T) {
+func TestDockerfileWithTarget(t *testing.T) {
 	test := getJsOptions(t).
 		With(integration.ProgramTestOptions{
-			Dir: path.Join(getCwd(t), "dockerfile-with-targets"),
+			Dir: path.Join(getCwd(t), "dockerfile-with-target"),
 		})
 
 	integration.ProgramTest(t, &test)

diff --git a/examples/nginx-go/main.go b/examples/nginx-go/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi-docker/sdk/v2/go/docker"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi-docker/sdk/v4/go/docker"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {

diff --git a/examples/nginx/package.json b/examples/nginx/package.json
@@ -1,9 +1,9 @@
 {
     "name": "nginx",
     "devDependencies": {
-        "@types/node": "^8.0.0"
+        "@types/node": "^14.0.0"
     },
     "dependencies": {
-        "@pulumi/pulumi": "^3.0.0-alpha.0"
+        "@pulumi/pulumi": "^3.0.0"
     }
 }