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.

Sign up for GitHub

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

Jump to bottom

Separate test definitions from test execution so that providers can use the definitions in their tests #1583

Merged
merged 10 commits into from
Feb 26, 2024
Merged

Separate test definitions from test execution so that providers can use the definitions in their tests #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ce673d
Split Azure test suite into native and classic for targeted testing f…
thomas11 Feb 4, 2024
51f2d25
Extract CS test config so the provider can reference it
thomas11 Feb 6, 2024
911b412
Proper Go module folder structure
thomas11 Feb 6, 2024
f354356
Separate test definitions from Go tests
thomas11 Feb 6, 2024
9f46bea
a little DRY
thomas11 Feb 6, 2024
77a5d5e
Add azure-classic, tagging, tests
thomas11 Feb 11, 2024
0739e55
Minor review feedback
thomas11 Feb 15, 2024
20e40fe
Build fixes
thomas11 Feb 15, 2024
edb9e70
Merge tests by cloud, typed tags with intersection semantics
thomas11 Feb 20, 2024
9f1d92c
Fix for App Service assertion
thomas11 Feb 22, 2024
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
31 changes: 16 additions & 15 deletions misc/test/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/pulumi/examples/misc/test/helpers"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/stretchr/testify/assert"
Expand All @@ -38,7 +39,7 @@ func TestAccAwsGoEks(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["url"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello Kubernetes bootcamp!")
})
},
Expand All @@ -63,7 +64,7 @@ func TestAccAwsGoS3FolderComponent(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["websiteUrl"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, world!")
})
},
Expand All @@ -79,7 +80,7 @@ func TestAccAwsGoWebserver(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["publicIp"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, World!")
})
},
Expand Down Expand Up @@ -108,7 +109,7 @@ func TestAccAwsJsContainers(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["frontendURL"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, Pulumi!")
})
},
Expand All @@ -122,7 +123,7 @@ func TestAccAwsJsS3FolderComponent(t *testing.T) {
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "..", "..", "aws-js-s3-folder-component"),
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
assertHTTPResult(t, stack.Outputs["websiteUrl"].(string), nil, func(body string) bool {
helpers.AssertHTTPResult(t, stack.Outputs["websiteUrl"].(string), nil, func(body string) bool {
return assert.Contains(t, body, "Hello, Pulumi!")
})
},
Expand All @@ -148,7 +149,7 @@ func TestAccAwsJsWebserver(t *testing.T) {
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "..", "..", "aws-js-webserver"),
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
assertHTTPHelloWorld(t, stack.Outputs["publicHostName"], nil)
helpers.AssertHTTPHelloWorld(t, stack.Outputs["publicHostName"], nil)
},
})

Expand All @@ -160,7 +161,7 @@ func TestAccAwsJsWebserverComponent(t *testing.T) {
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "..", "..", "aws-js-webserver-component"),
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
assertHTTPHelloWorld(t, stack.Outputs["webUrl"], nil)
helpers.AssertHTTPHelloWorld(t, stack.Outputs["webUrl"], nil)
},
})

Expand All @@ -174,7 +175,7 @@ func TestAccAwsApiGatewayPyRoutes(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["url"].(string)
assertHTTPResultWithRetry(t, endpoint+"lambda", nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint+"lambda", nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, API Gateway!")
})
},
Expand All @@ -190,7 +191,7 @@ func TestAccAwsApiGatewayTsRoutes(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["url"].(string)
assertHTTPResultWithRetry(t, endpoint+"lambda", nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint+"lambda", nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, API Gateway!")
})
},
Expand Down Expand Up @@ -227,7 +228,7 @@ func TestAccAwsGoAppSync(t *testing.T) {
// "x-api-key": key,
// }

// assertHTTPResultShapeWithRetry(t, finalURL, headersMap, maxWait, func(body string) bool {
// helpers.AssertHTTPResultShapeWithRetry(t, finalURL, headersMap, maxWait, func(body string) bool {
// return !strings.Contains(body, "AccessDeniedException")
// }, func(body string) bool {
// return assert.Contains(t, body, "FirstCorp")
Expand Down Expand Up @@ -282,7 +283,7 @@ func TestAccAwsPyWebserver(t *testing.T) {
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "..", "..", "aws-py-webserver"),
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
assertHTTPResult(t, "http:https://"+stack.Outputs["public_dns"].(string), nil, func(body string) bool {
helpers.AssertHTTPResult(t, "http:https://"+stack.Outputs["public_dns"].(string), nil, func(body string) bool {
return assert.Contains(t, body, "Hello, World!")
})
},
Expand Down Expand Up @@ -312,7 +313,7 @@ func TestAccAwsTsApiGateway(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["endpoint"].(string)
assertHTTPResultWithRetry(t, endpoint+"hello", nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint+"hello", nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "route")
})
},
Expand Down Expand Up @@ -350,7 +351,7 @@ func TestAccAwsTsContainers(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 15 * time.Minute
endpoint := stack.Outputs["frontendURL"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello, Pulumi!")
})
},
Expand Down Expand Up @@ -433,7 +434,7 @@ func TestAccAwsTsEksHelloWorld(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["serviceHostname"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Welcome to nginx")
})
},
Expand All @@ -449,7 +450,7 @@ func TestAccAwsTsHelloFargate(t *testing.T) {
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
maxWait := 10 * time.Minute
endpoint := stack.Outputs["url"].(string)
assertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
helpers.AssertHTTPResultWithRetry(t, endpoint, nil, maxWait, func(body string) bool {
return assert.Contains(t, body, "Hello World!")
})
},
Expand Down
Loading
Loading