diff --git a/misc/test/Gopkg.lock b/misc/test/Gopkg.lock index 70b64d6a8..3aa8c7076 100644 --- a/misc/test/Gopkg.lock +++ b/misc/test/Gopkg.lock @@ -101,6 +101,15 @@ revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363" version = "v1.13.1" +[[projects]] + name = "github.com/dustin/go-humanize" + packages = [ + ".", + "english" + ] + revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e" + version = "v1.0.0" + [[projects]] name = "github.com/emirpasic/gods" packages = [ @@ -176,12 +185,36 @@ packages = ["."] revision = "0b12d6b5" +[[projects]] + branch = "master" + name = "github.com/kballard/go-shellquote" + packages = ["."] + revision = "95032a82bc518f77982ea72343cc1ade730072f0" + [[projects]] name = "github.com/kevinburke/ssh_config" packages = ["."] revision = "9fc7bb800b555d63157c65a904c86a2cc7b4e795" version = "0.4" +[[projects]] + name = "github.com/mattn/go-colorable" + packages = ["."] + revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" + version = "v0.0.9" + +[[projects]] + name = "github.com/mattn/go-isatty" + packages = ["."] + revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" + version = "v0.0.4" + +[[projects]] + branch = "master" + name = "github.com/mgutz/ansi" + packages = ["."] + revision = "9520e82c474b0a04dd04f8a40959027271bab992" + [[projects]] branch = "master" name = "github.com/mitchellh/go-homedir" @@ -227,8 +260,10 @@ name = "github.com/pulumi/pulumi" packages = [ "pkg/apitype", + "pkg/apitype/migrate", "pkg/backend", - "pkg/backend/local", + "pkg/backend/display", + "pkg/backend/filestate", "pkg/diag", "pkg/diag/colors", "pkg/encoding", @@ -237,6 +272,7 @@ "pkg/resource", "pkg/resource/config", "pkg/resource/deploy", + "pkg/resource/deploy/providers", "pkg/resource/graph", "pkg/resource/plugin", "pkg/resource/stack", @@ -244,6 +280,7 @@ "pkg/testing/integration", "pkg/tokens", "pkg/util/cancel", + "pkg/util/ciutil", "pkg/util/cmdutil", "pkg/util/contract", "pkg/util/fsutil", @@ -251,15 +288,15 @@ "pkg/util/httputil", "pkg/util/logging", "pkg/util/mapper", + "pkg/util/result", "pkg/util/retry", "pkg/util/rpcutil", "pkg/util/rpcutil/rpcerror", - "pkg/util/testutil", "pkg/version", "pkg/workspace", "sdk/proto/go" ] - revision = "015344ab0693ca433d211698eddc6a6a85588bf0" + revision = "676adf62b8d4d5dc83a7cf91eff0eb6d2eb1b9a8" [[projects]] branch = "master" @@ -267,6 +304,12 @@ packages = ["."] revision = "2ab6b7470a54bfa9b5b0289f9b4e8fc4839838f7" +[[projects]] + name = "github.com/satori/go.uuid" + packages = ["."] + revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" + version = "v1.2.0" + [[projects]] name = "github.com/sergi/go-diff" packages = ["diffmatchpatch"] @@ -302,6 +345,12 @@ revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" version = "v1.2.2" +[[projects]] + branch = "master" + name = "github.com/texttheater/golang-levenshtein" + packages = ["levenshtein"] + revision = "d188e65d659ef53fcdb0691c12f1bba64928b649" + [[projects]] name = "github.com/uber/jaeger-client-go" packages = [ @@ -442,6 +491,16 @@ revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8" version = "v1.13.0" +[[projects]] + name = "gopkg.in/AlecAivazis/survey.v1" + packages = [ + ".", + "core", + "terminal" + ] + revision = "fb519f89e19299d852ffdd9b734af122d2dcbd30" + version = "v1.7.0" + [[projects]] name = "gopkg.in/src-d/go-billy.v4" packages = [ diff --git a/misc/test/examples_test.go b/misc/test/examples_test.go index 8f9e14b91..12658ccb4 100644 --- a/misc/test/examples_test.go +++ b/misc/test/examples_test.go @@ -33,13 +33,13 @@ func TestExamples(t *testing.T) { } base := integration.ProgramTestOptions{ - Tracing: "https://tracing.pulumi-engineering.com/collector/api/v1/spans", + Tracing: "https://tracing.pulumi-engineering.com/collector/api/v1/spans", + ExpectRefreshChanges: true, } examples := []integration.ProgramTestOptions{ base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-js-s3-folder"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-js-s3-folder"), Config: map[string]string{ "aws:region": awsRegion, }, @@ -50,8 +50,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-js-s3-folder-component"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-js-s3-folder-component"), Config: map[string]string{ "aws:region": awsRegion, }, @@ -62,8 +61,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-js-webserver"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-js-webserver"), Config: map[string]string{ "aws:region": awsRegion, }, @@ -72,8 +70,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-js-webserver-component"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-js-webserver-component"), Config: map[string]string{ "aws:region": awsRegion, }, @@ -82,8 +79,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "azure-js-webserver"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "azure-js-webserver"), Config: map[string]string{ "azure:environment": azureEnviron, "username": "testuser", @@ -94,8 +90,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "azure-ts-functions"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "azure-ts-functions"), Config: map[string]string{ "azure:environment": azureEnviron, }, @@ -106,8 +101,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "azure-ts-appservice"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "azure-ts-appservice"), Config: map[string]string{ "azure:environment": azureEnviron, "sqlPassword": "2@Password@2", @@ -119,22 +113,20 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-ts-apigateway"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-ts-apigateway"), Config: map[string]string{ - "aws:region": awsRegion, + "aws:region": awsRegion, }, ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) { maxWait := 10 * time.Minute endpoint := stack.Outputs["endpoint"].(string) - assertHTTPResultWithRetry(t, endpoint + "hello", maxWait, func(body string) bool { + assertHTTPResultWithRetry(t, endpoint+"hello", maxWait, func(body string) bool { return assert.Contains(t, body, "route") }) }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "aws-ts-ruby-on-rails"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "aws-ts-ruby-on-rails"), Config: map[string]string{ "aws:region": awsRegion, "dbUser": "testUser", @@ -151,8 +143,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "cloud-js-api"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "cloud-js-api"), Config: map[string]string{ "aws:region": awsRegion, }, @@ -163,8 +154,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "cloud-js-containers"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "cloud-js-containers"), Config: map[string]string{ // use us-west-2 to assure fargate "aws:region": "us-west-2", @@ -177,8 +167,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "cloud-js-httpserver"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "cloud-js-httpserver"), Config: map[string]string{ "cloud:provider": "aws", "aws:region": awsRegion, @@ -190,8 +179,7 @@ func TestExamples(t *testing.T) { }, }), base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "cloud-ts-url-shortener-cache-http"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "cloud-ts-url-shortener-cache-http"), Config: map[string]string{ // use us-west-2 to assure fargate "aws:region": "us-west-2", @@ -211,7 +199,6 @@ func TestExamples(t *testing.T) { // See the azure-ts-aks-example readme for more detail. // base.With(integration.ProgramTestOptions{ // Dir: path.Join(cwd, "..", "..", "azure-ts-aks-mean"), - // SkipBuild: true, // Config: map[string]string{ // "azure:environment": azureEnviron, // "password": "testTEST1234+_^$", @@ -229,7 +216,6 @@ func TestExamples(t *testing.T) { // Verbose: true, // DebugLogLevel: 8, // DebugUpdates: true, - // SkipBuild: true, // Config: map[string]string{ // "aws:region": awsRegion, // }, @@ -241,8 +227,7 @@ func TestExamples(t *testing.T) { longExamples := []integration.ProgramTestOptions{ base.With(integration.ProgramTestOptions{ - Dir: path.Join(cwd, "..", "..", "azure-ts-aks-helm"), - SkipBuild: true, + Dir: path.Join(cwd, "..", "..", "azure-ts-aks-helm"), Config: map[string]string{ "azure:environment": azureEnviron, "password": "testTEST1234+_^$",