From 3fad2e5329a5a851cd3913b54e26d2b2f64ba013 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Wed, 17 Mar 2021 11:58:46 +0000 Subject: [PATCH] Removing x namespace from go/python/nodejs automation packages (#6518) --- sdk/go/Makefile | 2 +- sdk/go/{x => }/auto/README.md | 4 ++-- sdk/go/{x => }/auto/cmd.go | 0 sdk/go/{x => }/auto/debug/debuglogging.go | 0 sdk/go/{x => }/auto/errors.go | 0 sdk/go/{x => }/auto/errors_test.go | 0 sdk/go/{x => }/auto/events/events.go | 0 sdk/go/{x => }/auto/example_test.go | 8 +++---- sdk/go/{x => }/auto/git.go | 0 sdk/go/{x => }/auto/local_workspace.go | 0 sdk/go/{x => }/auto/local_workspace_test.go | 10 ++++----- sdk/go/{x => }/auto/minimum_version.go | 0 sdk/go/{x => }/auto/optdestroy/optdestroy.go | 4 ++-- sdk/go/{x => }/auto/optpreview/optpreview.go | 4 ++-- sdk/go/{x => }/auto/optrefresh/optrefresh.go | 4 ++-- sdk/go/{x => }/auto/optup/optup.go | 4 ++-- sdk/go/{x => }/auto/stack.go | 12 +++++------ .../auto/test/correct_project/Pulumi.yaml | 0 .../compilation_error/dotnet/.gitignore | 0 .../compilation_error/dotnet/MyStack.cs | 0 .../compilation_error/dotnet/Program.cs | 0 .../compilation_error/dotnet/Pulumi.yaml | 0 .../compilation_error/dotnet/dotnet.csproj | 0 .../errors/compilation_error/go/Pulumi.yaml | 0 .../test/errors/compilation_error/go/go.mod | 0 .../test/errors/compilation_error/go/go.sum | 0 .../test/errors/compilation_error/go/main.go | 0 .../compilation_error/typescript/.gitignore | 0 .../compilation_error/typescript/Pulumi.yaml | 0 .../compilation_error/typescript/index.ts | 0 .../typescript/package-lock.json | 0 .../compilation_error/typescript/package.json | 0 .../typescript/tsconfig.json | 0 .../test/errors/conflict_error/Pulumi.yaml | 0 .../auto/test/errors/conflict_error/go.mod | 0 .../auto/test/errors/conflict_error/go.sum | 0 .../auto/test/errors/conflict_error/main.go | 0 .../errors/runtime_error/dotnet/.gitignore | 0 .../errors/runtime_error/dotnet/MyStack.cs | 0 .../errors/runtime_error/dotnet/Program.cs | 0 .../errors/runtime_error/dotnet/Pulumi.yaml | 0 .../runtime_error/dotnet/adsfsdf.csproj | 0 .../test/errors/runtime_error/go/Pulumi.yaml | 0 .../auto/test/errors/runtime_error/go/go.mod | 0 .../auto/test/errors/runtime_error/go/go.sum | 0 .../auto/test/errors/runtime_error/go/main.go | 0 .../runtime_error/javascript/.gitignore | 0 .../runtime_error/javascript/Pulumi.yaml | 0 .../errors/runtime_error/javascript/index.js | 0 .../javascript/package-lock.json | 0 .../runtime_error/javascript/package.json | 0 .../errors/runtime_error/python/.gitignore | 0 .../errors/runtime_error/python/Pulumi.yaml | 0 .../errors/runtime_error/python/__main__.py | 0 .../runtime_error/python/requirements.txt | 0 .../runtime_error/typescript/.gitignore | 0 .../runtime_error/typescript/Pulumi.yaml | 0 .../errors/runtime_error/typescript/index.ts | 0 .../typescript/package-lock.json | 0 .../runtime_error/typescript/package.json | 0 .../runtime_error/typescript/tsconfig.json | 0 .../auto/test/nested_config/Pulumi.dev.yaml | 0 .../auto/test/nested_config/Pulumi.yaml | 0 sdk/go/{x => }/auto/test/testproj/Pulumi.yaml | 0 sdk/go/{x => }/auto/test/testproj/go.mod | 0 sdk/go/{x => }/auto/test/testproj/go.sum | 0 sdk/go/{x => }/auto/test/testproj/main.go | 0 sdk/go/{x => }/auto/watcher.go | 2 +- sdk/go/{x => }/auto/workspace.go | 0 sdk/go/x/README.md | 3 --- sdk/go/x/x.go | 3 --- sdk/nodejs/{x => }/automation/cmd.ts | 0 sdk/nodejs/{x => }/automation/config.ts | 0 sdk/nodejs/{x => }/automation/errors.ts | 0 sdk/nodejs/{x => }/automation/events.ts | 0 sdk/nodejs/{x => }/automation/index.ts | 0 .../{x => }/automation/localWorkspace.ts | 0 .../{x => }/automation/minimumVersion.ts | 0 .../{x => }/automation/projectSettings.ts | 0 sdk/nodejs/{x => }/automation/server.ts | 10 ++++----- sdk/nodejs/{x => }/automation/stack.ts | 2 +- .../{x => }/automation/stackSettings.ts | 0 sdk/nodejs/{x => }/automation/workspace.ts | 0 sdk/nodejs/index.ts | 3 ++- .../tests/automation/localWorkspace.spec.ts | 2 +- sdk/nodejs/tsconfig.json | 21 +++++++++---------- sdk/nodejs/x/index.ts | 17 --------------- sdk/python/lib/pulumi/__init__.py | 4 ++-- .../lib/pulumi/{x => }/automation/__init__.py | 0 .../lib/pulumi/{x => }/automation/_cmd.py | 0 .../lib/pulumi/{x => }/automation/_config.py | 0 .../{x => }/automation/_local_workspace.py | 0 .../{x => }/automation/_minimum_version.py | 0 .../{x => }/automation/_project_settings.py | 0 .../lib/pulumi/{x => }/automation/_server.py | 8 +++---- .../lib/pulumi/{x => }/automation/_stack.py | 4 ++-- .../{x => }/automation/_stack_settings.py | 0 .../pulumi/{x => }/automation/_workspace.py | 0 .../lib/pulumi/{x => }/automation/errors.py | 0 .../lib/pulumi/{x => }/automation/events.py | 0 sdk/python/lib/pulumi/x/__init__.py | 15 ------------- sdk/python/lib/test/automation/test_errors.py | 2 +- .../test/automation/test_local_workspace.py | 2 +- 103 files changed, 56 insertions(+), 94 deletions(-) rename sdk/go/{x => }/auto/README.md (98%) rename sdk/go/{x => }/auto/cmd.go (100%) rename sdk/go/{x => }/auto/debug/debuglogging.go (100%) rename sdk/go/{x => }/auto/errors.go (100%) rename sdk/go/{x => }/auto/errors_test.go (100%) rename sdk/go/{x => }/auto/events/events.go (100%) rename sdk/go/{x => }/auto/example_test.go (99%) rename sdk/go/{x => }/auto/git.go (100%) rename sdk/go/{x => }/auto/local_workspace.go (100%) rename sdk/go/{x => }/auto/local_workspace_test.go (99%) rename sdk/go/{x => }/auto/minimum_version.go (100%) rename sdk/go/{x => }/auto/optdestroy/optdestroy.go (97%) rename sdk/go/{x => }/auto/optpreview/optpreview.go (97%) rename sdk/go/{x => }/auto/optrefresh/optrefresh.go (97%) rename sdk/go/{x => }/auto/optup/optup.go (97%) rename sdk/go/{x => }/auto/stack.go (99%) rename sdk/go/{x => }/auto/test/correct_project/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/dotnet/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/dotnet/MyStack.cs (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/dotnet/Program.cs (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/dotnet/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/dotnet/dotnet.csproj (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/go/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/go/go.mod (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/go/go.sum (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/go/main.go (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/index.ts (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/package-lock.json (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/package.json (100%) rename sdk/go/{x => }/auto/test/errors/compilation_error/typescript/tsconfig.json (100%) rename sdk/go/{x => }/auto/test/errors/conflict_error/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/conflict_error/go.mod (100%) rename sdk/go/{x => }/auto/test/errors/conflict_error/go.sum (100%) rename sdk/go/{x => }/auto/test/errors/conflict_error/main.go (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/dotnet/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/dotnet/MyStack.cs (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/dotnet/Program.cs (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/dotnet/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/go/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/go/go.mod (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/go/go.sum (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/go/main.go (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/javascript/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/javascript/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/javascript/index.js (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/javascript/package-lock.json (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/javascript/package.json (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/python/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/python/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/python/__main__.py (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/python/requirements.txt (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/.gitignore (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/index.ts (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/package-lock.json (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/package.json (100%) rename sdk/go/{x => }/auto/test/errors/runtime_error/typescript/tsconfig.json (100%) rename sdk/go/{x => }/auto/test/nested_config/Pulumi.dev.yaml (100%) rename sdk/go/{x => }/auto/test/nested_config/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/testproj/Pulumi.yaml (100%) rename sdk/go/{x => }/auto/test/testproj/go.mod (100%) rename sdk/go/{x => }/auto/test/testproj/go.sum (100%) rename sdk/go/{x => }/auto/test/testproj/main.go (100%) rename sdk/go/{x => }/auto/watcher.go (96%) rename sdk/go/{x => }/auto/workspace.go (100%) delete mode 100644 sdk/go/x/README.md delete mode 100644 sdk/go/x/x.go rename sdk/nodejs/{x => }/automation/cmd.ts (100%) rename sdk/nodejs/{x => }/automation/config.ts (100%) rename sdk/nodejs/{x => }/automation/errors.ts (100%) rename sdk/nodejs/{x => }/automation/events.ts (100%) rename sdk/nodejs/{x => }/automation/index.ts (100%) rename sdk/nodejs/{x => }/automation/localWorkspace.ts (100%) rename sdk/nodejs/{x => }/automation/minimumVersion.ts (100%) rename sdk/nodejs/{x => }/automation/projectSettings.ts (100%) rename sdk/nodejs/{x => }/automation/server.ts (95%) rename sdk/nodejs/{x => }/automation/stack.ts (99%) rename sdk/nodejs/{x => }/automation/stackSettings.ts (100%) rename sdk/nodejs/{x => }/automation/workspace.ts (100%) delete mode 100644 sdk/nodejs/x/index.ts rename sdk/python/lib/pulumi/{x => }/automation/__init__.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_cmd.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_config.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_local_workspace.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_minimum_version.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_project_settings.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_server.py (95%) rename sdk/python/lib/pulumi/{x => }/automation/_stack.py (99%) rename sdk/python/lib/pulumi/{x => }/automation/_stack_settings.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/_workspace.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/errors.py (100%) rename sdk/python/lib/pulumi/{x => }/automation/events.py (100%) delete mode 100644 sdk/python/lib/pulumi/x/__init__.py diff --git a/sdk/go/Makefile b/sdk/go/Makefile index a05b398f5..1663c8e11 100644 --- a/sdk/go/Makefile +++ b/sdk/go/Makefile @@ -1,7 +1,7 @@ PROJECT_NAME := Pulumi Go SDK LANGHOST_PKG := github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go VERSION := $(shell cd ../../ && pulumictl get version) -PROJECT_PKGS := $(shell go list ./pulumi/... ./pulumi-language-go/... ./common/... ./x/...| grep -v /vendor/ | grep -v templates) +PROJECT_PKGS := $(shell go list ./pulumi/... ./pulumi-language-go/... ./common/... ./auto/...| grep -v /vendor/ | grep -v templates) TESTPARALLELISM := 10 diff --git a/sdk/go/x/auto/README.md b/sdk/go/auto/README.md similarity index 98% rename from sdk/go/x/auto/README.md rename to sdk/go/auto/README.md index 1110f4341..70ccd7a08 100644 --- a/sdk/go/x/auto/README.md +++ b/sdk/go/auto/README.md @@ -5,7 +5,7 @@ Programmatic infrastructure. Currently in Alpha. ## Godocs See the full godocs for the most extensive and up to date information including full examples coverage: -https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/x/auto?tab=doc +https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/auto?tab=doc ## Examples @@ -107,7 +107,7 @@ This repo has extensive examples and godoc content. To test out your changes loc 1. enlist in the appropriate pulumi branch: 2. cd $GOPATH/src/github.com/pulumi/pulumi/sdk/go/x/auto 3. godoc -http=:6060 -4. Navigate to http://localhost:6060/pkg/github.com/pulumi/pulumi/sdk/v2/go/x/auto/ +4. Navigate to http://localhost:6060/pkg/github.com/pulumi/pulumi/sdk/v2/go/auto/ ## Known Issues diff --git a/sdk/go/x/auto/cmd.go b/sdk/go/auto/cmd.go similarity index 100% rename from sdk/go/x/auto/cmd.go rename to sdk/go/auto/cmd.go diff --git a/sdk/go/x/auto/debug/debuglogging.go b/sdk/go/auto/debug/debuglogging.go similarity index 100% rename from sdk/go/x/auto/debug/debuglogging.go rename to sdk/go/auto/debug/debuglogging.go diff --git a/sdk/go/x/auto/errors.go b/sdk/go/auto/errors.go similarity index 100% rename from sdk/go/x/auto/errors.go rename to sdk/go/auto/errors.go diff --git a/sdk/go/x/auto/errors_test.go b/sdk/go/auto/errors_test.go similarity index 100% rename from sdk/go/x/auto/errors_test.go rename to sdk/go/auto/errors_test.go diff --git a/sdk/go/x/auto/events/events.go b/sdk/go/auto/events/events.go similarity index 100% rename from sdk/go/x/auto/events/events.go rename to sdk/go/auto/events/events.go diff --git a/sdk/go/x/auto/example_test.go b/sdk/go/auto/example_test.go similarity index 99% rename from sdk/go/x/auto/example_test.go rename to sdk/go/auto/example_test.go index 7d15acdeb..314d79561 100644 --- a/sdk/go/x/auto/example_test.go +++ b/sdk/go/auto/example_test.go @@ -25,14 +25,14 @@ import ( "os/exec" "path/filepath" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optdestroy" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optpreview" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optrefresh" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optup" "github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v2/go/pulumi" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optdestroy" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optpreview" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optrefresh" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optup" ) func Example() { diff --git a/sdk/go/x/auto/git.go b/sdk/go/auto/git.go similarity index 100% rename from sdk/go/x/auto/git.go rename to sdk/go/auto/git.go diff --git a/sdk/go/x/auto/local_workspace.go b/sdk/go/auto/local_workspace.go similarity index 100% rename from sdk/go/x/auto/local_workspace.go rename to sdk/go/auto/local_workspace.go diff --git a/sdk/go/x/auto/local_workspace_test.go b/sdk/go/auto/local_workspace_test.go similarity index 99% rename from sdk/go/x/auto/local_workspace_test.go rename to sdk/go/auto/local_workspace_test.go index c09f4be3e..95c8a31e4 100644 --- a/sdk/go/x/auto/local_workspace_test.go +++ b/sdk/go/auto/local_workspace_test.go @@ -29,16 +29,16 @@ import ( "github.com/blang/semver" "github.com/stretchr/testify/assert" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optdestroy" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optpreview" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optrefresh" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optup" "github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v2/go/pulumi" "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optdestroy" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optpreview" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optrefresh" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optup" ) var pulumiOrg = getTestOrg() diff --git a/sdk/go/x/auto/minimum_version.go b/sdk/go/auto/minimum_version.go similarity index 100% rename from sdk/go/x/auto/minimum_version.go rename to sdk/go/auto/minimum_version.go diff --git a/sdk/go/x/auto/optdestroy/optdestroy.go b/sdk/go/auto/optdestroy/optdestroy.go similarity index 97% rename from sdk/go/x/auto/optdestroy/optdestroy.go rename to sdk/go/auto/optdestroy/optdestroy.go index 61186647a..a40cf2f5e 100644 --- a/sdk/go/x/auto/optdestroy/optdestroy.go +++ b/sdk/go/auto/optdestroy/optdestroy.go @@ -19,8 +19,8 @@ package optdestroy import ( "io" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/debug" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/debug" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" ) // Parallel is the number of resource operations to run in parallel at once during the destroy diff --git a/sdk/go/x/auto/optpreview/optpreview.go b/sdk/go/auto/optpreview/optpreview.go similarity index 97% rename from sdk/go/x/auto/optpreview/optpreview.go rename to sdk/go/auto/optpreview/optpreview.go index 020193cd1..c617e08f9 100644 --- a/sdk/go/x/auto/optpreview/optpreview.go +++ b/sdk/go/auto/optpreview/optpreview.go @@ -19,8 +19,8 @@ package optpreview import ( "io" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/debug" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/debug" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" ) // Parallel is the number of resource operations to run in parallel at once during the update diff --git a/sdk/go/x/auto/optrefresh/optrefresh.go b/sdk/go/auto/optrefresh/optrefresh.go similarity index 97% rename from sdk/go/x/auto/optrefresh/optrefresh.go rename to sdk/go/auto/optrefresh/optrefresh.go index 3d5f2fea4..b17626f00 100644 --- a/sdk/go/x/auto/optrefresh/optrefresh.go +++ b/sdk/go/auto/optrefresh/optrefresh.go @@ -19,8 +19,8 @@ package optrefresh import ( "io" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/debug" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/debug" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" ) // Parallel is the number of resource operations to run in parallel at once during the refresh diff --git a/sdk/go/x/auto/optup/optup.go b/sdk/go/auto/optup/optup.go similarity index 97% rename from sdk/go/x/auto/optup/optup.go rename to sdk/go/auto/optup/optup.go index c1c278954..c9bf1b4cd 100644 --- a/sdk/go/x/auto/optup/optup.go +++ b/sdk/go/auto/optup/optup.go @@ -19,8 +19,8 @@ package optup import ( "io" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/debug" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/debug" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" ) // Parallel is the number of resource operations to run in parallel at once during the update diff --git a/sdk/go/x/auto/stack.go b/sdk/go/auto/stack.go similarity index 99% rename from sdk/go/x/auto/stack.go rename to sdk/go/auto/stack.go index 6dc2c2c26..abb01696e 100644 --- a/sdk/go/x/auto/stack.go +++ b/sdk/go/auto/stack.go @@ -105,18 +105,18 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" + "github.com/pulumi/pulumi/sdk/v2/go/auto/debug" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optdestroy" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optpreview" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optrefresh" + "github.com/pulumi/pulumi/sdk/v2/go/auto/optup" "github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v2/go/common/constant" "github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil" "github.com/pulumi/pulumi/sdk/v2/go/pulumi" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/debug" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optdestroy" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optpreview" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optrefresh" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/optup" pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go" ) diff --git a/sdk/go/x/auto/test/correct_project/Pulumi.yaml b/sdk/go/auto/test/correct_project/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/correct_project/Pulumi.yaml rename to sdk/go/auto/test/correct_project/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/compilation_error/dotnet/.gitignore b/sdk/go/auto/test/errors/compilation_error/dotnet/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/dotnet/.gitignore rename to sdk/go/auto/test/errors/compilation_error/dotnet/.gitignore diff --git a/sdk/go/x/auto/test/errors/compilation_error/dotnet/MyStack.cs b/sdk/go/auto/test/errors/compilation_error/dotnet/MyStack.cs similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/dotnet/MyStack.cs rename to sdk/go/auto/test/errors/compilation_error/dotnet/MyStack.cs diff --git a/sdk/go/x/auto/test/errors/compilation_error/dotnet/Program.cs b/sdk/go/auto/test/errors/compilation_error/dotnet/Program.cs similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/dotnet/Program.cs rename to sdk/go/auto/test/errors/compilation_error/dotnet/Program.cs diff --git a/sdk/go/x/auto/test/errors/compilation_error/dotnet/Pulumi.yaml b/sdk/go/auto/test/errors/compilation_error/dotnet/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/dotnet/Pulumi.yaml rename to sdk/go/auto/test/errors/compilation_error/dotnet/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/compilation_error/dotnet/dotnet.csproj b/sdk/go/auto/test/errors/compilation_error/dotnet/dotnet.csproj similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/dotnet/dotnet.csproj rename to sdk/go/auto/test/errors/compilation_error/dotnet/dotnet.csproj diff --git a/sdk/go/x/auto/test/errors/compilation_error/go/Pulumi.yaml b/sdk/go/auto/test/errors/compilation_error/go/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/go/Pulumi.yaml rename to sdk/go/auto/test/errors/compilation_error/go/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/compilation_error/go/go.mod b/sdk/go/auto/test/errors/compilation_error/go/go.mod similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/go/go.mod rename to sdk/go/auto/test/errors/compilation_error/go/go.mod diff --git a/sdk/go/x/auto/test/errors/compilation_error/go/go.sum b/sdk/go/auto/test/errors/compilation_error/go/go.sum similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/go/go.sum rename to sdk/go/auto/test/errors/compilation_error/go/go.sum diff --git a/sdk/go/x/auto/test/errors/compilation_error/go/main.go b/sdk/go/auto/test/errors/compilation_error/go/main.go similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/go/main.go rename to sdk/go/auto/test/errors/compilation_error/go/main.go diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/.gitignore b/sdk/go/auto/test/errors/compilation_error/typescript/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/.gitignore rename to sdk/go/auto/test/errors/compilation_error/typescript/.gitignore diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/Pulumi.yaml b/sdk/go/auto/test/errors/compilation_error/typescript/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/Pulumi.yaml rename to sdk/go/auto/test/errors/compilation_error/typescript/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/index.ts b/sdk/go/auto/test/errors/compilation_error/typescript/index.ts similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/index.ts rename to sdk/go/auto/test/errors/compilation_error/typescript/index.ts diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/package-lock.json b/sdk/go/auto/test/errors/compilation_error/typescript/package-lock.json similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/package-lock.json rename to sdk/go/auto/test/errors/compilation_error/typescript/package-lock.json diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/package.json b/sdk/go/auto/test/errors/compilation_error/typescript/package.json similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/package.json rename to sdk/go/auto/test/errors/compilation_error/typescript/package.json diff --git a/sdk/go/x/auto/test/errors/compilation_error/typescript/tsconfig.json b/sdk/go/auto/test/errors/compilation_error/typescript/tsconfig.json similarity index 100% rename from sdk/go/x/auto/test/errors/compilation_error/typescript/tsconfig.json rename to sdk/go/auto/test/errors/compilation_error/typescript/tsconfig.json diff --git a/sdk/go/x/auto/test/errors/conflict_error/Pulumi.yaml b/sdk/go/auto/test/errors/conflict_error/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/conflict_error/Pulumi.yaml rename to sdk/go/auto/test/errors/conflict_error/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/conflict_error/go.mod b/sdk/go/auto/test/errors/conflict_error/go.mod similarity index 100% rename from sdk/go/x/auto/test/errors/conflict_error/go.mod rename to sdk/go/auto/test/errors/conflict_error/go.mod diff --git a/sdk/go/x/auto/test/errors/conflict_error/go.sum b/sdk/go/auto/test/errors/conflict_error/go.sum similarity index 100% rename from sdk/go/x/auto/test/errors/conflict_error/go.sum rename to sdk/go/auto/test/errors/conflict_error/go.sum diff --git a/sdk/go/x/auto/test/errors/conflict_error/main.go b/sdk/go/auto/test/errors/conflict_error/main.go similarity index 100% rename from sdk/go/x/auto/test/errors/conflict_error/main.go rename to sdk/go/auto/test/errors/conflict_error/main.go diff --git a/sdk/go/x/auto/test/errors/runtime_error/dotnet/.gitignore b/sdk/go/auto/test/errors/runtime_error/dotnet/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/dotnet/.gitignore rename to sdk/go/auto/test/errors/runtime_error/dotnet/.gitignore diff --git a/sdk/go/x/auto/test/errors/runtime_error/dotnet/MyStack.cs b/sdk/go/auto/test/errors/runtime_error/dotnet/MyStack.cs similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/dotnet/MyStack.cs rename to sdk/go/auto/test/errors/runtime_error/dotnet/MyStack.cs diff --git a/sdk/go/x/auto/test/errors/runtime_error/dotnet/Program.cs b/sdk/go/auto/test/errors/runtime_error/dotnet/Program.cs similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/dotnet/Program.cs rename to sdk/go/auto/test/errors/runtime_error/dotnet/Program.cs diff --git a/sdk/go/x/auto/test/errors/runtime_error/dotnet/Pulumi.yaml b/sdk/go/auto/test/errors/runtime_error/dotnet/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/dotnet/Pulumi.yaml rename to sdk/go/auto/test/errors/runtime_error/dotnet/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj b/sdk/go/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj rename to sdk/go/auto/test/errors/runtime_error/dotnet/adsfsdf.csproj diff --git a/sdk/go/x/auto/test/errors/runtime_error/go/Pulumi.yaml b/sdk/go/auto/test/errors/runtime_error/go/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/go/Pulumi.yaml rename to sdk/go/auto/test/errors/runtime_error/go/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/runtime_error/go/go.mod b/sdk/go/auto/test/errors/runtime_error/go/go.mod similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/go/go.mod rename to sdk/go/auto/test/errors/runtime_error/go/go.mod diff --git a/sdk/go/x/auto/test/errors/runtime_error/go/go.sum b/sdk/go/auto/test/errors/runtime_error/go/go.sum similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/go/go.sum rename to sdk/go/auto/test/errors/runtime_error/go/go.sum diff --git a/sdk/go/x/auto/test/errors/runtime_error/go/main.go b/sdk/go/auto/test/errors/runtime_error/go/main.go similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/go/main.go rename to sdk/go/auto/test/errors/runtime_error/go/main.go diff --git a/sdk/go/x/auto/test/errors/runtime_error/javascript/.gitignore b/sdk/go/auto/test/errors/runtime_error/javascript/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/javascript/.gitignore rename to sdk/go/auto/test/errors/runtime_error/javascript/.gitignore diff --git a/sdk/go/x/auto/test/errors/runtime_error/javascript/Pulumi.yaml b/sdk/go/auto/test/errors/runtime_error/javascript/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/javascript/Pulumi.yaml rename to sdk/go/auto/test/errors/runtime_error/javascript/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/runtime_error/javascript/index.js b/sdk/go/auto/test/errors/runtime_error/javascript/index.js similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/javascript/index.js rename to sdk/go/auto/test/errors/runtime_error/javascript/index.js diff --git a/sdk/go/x/auto/test/errors/runtime_error/javascript/package-lock.json b/sdk/go/auto/test/errors/runtime_error/javascript/package-lock.json similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/javascript/package-lock.json rename to sdk/go/auto/test/errors/runtime_error/javascript/package-lock.json diff --git a/sdk/go/x/auto/test/errors/runtime_error/javascript/package.json b/sdk/go/auto/test/errors/runtime_error/javascript/package.json similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/javascript/package.json rename to sdk/go/auto/test/errors/runtime_error/javascript/package.json diff --git a/sdk/go/x/auto/test/errors/runtime_error/python/.gitignore b/sdk/go/auto/test/errors/runtime_error/python/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/python/.gitignore rename to sdk/go/auto/test/errors/runtime_error/python/.gitignore diff --git a/sdk/go/x/auto/test/errors/runtime_error/python/Pulumi.yaml b/sdk/go/auto/test/errors/runtime_error/python/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/python/Pulumi.yaml rename to sdk/go/auto/test/errors/runtime_error/python/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/runtime_error/python/__main__.py b/sdk/go/auto/test/errors/runtime_error/python/__main__.py similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/python/__main__.py rename to sdk/go/auto/test/errors/runtime_error/python/__main__.py diff --git a/sdk/go/x/auto/test/errors/runtime_error/python/requirements.txt b/sdk/go/auto/test/errors/runtime_error/python/requirements.txt similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/python/requirements.txt rename to sdk/go/auto/test/errors/runtime_error/python/requirements.txt diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/.gitignore b/sdk/go/auto/test/errors/runtime_error/typescript/.gitignore similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/.gitignore rename to sdk/go/auto/test/errors/runtime_error/typescript/.gitignore diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/Pulumi.yaml b/sdk/go/auto/test/errors/runtime_error/typescript/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/Pulumi.yaml rename to sdk/go/auto/test/errors/runtime_error/typescript/Pulumi.yaml diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/index.ts b/sdk/go/auto/test/errors/runtime_error/typescript/index.ts similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/index.ts rename to sdk/go/auto/test/errors/runtime_error/typescript/index.ts diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/package-lock.json b/sdk/go/auto/test/errors/runtime_error/typescript/package-lock.json similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/package-lock.json rename to sdk/go/auto/test/errors/runtime_error/typescript/package-lock.json diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/package.json b/sdk/go/auto/test/errors/runtime_error/typescript/package.json similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/package.json rename to sdk/go/auto/test/errors/runtime_error/typescript/package.json diff --git a/sdk/go/x/auto/test/errors/runtime_error/typescript/tsconfig.json b/sdk/go/auto/test/errors/runtime_error/typescript/tsconfig.json similarity index 100% rename from sdk/go/x/auto/test/errors/runtime_error/typescript/tsconfig.json rename to sdk/go/auto/test/errors/runtime_error/typescript/tsconfig.json diff --git a/sdk/go/x/auto/test/nested_config/Pulumi.dev.yaml b/sdk/go/auto/test/nested_config/Pulumi.dev.yaml similarity index 100% rename from sdk/go/x/auto/test/nested_config/Pulumi.dev.yaml rename to sdk/go/auto/test/nested_config/Pulumi.dev.yaml diff --git a/sdk/go/x/auto/test/nested_config/Pulumi.yaml b/sdk/go/auto/test/nested_config/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/nested_config/Pulumi.yaml rename to sdk/go/auto/test/nested_config/Pulumi.yaml diff --git a/sdk/go/x/auto/test/testproj/Pulumi.yaml b/sdk/go/auto/test/testproj/Pulumi.yaml similarity index 100% rename from sdk/go/x/auto/test/testproj/Pulumi.yaml rename to sdk/go/auto/test/testproj/Pulumi.yaml diff --git a/sdk/go/x/auto/test/testproj/go.mod b/sdk/go/auto/test/testproj/go.mod similarity index 100% rename from sdk/go/x/auto/test/testproj/go.mod rename to sdk/go/auto/test/testproj/go.mod diff --git a/sdk/go/x/auto/test/testproj/go.sum b/sdk/go/auto/test/testproj/go.sum similarity index 100% rename from sdk/go/x/auto/test/testproj/go.sum rename to sdk/go/auto/test/testproj/go.sum diff --git a/sdk/go/x/auto/test/testproj/main.go b/sdk/go/auto/test/testproj/main.go similarity index 100% rename from sdk/go/x/auto/test/testproj/main.go rename to sdk/go/auto/test/testproj/main.go diff --git a/sdk/go/x/auto/watcher.go b/sdk/go/auto/watcher.go similarity index 96% rename from sdk/go/x/auto/watcher.go rename to sdk/go/auto/watcher.go index cb72bdd2e..ef1ccfb38 100644 --- a/sdk/go/x/auto/watcher.go +++ b/sdk/go/auto/watcher.go @@ -17,8 +17,8 @@ import ( "encoding/json" "github.com/nxadm/tail" + "github.com/pulumi/pulumi/sdk/v2/go/auto/events" "github.com/pulumi/pulumi/sdk/v2/go/common/apitype" - "github.com/pulumi/pulumi/sdk/v2/go/x/auto/events" ) func watchFile(path string, receivers []chan<- events.EngineEvent) (*tail.Tail, error) { diff --git a/sdk/go/x/auto/workspace.go b/sdk/go/auto/workspace.go similarity index 100% rename from sdk/go/x/auto/workspace.go rename to sdk/go/auto/workspace.go diff --git a/sdk/go/x/README.md b/sdk/go/x/README.md deleted file mode 100644 index 7630587ac..000000000 --- a/sdk/go/x/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# X (experimental) - -This package and subpackages contain experimental software with limited documentation. APIs are subject to change. diff --git a/sdk/go/x/x.go b/sdk/go/x/x.go deleted file mode 100644 index be0025f1c..000000000 --- a/sdk/go/x/x.go +++ /dev/null @@ -1,3 +0,0 @@ -// Package x contains experimental functionality with no guarantees of stable APIs. -// Breaking changes should be expected. -package x diff --git a/sdk/nodejs/x/automation/cmd.ts b/sdk/nodejs/automation/cmd.ts similarity index 100% rename from sdk/nodejs/x/automation/cmd.ts rename to sdk/nodejs/automation/cmd.ts diff --git a/sdk/nodejs/x/automation/config.ts b/sdk/nodejs/automation/config.ts similarity index 100% rename from sdk/nodejs/x/automation/config.ts rename to sdk/nodejs/automation/config.ts diff --git a/sdk/nodejs/x/automation/errors.ts b/sdk/nodejs/automation/errors.ts similarity index 100% rename from sdk/nodejs/x/automation/errors.ts rename to sdk/nodejs/automation/errors.ts diff --git a/sdk/nodejs/x/automation/events.ts b/sdk/nodejs/automation/events.ts similarity index 100% rename from sdk/nodejs/x/automation/events.ts rename to sdk/nodejs/automation/events.ts diff --git a/sdk/nodejs/x/automation/index.ts b/sdk/nodejs/automation/index.ts similarity index 100% rename from sdk/nodejs/x/automation/index.ts rename to sdk/nodejs/automation/index.ts diff --git a/sdk/nodejs/x/automation/localWorkspace.ts b/sdk/nodejs/automation/localWorkspace.ts similarity index 100% rename from sdk/nodejs/x/automation/localWorkspace.ts rename to sdk/nodejs/automation/localWorkspace.ts diff --git a/sdk/nodejs/x/automation/minimumVersion.ts b/sdk/nodejs/automation/minimumVersion.ts similarity index 100% rename from sdk/nodejs/x/automation/minimumVersion.ts rename to sdk/nodejs/automation/minimumVersion.ts diff --git a/sdk/nodejs/x/automation/projectSettings.ts b/sdk/nodejs/automation/projectSettings.ts similarity index 100% rename from sdk/nodejs/x/automation/projectSettings.ts rename to sdk/nodejs/automation/projectSettings.ts diff --git a/sdk/nodejs/x/automation/server.ts b/sdk/nodejs/automation/server.ts similarity index 95% rename from sdk/nodejs/x/automation/server.ts rename to sdk/nodejs/automation/server.ts index 1ad60a37f..66b50ce71 100644 --- a/sdk/nodejs/x/automation/server.ts +++ b/sdk/nodejs/automation/server.ts @@ -13,12 +13,12 @@ // limitations under the License. import * as grpc from "@grpc/grpc-js"; -import { isGrpcError, ResourceError, RunError } from "../../errors"; -import * as log from "../../log"; -import * as runtime from "../../runtime"; +import { isGrpcError, ResourceError, RunError } from "../errors"; +import * as log from "../log"; +import * as runtime from "../runtime"; -const langproto = require("../../proto/language_pb.js"); -const plugproto = require("../../proto/plugin_pb.js"); +const langproto = require("../proto/language_pb.js"); +const plugproto = require("../proto/plugin_pb.js"); // maxRPCMessageSize raises the gRPC Max Message size from `4194304` (4mb) to `419430400` (400mb) /** @internal */ diff --git a/sdk/nodejs/x/automation/stack.ts b/sdk/nodejs/automation/stack.ts similarity index 99% rename from sdk/nodejs/x/automation/stack.ts rename to sdk/nodejs/automation/stack.ts index 9395211ed..357d82c88 100644 --- a/sdk/nodejs/x/automation/stack.ts +++ b/sdk/nodejs/automation/stack.ts @@ -28,7 +28,7 @@ import { EngineEvent, SummaryEvent } from "./events"; import { LanguageServer, maxRPCMessageSize } from "./server"; import { Deployment, PulumiFn, Workspace } from "./workspace"; -const langrpc = require("../../proto/language_grpc_pb.js"); +const langrpc = require("../proto/language_grpc_pb.js"); const secretSentinel = "[secret]"; diff --git a/sdk/nodejs/x/automation/stackSettings.ts b/sdk/nodejs/automation/stackSettings.ts similarity index 100% rename from sdk/nodejs/x/automation/stackSettings.ts rename to sdk/nodejs/automation/stackSettings.ts diff --git a/sdk/nodejs/x/automation/workspace.ts b/sdk/nodejs/automation/workspace.ts similarity index 100% rename from sdk/nodejs/x/automation/workspace.ts rename to sdk/nodejs/automation/workspace.ts diff --git a/sdk/nodejs/index.ts b/sdk/nodejs/index.ts index 6b93e8ffe..0294f861d 100644 --- a/sdk/nodejs/index.ts +++ b/sdk/nodejs/index.ts @@ -26,13 +26,14 @@ export * from "./stackReference"; // Export submodules individually. import * as asset from "./asset"; +import * as automation from "./automation"; import * as dynamic from "./dynamic"; import * as iterable from "./iterable"; import * as log from "./log"; import * as provider from "./provider"; import * as runtime from "./runtime"; import * as utils from "./utils"; -export { asset, dynamic, iterable, log, provider, runtime, utils }; +export { asset, automation, dynamic, iterable, log, provider, runtime, utils }; // @pulumi is a deployment-only module. If someone tries to capture it, and we fail for some reason // we want to give a good message about what the problem likely is. Note that capturing a diff --git a/sdk/nodejs/tests/automation/localWorkspace.spec.ts b/sdk/nodejs/tests/automation/localWorkspace.spec.ts index ee526cfb1..1aa896e82 100644 --- a/sdk/nodejs/tests/automation/localWorkspace.spec.ts +++ b/sdk/nodejs/tests/automation/localWorkspace.spec.ts @@ -26,7 +26,7 @@ import { ProjectSettings, Stack, validatePulumiVersion, -} from "../../x/automation"; +} from "../../automation"; import { asyncTest } from "../util"; const versionRegex = /(\d+\.)(\d+\.)(\d+)(-.*)?/; diff --git a/sdk/nodejs/tsconfig.json b/sdk/nodejs/tsconfig.json index cdd443363..4df9cdd6d 100644 --- a/sdk/nodejs/tsconfig.json +++ b/sdk/nodejs/tsconfig.json @@ -67,17 +67,16 @@ "cmd/run-policy-pack/index.ts", "cmd/run-policy-pack/run.ts", - "x/index.ts", - "x/automation/index.ts", - "x/automation/cmd.ts", - "x/automation/config.ts", - "x/automation/localWorkspace.ts", - "x/automation/minimumVersion.ts", - "x/automation/projectSettings.ts", - "x/automation/stackSettings.ts", - "x/automation/server.ts", - "x/automation/stack.ts", - "x/automation/workspace.ts", + "automation/index.ts", + "automation/cmd.ts", + "automation/config.ts", + "automation/localWorkspace.ts", + "automation/minimumVersion.ts", + "automation/projectSettings.ts", + "automation/stackSettings.ts", + "automation/server.ts", + "automation/stack.ts", + "automation/workspace.ts", "tests/config.spec.ts", "tests/init.spec.ts", diff --git a/sdk/nodejs/x/index.ts b/sdk/nodejs/x/index.ts deleted file mode 100644 index d7ee253d3..000000000 --- a/sdk/nodejs/x/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as automation from "./automation"; - -export { automation }; diff --git a/sdk/python/lib/pulumi/__init__.py b/sdk/python/lib/pulumi/__init__.py index 472da7d05..e94347983 100644 --- a/sdk/python/lib/pulumi/__init__.py +++ b/sdk/python/lib/pulumi/__init__.py @@ -96,7 +96,7 @@ from ._types import ( set, ) -from . import runtime, dynamic, policy, x +from . import runtime, dynamic, policy, automation __all__ = [ # asset @@ -169,5 +169,5 @@ __all__ = [ "runtime", "dynamic", "policy", - "x" + "automation" ] diff --git a/sdk/python/lib/pulumi/x/automation/__init__.py b/sdk/python/lib/pulumi/automation/__init__.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/__init__.py rename to sdk/python/lib/pulumi/automation/__init__.py diff --git a/sdk/python/lib/pulumi/x/automation/_cmd.py b/sdk/python/lib/pulumi/automation/_cmd.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_cmd.py rename to sdk/python/lib/pulumi/automation/_cmd.py diff --git a/sdk/python/lib/pulumi/x/automation/_config.py b/sdk/python/lib/pulumi/automation/_config.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_config.py rename to sdk/python/lib/pulumi/automation/_config.py diff --git a/sdk/python/lib/pulumi/x/automation/_local_workspace.py b/sdk/python/lib/pulumi/automation/_local_workspace.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_local_workspace.py rename to sdk/python/lib/pulumi/automation/_local_workspace.py diff --git a/sdk/python/lib/pulumi/x/automation/_minimum_version.py b/sdk/python/lib/pulumi/automation/_minimum_version.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_minimum_version.py rename to sdk/python/lib/pulumi/automation/_minimum_version.py diff --git a/sdk/python/lib/pulumi/x/automation/_project_settings.py b/sdk/python/lib/pulumi/automation/_project_settings.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_project_settings.py rename to sdk/python/lib/pulumi/automation/_project_settings.py diff --git a/sdk/python/lib/pulumi/x/automation/_server.py b/sdk/python/lib/pulumi/automation/_server.py similarity index 95% rename from sdk/python/lib/pulumi/x/automation/_server.py rename to sdk/python/lib/pulumi/automation/_server.py index 54ec86f9e..6ddcc7339 100644 --- a/sdk/python/lib/pulumi/x/automation/_server.py +++ b/sdk/python/lib/pulumi/automation/_server.py @@ -19,10 +19,10 @@ from contextlib import suppress import grpc from ._workspace import PulumiFn -from ... import log -from ...runtime.proto import language_pb2, plugin_pb2, LanguageRuntimeServicer -from ...runtime import run_in_stack, reset_options, set_all_config -from ...errors import RunError +from .. import log +from ..runtime.proto import language_pb2, plugin_pb2, LanguageRuntimeServicer +from ..runtime import run_in_stack, reset_options, set_all_config +from ..errors import RunError _py_version_less_than_3_7 = sys.version_info[0] == 3 and sys.version_info[1] < 7 diff --git a/sdk/python/lib/pulumi/x/automation/_stack.py b/sdk/python/lib/pulumi/automation/_stack.py similarity index 99% rename from sdk/python/lib/pulumi/x/automation/_stack.py rename to sdk/python/lib/pulumi/automation/_stack.py index 4d9878b38..d5ee9a733 100644 --- a/sdk/python/lib/pulumi/x/automation/_stack.py +++ b/sdk/python/lib/pulumi/automation/_stack.py @@ -29,8 +29,8 @@ from .errors import StackAlreadyExistsError from .events import OpMap, EngineEvent, SummaryEvent from ._server import LanguageServer from ._workspace import Workspace, PulumiFn, Deployment -from ...runtime.settings import _GRPC_CHANNEL_OPTIONS -from ...runtime.proto import language_pb2_grpc +from ..runtime.settings import _GRPC_CHANNEL_OPTIONS +from ..runtime.proto import language_pb2_grpc _DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' diff --git a/sdk/python/lib/pulumi/x/automation/_stack_settings.py b/sdk/python/lib/pulumi/automation/_stack_settings.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_stack_settings.py rename to sdk/python/lib/pulumi/automation/_stack_settings.py diff --git a/sdk/python/lib/pulumi/x/automation/_workspace.py b/sdk/python/lib/pulumi/automation/_workspace.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/_workspace.py rename to sdk/python/lib/pulumi/automation/_workspace.py diff --git a/sdk/python/lib/pulumi/x/automation/errors.py b/sdk/python/lib/pulumi/automation/errors.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/errors.py rename to sdk/python/lib/pulumi/automation/errors.py diff --git a/sdk/python/lib/pulumi/x/automation/events.py b/sdk/python/lib/pulumi/automation/events.py similarity index 100% rename from sdk/python/lib/pulumi/x/automation/events.py rename to sdk/python/lib/pulumi/automation/events.py diff --git a/sdk/python/lib/pulumi/x/__init__.py b/sdk/python/lib/pulumi/x/__init__.py deleted file mode 100644 index 6e3df0b33..000000000 --- a/sdk/python/lib/pulumi/x/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2016-2021, Pulumi Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from . import automation diff --git a/sdk/python/lib/test/automation/test_errors.py b/sdk/python/lib/test/automation/test_errors.py index 72ac9f820..062c773af 100644 --- a/sdk/python/lib/test/automation/test_errors.py +++ b/sdk/python/lib/test/automation/test_errors.py @@ -17,7 +17,7 @@ import sys import subprocess import unittest import pytest -from pulumi.x.automation import ( +from pulumi.automation import ( create_stack, InlineSourceRuntimeError, RuntimeError, diff --git a/sdk/python/lib/test/automation/test_local_workspace.py b/sdk/python/lib/test/automation/test_local_workspace.py index 45fa471e6..32b787159 100644 --- a/sdk/python/lib/test/automation/test_local_workspace.py +++ b/sdk/python/lib/test/automation/test_local_workspace.py @@ -19,7 +19,7 @@ from semver import VersionInfo from typing import List, Optional from pulumi import Config, export -from pulumi.x.automation import ( +from pulumi.automation import ( create_stack, create_or_select_stack, CommandError,