Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and clean up examples #519

Merged
merged 5 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions examples/aws/Pulumi.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions examples/aws/app/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions examples/aws/app/Dockerfile-multistage

This file was deleted.

1 change: 0 additions & 1 deletion examples/aws/app/content/index.html

This file was deleted.

68 changes: 0 additions & 68 deletions examples/aws/index.ts

This file was deleted.

10 changes: 0 additions & 10 deletions examples/aws/package.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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"
}
}
18 changes: 0 additions & 18 deletions examples/dockerfile-with-targets/tsconfig.json

This file was deleted.

2 changes: 1 addition & 1 deletion examples/examples_dotnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
26 changes: 3 additions & 23 deletions examples/examples_nodejs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions examples/nginx-go/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/nginx/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}