diff --git a/.appveyor.yml b/.appveyor.yml
index 3b562de32..f9ab0207d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,6 +6,7 @@ clone_folder: '%USERPROFILE%\go\src\github.com\pulumi\pulumi'
 branches:
   only:
     - master
+    - 'feature-2.0'
     - /v\d*\.\d*\.\d*/
 environment:
   PULUMI_API: https://api.pulumi-staging.io
diff --git a/.travis.yml b/.travis.yml
index 956eac5d8..7e03bb758 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_script:
 - "${PULUMI_SCRIPTS}/ci/ensure-dependencies"
 script:
 - make travis_${TRAVIS_EVENT_TYPE}
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./scripts/update_homebrew.sh; fi
+#- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./scripts/update_homebrew.sh; fi
 after_failure:
 - "${PULUMI_SCRIPTS}/ci/upload-failed-tests"
 notifications:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03b39742f..b4de9562f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,27 @@
 CHANGELOG
 =========
 
-## HEAD (unreleased)
+## 2.0.0 (Unreleased)
+=======
+- CLI behavior change.  Commands in non-interactive mode (i.e. when `pulumi` has its output piped to
+  another process or running on CI) will not default to assuming that `--yes` was passed in.  `--yes` is now
+  explicitly required to proceed in non-interactive scenarios. This affects:
+   * `pulumi destroy`
+   * `pulumi new`
+   * `pulumi refresh`
+   * `pulumi up`
+
+- Fixed [crashes and hangs](https://github.com/pulumi/pulumi/issues/3528) introduced by usage of
+  another library.
+
+- @pulumi/pulumi Now requires Nodejs version 8.13.0 and upwards or 10.10.0 and upwards.
+
+- All data-source invocations are now asynchronous (Promise-returning) by default.
+
+- C# code generation switched to schema.
+
+- .NET API: replace `IDeployment` interface with `DeploymentInstance` class.
+
 - Fix Go SDK secret propagation for Resource inputs/outputs.
   [#4387](https://github.com/pulumi/pulumi/pull/4387)
 
@@ -37,10 +57,10 @@ CHANGELOG
   [#4321](https://github.com/pulumi/pulumi/pull/4321)
 
 - Make prebuilt executables opt-in only for the Go SDK
- [#4338](https://github.com/pulumi/pulumi/pull/4338)
+  [#4338](https://github.com/pulumi/pulumi/pull/4338)
 
 - Support the `binary` option (prebuilt executables) for the .NET SDK
- [#4355](https://github.com/pulumi/pulumi/pull/4355)
+  [#4355](https://github.com/pulumi/pulumi/pull/4355)
 
 - Add helper methods for stack outputs in the Go SDK
   [#4341](https://github.com/pulumi/pulumi/pull/4341)
@@ -75,7 +95,7 @@ CHANGELOG
 ## 1.14.0 (2020-04-01)
 - Fix error related to side-by-side versions of `@pulumi/pulumi`.
   [#4235](https://github.com/pulumi/pulumi/pull/4235)
-
+  
 - Allow users to specify an alternate backend URL when using the GitHub Actions container with the env var `PULUMI_BACKEND_URL`.
   [#4243](https://github.com/pulumi/pulumi/pull/4243)
 
diff --git a/Makefile b/Makefile
index e129e010e..81ae1d346 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PROJECT_NAME := Pulumi SDK
 SUB_PROJECTS := sdk/dotnet sdk/nodejs sdk/python sdk/go
 include build/common.mk
 
-PROJECT         := github.com/pulumi/pulumi/pkg/cmd/pulumi
+PROJECT         := github.com/pulumi/pulumi/pkg/v2/cmd/pulumi
 PROJECT_PKGS    := $(shell cd ./pkg && go list ./... | grep -v /vendor/)
 TESTS_PKGS      := $(shell cd ./tests && go list ./... | grep -v tests/templates | grep -v /vendor/)
 VERSION         := $(shell scripts/get-version HEAD)
@@ -16,6 +16,8 @@ ifeq ($(NOPROXY), true)
 	@echo "cd sdk && GO111MODULE=on go mod download"; cd sdk && GO111MODULE=on go mod download
 	@echo "cd pkg && GO111MODULE=on go mod tidy"; cd pkg && GO111MODULE=on go mod tidy
 	@echo "cd pkg && GO111MODULE=on go mod download"; cd pkg && GO111MODULE=on go mod download
+	@echo "cd scripts && GO111MODULE=on go mod tidy"; cd scripts && GO111MODULE=on go mod tidy
+	@echo "cd scripts && GO111MODULE=on go mod download"; cd scripts && GO111MODULE=on go mod download
 	@echo "cd tests && GO111MODULE=on go mod tidy"; cd tests && GO111MODULE=on go mod tidy
 	@echo "cd tests && GO111MODULE=on go mod download"; cd tests && GO111MODULE=on go mod download
 	@echo "cd scripts && GO111MODULE=on go mod tidy"; cd scripts && GO111MODULE=on go mod tidy
@@ -25,6 +27,8 @@ else
 	@echo "cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download"; cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download
 	@echo "cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
 	@echo "cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download"; cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download
+	@echo "cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
+	@echo "cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download"; cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download
 	@echo "cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
 	@echo "cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download"; cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod download
 	@echo "cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd scripts && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@@ -42,13 +46,13 @@ generate::
 	go generate ./pkg/codegen/docs/
 
 build::
-	cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
+	cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT}
 
 install::
-	cd pkg && GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
+	cd pkg && GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT}
 
 dist::
-	cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" ${PROJECT}
+	cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT}
 
 lint::
 	for DIR in "pkg" "sdk" "tests" ; do \
diff --git a/build.proj b/build.proj
index 167a2ab2c..cb9bfd19f 100644
--- a/build.proj
+++ b/build.proj
@@ -66,20 +66,20 @@
     <Exec Command="dotnet build dotnet.sln /p:VersionPrefix=$(VersionPrefix) /p:VersionSuffix=preview" 
           WorkingDirectory="$(DotNetSdkDirectory)" />
     <ItemGroup>
-      <DotNetPackagesToBuild Include="github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet" />
+      <DotNetPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet" />
     </ItemGroup>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
           WorkingDirectory="$(SdkDirectory)"/>
   </Target>
 
   <Target Name="DotNetInstallPlugin">
     <ItemGroup>
-      <DotNetPackagesToBuild Include="github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet" />
+      <DotNetPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet" />
     </ItemGroup>
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
     </Exec>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(DotNetPackagesToBuild.Identity)"
       EnvironmentVariables="GOBIN=$(PulumiBin)"
       WorkingDirectory="$(SdkDirectory)"/>
   </Target>
@@ -103,20 +103,20 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
     </Exec>
     <ItemGroup>
-      <GoPackagesToBuild Include="github.com/pulumi/pulumi/sdk/go/pulumi-language-go" />
+      <GoPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go" />
     </ItemGroup>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)" 
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)"
     WorkingDirectory="$(SdkDirectory)"/>
   </Target>
 
   <Target Name="GoInstallPlugin">
     <ItemGroup>
-      <GoPackagesToBuild Include="github.com/pulumi/pulumi/sdk/go/pulumi-language-go" />
+      <GoPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go" />
     </ItemGroup>
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
     </Exec>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)"
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(GoPackagesToBuild.Identity)"
           EnvironmentVariables="GOBIN=$(PulumiBin)"
           WorkingDirectory="$(SdkDirectory)"/>
   </Target>
@@ -152,9 +152,9 @@
     <Copy SourceFiles="@(NodeSdkTestDataFiles)"
           DestinationFolder="$(NodeJSSdkDirectory)\bin\tests\runtime\langhost\cases" />
     <ItemGroup>
-      <NodeJSPackagesToBuild Include="github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs" />
+      <NodeJSPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/nodejs/cmd/pulumi-language-nodejs" />
     </ItemGroup>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)" 
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)"
           WorkingDirectory="$(SdkDirectory)"/>
   </Target>
 
@@ -170,7 +170,7 @@
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
     </Exec>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)"
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/v2/version.Version=$(Version)&quot; %(NodeJSPackagesToBuild.Identity)"
           EnvironmentVariables="GOBIN=$(PulumiBin)"
           WorkingDirectory="$(SdkDirectory)"/>
   </Target>
@@ -227,9 +227,9 @@
     <Exec Command="pipenv run python setup.py build bdist_wheel --universal"
           WorkingDirectory="$(PythonSdkDirectory)\env\src" />
     <ItemGroup>
-      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" />
+      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python" />
     </ItemGroup>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)" 
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)"
     WorkingDirectory="$(SdkDirectory)"/>
   </Target>
 
@@ -245,12 +245,12 @@
     <Copy SourceFiles="@(PythonDistFiles)"
           DestinationFolder="$(PulumiBin)\" />
     <ItemGroup>
-      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" />
+      <PythonPackagesToBuild Include="github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python" />
     </ItemGroup>
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
     </Exec>
-    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)"
+    <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; %(PythonPackagesToBuild.Identity)"
           EnvironmentVariables="GOBIN=$(PulumiBin)"
           WorkingDirectory="$(SdkDirectory)"/>
   </Target>
@@ -258,7 +258,7 @@
   <!-- Install the Pulumi SDK -->
   <Target Name="InstallPulumiPlugin">
     <ItemGroup>
-      <PulumiPackagesToBuild Include="github.com/pulumi/pulumi/pkg/cmd/pulumi" />
+      <PulumiPackagesToBuild Include="github.com/pulumi/pulumi/pkg/v2/cmd/pulumi" />
     </ItemGroup>
 
     <Exec Command="&quot;$(MSBuildThisFileDirectory)\scripts\get-version.cmd&quot;" ConsoleToMSBuild="true">
diff --git a/pkg/backend/apply.go b/pkg/backend/apply.go
index 211c3d1ef..6a0186053 100644
--- a/pkg/backend/apply.go
+++ b/pkg/backend/apply.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
 	"os"
 	"strings"
 
@@ -26,13 +25,14 @@ import (
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	surveycore "gopkg.in/AlecAivazis/survey.v1/core"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // ApplierOptions is a bag of configuration settings for an Applier.
diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go
index 46251cea1..913b15343 100644
--- a/pkg/backend/backend.go
+++ b/pkg/backend/backend.go
@@ -22,20 +22,21 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/util/cancel"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/util/cancel"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 var (
diff --git a/pkg/backend/backend_test.go b/pkg/backend/backend_test.go
index dbc7cb50f..8bc01d630 100644
--- a/pkg/backend/backend_test.go
+++ b/pkg/backend/backend_test.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 func TestGetStackResourceOutputs(t *testing.T) {
diff --git a/pkg/backend/display/detailedDiff.go b/pkg/backend/display/detailedDiff.go
index 0ff40b748..5b8b045c7 100644
--- a/pkg/backend/display/detailedDiff.go
+++ b/pkg/backend/display/detailedDiff.go
@@ -1,10 +1,10 @@
 package display
 
 import (
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // getProperty fetches the child property with the indicated key from the given property value. If the key does not
diff --git a/pkg/backend/display/detailedDiff_test.go b/pkg/backend/display/detailedDiff_test.go
index f3931213d..a109b11c3 100644
--- a/pkg/backend/display/detailedDiff_test.go
+++ b/pkg/backend/display/detailedDiff_test.go
@@ -3,10 +3,11 @@ package display
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 )
 
 func TestTranslateDetailedDiff(t *testing.T) {
diff --git a/pkg/backend/display/diff.go b/pkg/backend/display/diff.go
index 6192e4434..42cc50c1e 100644
--- a/pkg/backend/display/diff.go
+++ b/pkg/backend/display/diff.go
@@ -25,14 +25,14 @@ import (
 
 	"github.com/dustin/go-humanize/english"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // ShowDiffEvents displays the engine events with the diff view.
diff --git a/pkg/backend/display/display.go b/pkg/backend/display/display.go
index a856757b9..445d746f0 100644
--- a/pkg/backend/display/display.go
+++ b/pkg/backend/display/display.go
@@ -21,13 +21,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // ShowEvents reads events from the `events` channel until it is closed, displaying each event as
diff --git a/pkg/backend/display/events.go b/pkg/backend/display/events.go
index 293ffb1e5..b0f53b88a 100644
--- a/pkg/backend/display/events.go
+++ b/pkg/backend/display/events.go
@@ -2,12 +2,13 @@ package display
 
 import (
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // ConvertEngineEvent converts a raw engine.Event into an apitype.EngineEvent used in the Pulumi
diff --git a/pkg/backend/display/json.go b/pkg/backend/display/json.go
index f2e088312..37a9de97d 100644
--- a/pkg/backend/display/json.go
+++ b/pkg/backend/display/json.go
@@ -19,16 +19,16 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // massagePropertyValue takes a property value and strips out the secrets annotations from it.  If showSecrets is
diff --git a/pkg/backend/display/jsonmessage.go b/pkg/backend/display/jsonmessage.go
index 5983f8993..7cfa54d37 100644
--- a/pkg/backend/display/jsonmessage.go
+++ b/pkg/backend/display/jsonmessage.go
@@ -24,7 +24,7 @@ import (
 
 	gotty "github.com/ijc/Gotty"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 /* Satisfied by gotty.TermInfo as well as noTermInfo from below */
diff --git a/pkg/backend/display/options.go b/pkg/backend/display/options.go
index c5c75219e..17e6cb044 100644
--- a/pkg/backend/display/options.go
+++ b/pkg/backend/display/options.go
@@ -14,7 +14,7 @@
 
 package display
 
-import "github.com/pulumi/pulumi/sdk/go/common/diag/colors"
+import "github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
 
 // Type of output to display.
 type Type int
diff --git a/pkg/backend/display/progress.go b/pkg/backend/display/progress.go
index 2d9a4f835..bd71d66af 100644
--- a/pkg/backend/display/progress.go
+++ b/pkg/backend/display/progress.go
@@ -30,15 +30,15 @@ import (
 	"github.com/docker/docker/pkg/term"
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Progress describes a message we want to show in the display.  There are two types of messages,
diff --git a/pkg/backend/display/query.go b/pkg/backend/display/query.go
index 101650437..40dff5b53 100644
--- a/pkg/backend/display/query.go
+++ b/pkg/backend/display/query.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // ShowQueryEvents displays query events on the CLI.
diff --git a/pkg/backend/display/rows.go b/pkg/backend/display/rows.go
index d42352cef..e6b095082 100644
--- a/pkg/backend/display/rows.go
+++ b/pkg/backend/display/rows.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 
 	"github.com/dustin/go-humanize/english"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 type Row interface {
diff --git a/pkg/backend/display/tableutil.go b/pkg/backend/display/tableutil.go
index 598f326b5..e390a4bb0 100644
--- a/pkg/backend/display/tableutil.go
+++ b/pkg/backend/display/tableutil.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func columnHeader(msg string) string {
diff --git a/pkg/backend/display/watch.go b/pkg/backend/display/watch.go
index 48a497d25..4479f3a74 100644
--- a/pkg/backend/display/watch.go
+++ b/pkg/backend/display/watch.go
@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // We use RFC 5424 timestamps with millisecond precision for displaying time stamps on watch
diff --git a/pkg/backend/filestate/backend.go b/pkg/backend/filestate/backend.go
index 962f9d182..1bb4fce5c 100644
--- a/pkg/backend/filestate/backend.go
+++ b/pkg/backend/filestate/backend.go
@@ -35,25 +35,25 @@ import (
 	_ "gocloud.dev/blob/s3blob"    // driver for s3://
 	"gocloud.dev/gcerrors"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/edit"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/util/validation"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/encoding"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/edit"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/util/validation"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/encoding"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // Backend extends the base backend interface with specific information about local backends.
diff --git a/pkg/backend/filestate/bucket.go b/pkg/backend/filestate/bucket.go
index 839e49aed..a4c360b15 100644
--- a/pkg/backend/filestate/bucket.go
+++ b/pkg/backend/filestate/bucket.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 	"gocloud.dev/blob"
 )
 
diff --git a/pkg/backend/filestate/gcpauth.go b/pkg/backend/filestate/gcpauth.go
index d1c7bcafe..c89625de9 100644
--- a/pkg/backend/filestate/gcpauth.go
+++ b/pkg/backend/filestate/gcpauth.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 
 	"golang.org/x/oauth2/google"
 
diff --git a/pkg/backend/filestate/snapshot.go b/pkg/backend/filestate/snapshot.go
index 6eed16048..fd6da0c0a 100644
--- a/pkg/backend/filestate/snapshot.go
+++ b/pkg/backend/filestate/snapshot.go
@@ -15,9 +15,9 @@
 package filestate
 
 import (
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // localSnapshotManager is a simple SnapshotManager implementation that persists snapshots
diff --git a/pkg/backend/filestate/stack.go b/pkg/backend/filestate/stack.go
index ea9c705ea..d8f4c778d 100644
--- a/pkg/backend/filestate/stack.go
+++ b/pkg/backend/filestate/stack.go
@@ -18,14 +18,14 @@ import (
 	"context"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // Stack is a local stack.  This simply adds some local-specific properties atop the standard backend stack interface.
diff --git a/pkg/backend/filestate/state.go b/pkg/backend/filestate/state.go
index 40fa2fcb4..be274a1ab 100644
--- a/pkg/backend/filestate/state.go
+++ b/pkg/backend/filestate/state.go
@@ -24,24 +24,24 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/engine"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
 
 	"github.com/pkg/errors"
 	"gocloud.dev/gcerrors"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/encoding"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/encoding"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const DisableCheckpointBackupsEnvVar = "PULUMI_DISABLE_CHECKPOINT_BACKUPS"
diff --git a/pkg/backend/httpstate/backend.go b/pkg/backend/httpstate/backend.go
index 9eae00532..ffc9ddf46 100644
--- a/pkg/backend/httpstate/backend.go
+++ b/pkg/backend/httpstate/backend.go
@@ -34,26 +34,26 @@ import (
 	"github.com/pkg/errors"
 	"github.com/skratchdot/open-golang/open"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/util/retry"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/retry"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const (
diff --git a/pkg/backend/httpstate/client/api.go b/pkg/backend/httpstate/client/api.go
index 905912e3f..d60f02486 100644
--- a/pkg/backend/httpstate/client/api.go
+++ b/pkg/backend/httpstate/client/api.go
@@ -27,18 +27,18 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
 
 	"github.com/google/go-querystring/query"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/util/tracing"
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/pkg/v2/util/tracing"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 const (
diff --git a/pkg/backend/httpstate/client/client.go b/pkg/backend/httpstate/client/client.go
index 76100c0ab..c7665d92d 100644
--- a/pkg/backend/httpstate/client/client.go
+++ b/pkg/backend/httpstate/client/client.go
@@ -26,20 +26,20 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/util/validation"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/util/validation"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // Client provides a slim wrapper around the Pulumi HTTP/REST API.
diff --git a/pkg/backend/httpstate/policypack.go b/pkg/backend/httpstate/policypack.go
index 5c55e35cc..bd66955f3 100644
--- a/pkg/backend/httpstate/policypack.go
+++ b/pkg/backend/httpstate/policypack.go
@@ -12,20 +12,20 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/archive"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/archive"
 
-	"github.com/pulumi/pulumi/pkg/npm"
+	"github.com/pulumi/pulumi/pkg/v2/npm"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/engine"
-	resourceanalyzer "github.com/pulumi/pulumi/pkg/resource/analyzer"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	resourceanalyzer "github.com/pulumi/pulumi/pkg/v2/resource/analyzer"
+	"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/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type cloudRequiredPolicy struct {
diff --git a/pkg/backend/httpstate/snapshot.go b/pkg/backend/httpstate/snapshot.go
index f1e02152c..1a660c930 100644
--- a/pkg/backend/httpstate/snapshot.go
+++ b/pkg/backend/httpstate/snapshot.go
@@ -18,11 +18,11 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
 )
 
 // cloudSnapshotPersister persists snapshots to the Pulumi service.
diff --git a/pkg/backend/httpstate/stack.go b/pkg/backend/httpstate/stack.go
index 3436f2f96..051f30ae4 100644
--- a/pkg/backend/httpstate/stack.go
+++ b/pkg/backend/httpstate/stack.go
@@ -19,15 +19,15 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"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/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // Stack is a cloud stack.  This simply adds some cloud-specific properties atop the standard backend stack interface.
diff --git a/pkg/backend/httpstate/state.go b/pkg/backend/httpstate/state.go
index a167324a6..264946309 100644
--- a/pkg/backend/httpstate/state.go
+++ b/pkg/backend/httpstate/state.go
@@ -20,20 +20,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type tokenRequest chan<- tokenResponse
diff --git a/pkg/backend/mock.go b/pkg/backend/mock.go
index 1ee0fcaf1..7e90cfbb7 100644
--- a/pkg/backend/mock.go
+++ b/pkg/backend/mock.go
@@ -17,14 +17,14 @@ package backend
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 //
diff --git a/pkg/backend/policypack.go b/pkg/backend/policypack.go
index 64f2bd558..5f66e07da 100644
--- a/pkg/backend/policypack.go
+++ b/pkg/backend/policypack.go
@@ -18,10 +18,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // PublishOperation publishes a PolicyPack to the backend.
diff --git a/pkg/backend/query.go b/pkg/backend/query.go
index 8c93a0172..8b1a98032 100644
--- a/pkg/backend/query.go
+++ b/pkg/backend/query.go
@@ -5,9 +5,9 @@ import (
 
 	opentracing "github.com/opentracing/opentracing-go"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 type MakeQuery func(context.Context, QueryOperation) (engine.QueryInfo, error)
diff --git a/pkg/backend/snapshot.go b/pkg/backend/snapshot.go
index 72161d299..d6b085651 100644
--- a/pkg/backend/snapshot.go
+++ b/pkg/backend/snapshot.go
@@ -20,13 +20,14 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"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/logging"
 )
 
 // SnapshotPersister is an interface implemented by our backends that implements snapshot
diff --git a/pkg/backend/snapshot_test.go b/pkg/backend/snapshot_test.go
index 992acaa0f..fdb4fd551 100644
--- a/pkg/backend/snapshot_test.go
+++ b/pkg/backend/snapshot_test.go
@@ -20,12 +20,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/secrets/b64"
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/b64"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 type MockRegisterResourceEvent struct {
diff --git a/pkg/backend/stack.go b/pkg/backend/stack.go
index 39ba9ae72..a5732fdc3 100644
--- a/pkg/backend/stack.go
+++ b/pkg/backend/stack.go
@@ -21,16 +21,16 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/gitutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/gitutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // Stack is a stack associated with a particular backend implementation.
diff --git a/pkg/backend/state/stacks.go b/pkg/backend/state/stacks.go
index 8ede43c0a..1a345b31e 100644
--- a/pkg/backend/state/stacks.go
+++ b/pkg/backend/state/stacks.go
@@ -17,8 +17,8 @@ package state
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // CurrentStack reads the current stack and returns an instance connected to its backend provider.
diff --git a/pkg/backend/updates.go b/pkg/backend/updates.go
index 8b5a50de3..a4a1de8c3 100644
--- a/pkg/backend/updates.go
+++ b/pkg/backend/updates.go
@@ -15,9 +15,9 @@
 package backend
 
 import (
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 // UpdateMetadata describes optional metadata about an update.
diff --git a/pkg/backend/watch.go b/pkg/backend/watch.go
index c2871315f..07ae6d0ac 100644
--- a/pkg/backend/watch.go
+++ b/pkg/backend/watch.go
@@ -22,12 +22,12 @@ import (
 
 	"github.com/rjeczalik/notify"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // Watch watches the project's working directory for changes and automatically updates the active
diff --git a/pkg/cmd/pulumi/cancel.go b/pkg/cmd/pulumi/cancel.go
index 8138fe59a..17dfbe644 100644
--- a/pkg/cmd/pulumi/cancel.go
+++ b/pkg/cmd/pulumi/cancel.go
@@ -17,14 +17,14 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newCancelCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/config.go b/pkg/cmd/pulumi/config.go
index 1b96f5b77..439fcc883 100644
--- a/pkg/cmd/pulumi/config.go
+++ b/pkg/cmd/pulumi/config.go
@@ -28,13 +28,13 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newConfigCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/config_test.go b/pkg/cmd/pulumi/config_test.go
index 2fa53f3ab..628bfaef7 100644
--- a/pkg/cmd/pulumi/config_test.go
+++ b/pkg/cmd/pulumi/config_test.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func TestPrettyKeyForProject(t *testing.T) {
diff --git a/pkg/cmd/pulumi/crypto.go b/pkg/cmd/pulumi/crypto.go
index 5e174e1b0..25a927e36 100644
--- a/pkg/cmd/pulumi/crypto.go
+++ b/pkg/cmd/pulumi/crypto.go
@@ -19,13 +19,13 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/secrets/passphrase"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 func getStackEncrypter(s backend.Stack) (config.Encrypter, error) {
diff --git a/pkg/cmd/pulumi/crypto_cloud.go b/pkg/cmd/pulumi/crypto_cloud.go
index 0e01f08c9..a6f4c116b 100644
--- a/pkg/cmd/pulumi/crypto_cloud.go
+++ b/pkg/cmd/pulumi/crypto_cloud.go
@@ -17,11 +17,11 @@ package main
 import (
 	"encoding/base64"
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/secrets/cloud"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/cloud"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newCloudSecretsManager(stackName tokens.QName, configFile, secretsProvider string) (secrets.Manager, error) {
diff --git a/pkg/cmd/pulumi/crypto_http.go b/pkg/cmd/pulumi/crypto_http.go
index 50346133b..a93d55252 100644
--- a/pkg/cmd/pulumi/crypto_http.go
+++ b/pkg/cmd/pulumi/crypto_http.go
@@ -15,10 +15,9 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/pkg/secrets/service"
-
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/service"
 )
 
 func newServiceSecretsManager(s httpstate.Stack) (secrets.Manager, error) {
diff --git a/pkg/cmd/pulumi/crypto_local.go b/pkg/cmd/pulumi/crypto_local.go
index c152db0c9..fb2296aa9 100644
--- a/pkg/cmd/pulumi/crypto_local.go
+++ b/pkg/cmd/pulumi/crypto_local.go
@@ -21,14 +21,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/secrets/passphrase"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func readPassphrase(prompt string) (string, error) {
diff --git a/pkg/cmd/pulumi/destroy.go b/pkg/cmd/pulumi/destroy.go
index 687f82d9f..865f5d1a0 100644
--- a/pkg/cmd/pulumi/destroy.go
+++ b/pkg/cmd/pulumi/destroy.go
@@ -21,12 +21,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 func newDestroyCmd() *cobra.Command {
@@ -63,8 +63,8 @@ func newDestroyCmd() *cobra.Command {
 		Args: cmdutil.NoArgs,
 		Run: cmdutil.RunResultFunc(func(cmd *cobra.Command, args []string) result.Result {
 			interactive := cmdutil.Interactive()
-			if !interactive {
-				yes = true // auto-approve changes, since we cannot prompt.
+			if !interactive && !yes {
+				return result.FromError(errors.New("--yes must be passed in to proceed when running in non-interactive mode"))
 			}
 
 			opts, err := updateFlagsToOptions(interactive, skipPreview, yes)
diff --git a/pkg/cmd/pulumi/errors.go b/pkg/cmd/pulumi/errors.go
index 7f23e93ce..dfc96e5bf 100644
--- a/pkg/cmd/pulumi/errors.go
+++ b/pkg/cmd/pulumi/errors.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // PrintEngineResult optionally provides a place for the CLI to provide human-friendly error
diff --git a/pkg/cmd/pulumi/gen_completion.go b/pkg/cmd/pulumi/gen_completion.go
index f9bc26933..d7ebb52d5 100644
--- a/pkg/cmd/pulumi/gen_completion.go
+++ b/pkg/cmd/pulumi/gen_completion.go
@@ -22,7 +22,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 // newCompletionCmd returns a new command that, when run, generates a bash or zsh completion script for the CLI.
diff --git a/pkg/cmd/pulumi/gen_markdown.go b/pkg/cmd/pulumi/gen_markdown.go
index f00db8fb1..df17e057d 100644
--- a/pkg/cmd/pulumi/gen_markdown.go
+++ b/pkg/cmd/pulumi/gen_markdown.go
@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 // Used to replace the `## <command>` line in generated markdown files.
diff --git a/pkg/cmd/pulumi/history.go b/pkg/cmd/pulumi/history.go
index 298c55d49..517a61508 100644
--- a/pkg/cmd/pulumi/history.go
+++ b/pkg/cmd/pulumi/history.go
@@ -25,12 +25,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func newHistoryCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/login.go b/pkg/cmd/pulumi/login.go
index 4f07782f0..ba16e4e11 100644
--- a/pkg/cmd/pulumi/login.go
+++ b/pkg/cmd/pulumi/login.go
@@ -23,12 +23,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newLoginCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/logout.go b/pkg/cmd/pulumi/logout.go
index 363a42058..9e78354d6 100644
--- a/pkg/cmd/pulumi/logout.go
+++ b/pkg/cmd/pulumi/logout.go
@@ -18,11 +18,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newLogoutCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/logs.go b/pkg/cmd/pulumi/logs.go
index 339121c4e..e26b64f1b 100644
--- a/pkg/cmd/pulumi/logs.go
+++ b/pkg/cmd/pulumi/logs.go
@@ -23,10 +23,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 // We use RFC 5424 timestamps with millisecond precision for displaying time stamps on log entries. Go does not
diff --git a/pkg/cmd/pulumi/main.go b/pkg/cmd/pulumi/main.go
index 2738d0511..a8883398e 100644
--- a/pkg/cmd/pulumi/main.go
+++ b/pkg/cmd/pulumi/main.go
@@ -20,8 +20,8 @@ import (
 	"runtime"
 	"runtime/debug"
 
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func panicHandler() {
diff --git a/pkg/cmd/pulumi/new.go b/pkg/cmd/pulumi/new.go
index 995e760b2..951f3c459 100644
--- a/pkg/cmd/pulumi/new.go
+++ b/pkg/cmd/pulumi/new.go
@@ -31,21 +31,21 @@ import (
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	surveycore "gopkg.in/AlecAivazis/survey.v1/core"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/npm"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/executable"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/npm"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+  "github.com/pulumi/pulumi/sdk/v2/go/common/util/executable"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type promptForValueFunc func(yes bool, valueType string, defaultValue string, secret bool,
@@ -69,8 +69,8 @@ type newArgs struct {
 }
 
 func runNew(args newArgs) error {
-	if !args.interactive {
-		args.yes = true // auto-approve changes, since we cannot prompt.
+	if !args.interactive && !args.yes {
+		return errors.New("--yes must be passed in to proceed when running in non-interactive mode")
 	}
 
 	// Prepare options.
diff --git a/pkg/cmd/pulumi/new_test.go b/pkg/cmd/pulumi/new_test.go
index 959dfa973..d2de8fc5f 100644
--- a/pkg/cmd/pulumi/new_test.go
+++ b/pkg/cmd/pulumi/new_test.go
@@ -21,10 +21,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -37,6 +37,7 @@ func TestCreatingStackWithArgsSpecifiedName(t *testing.T) {
 
 	var args = newArgs{
 		interactive:       false,
+		yes:               true,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
 		stack:             stackName,
@@ -50,6 +51,26 @@ func TestCreatingStackWithArgsSpecifiedName(t *testing.T) {
 	removeStack(t, stackName)
 }
 
+func TestFailInInteractiveWithoutYes(t *testing.T) {
+	skipIfShort(t)
+
+	tempdir, _ := ioutil.TempDir("", "test-env")
+	defer os.RemoveAll(tempdir)
+	assert.NoError(t, os.Chdir(tempdir))
+
+	var args = newArgs{
+		interactive:       false,
+		yes:               false,
+		prompt:            promptForValue,
+		secretsProvider:   "default",
+		stack:             stackName,
+		templateNameOrURL: "typescript",
+	}
+
+	err := runNew(args)
+	assert.Error(t, err)
+}
+
 func TestCreatingStackWithPromptedName(t *testing.T) {
 	skipIfShort(t)
 
@@ -83,6 +104,7 @@ func TestCreatingStackWithArgsSpecifiedOrgName(t *testing.T) {
 
 	var args = newArgs{
 		interactive:       false,
+		yes:               true,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
 		stack:             orgStackName,
@@ -133,6 +155,7 @@ func TestCreatingStackWithArgsSpecifiedFullNameSucceeds(t *testing.T) {
 
 	var args = newArgs{
 		interactive:       false,
+		yes:               true,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
 		stack:             fullStackName,
@@ -182,6 +205,7 @@ func TestCreatingProjectWithArgsSpecifiedName(t *testing.T) {
 
 	var args = newArgs{
 		interactive:       false,
+		yes:               true,
 		name:              uniqueProjectName,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
@@ -237,6 +261,7 @@ func TestCreatingProjectWithExistingArgsSpecifiedNameFails(t *testing.T) {
 
 	var args = newArgs{
 		interactive:       false,
+		yes:               true,
 		name:              projectName,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
@@ -290,6 +315,7 @@ func TestGeneratingProjectWithExistingArgsSpecifiedNameSucceeds(t *testing.T) {
 	var args = newArgs{
 		generateOnly:      true,
 		interactive:       false,
+		yes:               true,
 		name:              projectName,
 		prompt:            promptForValue,
 		secretsProvider:   "default",
@@ -349,6 +375,7 @@ func TestGeneratingProjectWithInvalidArgsSpecifiedNameFails(t *testing.T) {
 	var args = newArgs{
 		generateOnly:      true,
 		interactive:       false,
+		yes:               true,
 		name:              "not#valid",
 		prompt:            promptForValue,
 		secretsProvider:   "default",
@@ -397,6 +424,8 @@ func TestInvalidTemplateName(t *testing.T) {
 		assert.NoError(t, os.Chdir(tempdir))
 
 		var args = newArgs{
+			interactive:       false,
+			yes:               true,
 			secretsProvider:   "default",
 			templateNameOrURL: "",
 		}
@@ -417,6 +446,8 @@ func TestInvalidTemplateName(t *testing.T) {
 		template := "this-is-not-the-template-youre-looking-for"
 
 		var args = newArgs{
+			interactive:       false,
+			yes:               true,
 			secretsProvider:   "default",
 			templateNameOrURL: template,
 		}
diff --git a/pkg/cmd/pulumi/plugin.go b/pkg/cmd/pulumi/plugin.go
index fbeeca7cf..691812d53 100644
--- a/pkg/cmd/pulumi/plugin.go
+++ b/pkg/cmd/pulumi/plugin.go
@@ -17,11 +17,11 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newPluginCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/plugin_install.go b/pkg/cmd/pulumi/plugin_install.go
index cd5120147..d39ba97b5 100644
--- a/pkg/cmd/pulumi/plugin_install.go
+++ b/pkg/cmd/pulumi/plugin_install.go
@@ -23,11 +23,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newPluginInstallCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/plugin_ls.go b/pkg/cmd/pulumi/plugin_ls.go
index a4d6e804c..89365b4bf 100644
--- a/pkg/cmd/pulumi/plugin_ls.go
+++ b/pkg/cmd/pulumi/plugin_ls.go
@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newPluginLsCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/plugin_rm.go b/pkg/cmd/pulumi/plugin_rm.go
index d72bdca32..c09570d71 100644
--- a/pkg/cmd/pulumi/plugin_rm.go
+++ b/pkg/cmd/pulumi/plugin_rm.go
@@ -22,10 +22,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newPluginRmCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/policy.go b/pkg/cmd/pulumi/policy.go
index 3676b7005..fc89abc3d 100644
--- a/pkg/cmd/pulumi/policy.go
+++ b/pkg/cmd/pulumi/policy.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_disable.go b/pkg/cmd/pulumi/policy_disable.go
index d78b71f38..95721c58d 100644
--- a/pkg/cmd/pulumi/policy_disable.go
+++ b/pkg/cmd/pulumi/policy_disable.go
@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_enable.go b/pkg/cmd/pulumi/policy_enable.go
index 637950184..f57148e95 100644
--- a/pkg/cmd/pulumi/policy_enable.go
+++ b/pkg/cmd/pulumi/policy_enable.go
@@ -17,10 +17,10 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	resourceanalyzer "github.com/pulumi/pulumi/pkg/resource/analyzer"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	resourceanalyzer "github.com/pulumi/pulumi/pkg/v2/resource/analyzer"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_group_ls.go b/pkg/cmd/pulumi/policy_group_ls.go
index adadc65c3..de43d9b61 100644
--- a/pkg/cmd/pulumi/policy_group_ls.go
+++ b/pkg/cmd/pulumi/policy_group_ls.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"strconv"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_ls.go b/pkg/cmd/pulumi/policy_ls.go
index 92c611eb4..930d60162 100644
--- a/pkg/cmd/pulumi/policy_ls.go
+++ b/pkg/cmd/pulumi/policy_ls.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_new.go b/pkg/cmd/pulumi/policy_new.go
index 642d7ddb2..662de7131 100644
--- a/pkg/cmd/pulumi/policy_new.go
+++ b/pkg/cmd/pulumi/policy_new.go
@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/spf13/cobra"
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	surveycore "gopkg.in/AlecAivazis/survey.v1/core"
@@ -84,8 +84,8 @@ func newPolicyNewCmd() *cobra.Command {
 }
 
 func runNewPolicyPack(args newPolicyArgs) error {
-	if !args.interactive {
-		args.yes = true // auto-approve changes, since we cannot prompt.
+	if !args.interactive && !args.yes {
+		return errors.New("--yes must be passed in to proceed when running in non-interactive mode")
 	}
 
 	// Prepare options.
diff --git a/pkg/cmd/pulumi/policy_new_test.go b/pkg/cmd/pulumi/policy_new_test.go
index bae76dcf1..8f5e2392a 100644
--- a/pkg/cmd/pulumi/policy_new_test.go
+++ b/pkg/cmd/pulumi/policy_new_test.go
@@ -31,6 +31,7 @@ func TestCreatingPolicyPackWithArgsSpecifiedName(t *testing.T) {
 
 	var args = newPolicyArgs{
 		interactive:       false,
+		yes:               true,
 		templateNameOrURL: "aws-typescript",
 	}
 
@@ -73,6 +74,8 @@ func TestInvalidPolicyPackTemplateName(t *testing.T) {
 		assert.NoError(t, os.Chdir(tempdir))
 
 		var args = newPolicyArgs{
+			interactive:       false,
+			yes:               true,
 			templateNameOrURL: nonExistantTemplate,
 		}
 
diff --git a/pkg/cmd/pulumi/policy_publish.go b/pkg/cmd/pulumi/policy_publish.go
index de174d412..47b56a88c 100644
--- a/pkg/cmd/pulumi/policy_publish.go
+++ b/pkg/cmd/pulumi/policy_publish.go
@@ -18,16 +18,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/engine"
-
-	"github.com/pulumi/pulumi/pkg/backend"
-
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_rm.go b/pkg/cmd/pulumi/policy_rm.go
index da58d1a06..87b344e4c 100644
--- a/pkg/cmd/pulumi/policy_rm.go
+++ b/pkg/cmd/pulumi/policy_rm.go
@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/policy_validate.go b/pkg/cmd/pulumi/policy_validate.go
index a1ff34fa0..0cda98c41 100644
--- a/pkg/cmd/pulumi/policy_validate.go
+++ b/pkg/cmd/pulumi/policy_validate.go
@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/preview.go b/pkg/cmd/pulumi/preview.go
index 763a8f26c..95b93ff7b 100644
--- a/pkg/cmd/pulumi/preview.go
+++ b/pkg/cmd/pulumi/preview.go
@@ -18,12 +18,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 func newPreviewCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/pulumi.go b/pkg/cmd/pulumi/pulumi.go
index 7aed5f3f8..869b9b3aa 100644
--- a/pkg/cmd/pulumi/pulumi.go
+++ b/pkg/cmd/pulumi/pulumi.go
@@ -35,18 +35,18 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // NewPulumiCmd creates a new Pulumi Cmd instance.
diff --git a/pkg/cmd/pulumi/query.go b/pkg/cmd/pulumi/query.go
index ba41a50ac..1100c4f4d 100644
--- a/pkg/cmd/pulumi/query.go
+++ b/pkg/cmd/pulumi/query.go
@@ -19,11 +19,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // intentionally disabling here for cleaner err declaration/assignment.
diff --git a/pkg/cmd/pulumi/refresh.go b/pkg/cmd/pulumi/refresh.go
index aa891c737..0cc766f01 100644
--- a/pkg/cmd/pulumi/refresh.go
+++ b/pkg/cmd/pulumi/refresh.go
@@ -20,12 +20,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 func newRefreshCmd() *cobra.Command {
@@ -61,8 +61,8 @@ func newRefreshCmd() *cobra.Command {
 		Args: cmdutil.NoArgs,
 		Run: cmdutil.RunResultFunc(func(cmd *cobra.Command, args []string) result.Result {
 			interactive := cmdutil.Interactive()
-			if !interactive {
-				yes = true // auto-approve changes, since we cannot prompt.
+			if !interactive && !yes {
+				return result.FromError(errors.New("--yes must be passed in to proceed when running in non-interactive mode"))
 			}
 
 			opts, err := updateFlagsToOptions(interactive, skipPreview, yes)
diff --git a/pkg/cmd/pulumi/stack.go b/pkg/cmd/pulumi/stack.go
index 981b641ae..25567bfd1 100644
--- a/pkg/cmd/pulumi/stack.go
+++ b/pkg/cmd/pulumi/stack.go
@@ -23,11 +23,11 @@ import (
 	humanize "github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newStackCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_export.go b/pkg/cmd/pulumi/stack_export.go
index 90c707238..08320bcfb 100644
--- a/pkg/cmd/pulumi/stack_export.go
+++ b/pkg/cmd/pulumi/stack_export.go
@@ -21,10 +21,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newStackExportCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_graph.go b/pkg/cmd/pulumi/stack_graph.go
index dfb12a151..bc588782e 100644
--- a/pkg/cmd/pulumi/stack_graph.go
+++ b/pkg/cmd/pulumi/stack_graph.go
@@ -18,12 +18,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/graph"
-	"github.com/pulumi/pulumi/pkg/graph/dotconv"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/graph"
+	"github.com/pulumi/pulumi/pkg/v2/graph/dotconv"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/stack_import.go b/pkg/cmd/pulumi/stack_import.go
index 8e1edc533..19b6f3e68 100644
--- a/pkg/cmd/pulumi/stack_import.go
+++ b/pkg/cmd/pulumi/stack_import.go
@@ -23,11 +23,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newStackImportCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_init.go b/pkg/cmd/pulumi/stack_init.go
index b980f5dd8..a19e58ec9 100644
--- a/pkg/cmd/pulumi/stack_init.go
+++ b/pkg/cmd/pulumi/stack_init.go
@@ -20,8 +20,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 const (
diff --git a/pkg/cmd/pulumi/stack_ls.go b/pkg/cmd/pulumi/stack_ls.go
index 2f7174bbc..7376e9b74 100644
--- a/pkg/cmd/pulumi/stack_ls.go
+++ b/pkg/cmd/pulumi/stack_ls.go
@@ -23,12 +23,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newStackLsCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_output.go b/pkg/cmd/pulumi/stack_output.go
index 6a57851b6..32e19f96e 100644
--- a/pkg/cmd/pulumi/stack_output.go
+++ b/pkg/cmd/pulumi/stack_output.go
@@ -20,11 +20,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newStackOutputCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_rename.go b/pkg/cmd/pulumi/stack_rename.go
index b6ec928aa..0aaef3158 100644
--- a/pkg/cmd/pulumi/stack_rename.go
+++ b/pkg/cmd/pulumi/stack_rename.go
@@ -19,15 +19,15 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newStackRenameCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_rm.go b/pkg/cmd/pulumi/stack_rm.go
index fee1bb1e0..6c12d1053 100644
--- a/pkg/cmd/pulumi/stack_rm.go
+++ b/pkg/cmd/pulumi/stack_rm.go
@@ -18,16 +18,16 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func newStackRmCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/stack_select.go b/pkg/cmd/pulumi/stack_select.go
index cf2f61e56..0bcf77d01 100644
--- a/pkg/cmd/pulumi/stack_select.go
+++ b/pkg/cmd/pulumi/stack_select.go
@@ -18,10 +18,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // newStackSelectCmd handles both the "local" and "cloud" scenarios in its implementation.
diff --git a/pkg/cmd/pulumi/stack_tag.go b/pkg/cmd/pulumi/stack_tag.go
index 15f742838..376160689 100644
--- a/pkg/cmd/pulumi/stack_tag.go
+++ b/pkg/cmd/pulumi/stack_tag.go
@@ -21,10 +21,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 func newStackTagCmd() *cobra.Command {
diff --git a/pkg/cmd/pulumi/state.go b/pkg/cmd/pulumi/state.go
index d397dae3e..eca7651ec 100644
--- a/pkg/cmd/pulumi/state.go
+++ b/pkg/cmd/pulumi/state.go
@@ -18,19 +18,19 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/edit"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/edit"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	surveycore "gopkg.in/AlecAivazis/survey.v1/core"
diff --git a/pkg/cmd/pulumi/state_delete.go b/pkg/cmd/pulumi/state_delete.go
index 93e9b4ffb..f19b9f1eb 100644
--- a/pkg/cmd/pulumi/state_delete.go
+++ b/pkg/cmd/pulumi/state_delete.go
@@ -17,13 +17,12 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/edit"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/edit"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 
 	"github.com/spf13/cobra"
 )
diff --git a/pkg/cmd/pulumi/state_unprotect.go b/pkg/cmd/pulumi/state_unprotect.go
index a7ef4d6f6..261a0f9f4 100644
--- a/pkg/cmd/pulumi/state_unprotect.go
+++ b/pkg/cmd/pulumi/state_unprotect.go
@@ -17,16 +17,13 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-
-	"github.com/pulumi/pulumi/pkg/resource/edit"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/edit"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 
 	"github.com/spf13/cobra"
 )
diff --git a/pkg/cmd/pulumi/up.go b/pkg/cmd/pulumi/up.go
index caac47952..ddb9c1619 100644
--- a/pkg/cmd/pulumi/up.go
+++ b/pkg/cmd/pulumi/up.go
@@ -21,22 +21,20 @@ import (
 	"math"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-
 	"github.com/pkg/errors"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/spf13/cobra"
-
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
 )
 
 const (
@@ -334,8 +332,8 @@ func newUpCmd() *cobra.Command {
 		Args: cmdutil.MaximumNArgs(1),
 		Run: cmdutil.RunResultFunc(func(cmd *cobra.Command, args []string) result.Result {
 			interactive := cmdutil.Interactive()
-			if !interactive {
-				yes = true // auto-approve changes, since we cannot prompt.
+			if !interactive && !yes {
+				return result.FromError(errors.New("--yes must be passed in to proceed when running in non-interactive mode"))
 			}
 
 			opts, err := updateFlagsToOptions(interactive, skipPreview, yes)
diff --git a/pkg/cmd/pulumi/util.go b/pkg/cmd/pulumi/util.go
index 2480ad934..27de34ccd 100644
--- a/pkg/cmd/pulumi/util.go
+++ b/pkg/cmd/pulumi/util.go
@@ -35,22 +35,22 @@ import (
 	surveycore "gopkg.in/AlecAivazis/survey.v1/core"
 	git "gopkg.in/src-d/go-git.v4"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate"
-	"github.com/pulumi/pulumi/pkg/backend/state"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/secrets/passphrase"
-	"github.com/pulumi/pulumi/pkg/util/cancel"
-	"github.com/pulumi/pulumi/pkg/util/tracing"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/ciutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/gitutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/state"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase"
+	"github.com/pulumi/pulumi/pkg/v2/util/cancel"
+	"github.com/pulumi/pulumi/pkg/v2/util/tracing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/ciutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/gitutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func hasDebugCommands() bool {
diff --git a/pkg/cmd/pulumi/util_test.go b/pkg/cmd/pulumi/util_test.go
index 50dd7b937..cf3f5ee6e 100644
--- a/pkg/cmd/pulumi/util_test.go
+++ b/pkg/cmd/pulumi/util_test.go
@@ -17,9 +17,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	pul_testing "github.com/pulumi/pulumi/sdk/go/common/testing"
-	"github.com/pulumi/pulumi/sdk/go/common/util/gitutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	pul_testing "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/gitutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/cmd/pulumi/version.go b/pkg/cmd/pulumi/version.go
index 0b6b9e23b..f9248a765 100644
--- a/pkg/cmd/pulumi/version.go
+++ b/pkg/cmd/pulumi/version.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/cmd/pulumi/view-trace.go b/pkg/cmd/pulumi/view-trace.go
index d053cc1cb..6a09bc144 100644
--- a/pkg/cmd/pulumi/view-trace.go
+++ b/pkg/cmd/pulumi/view-trace.go
@@ -25,8 +25,8 @@ import (
 	"sourcegraph.com/sourcegraph/appdash"
 	"sourcegraph.com/sourcegraph/appdash/traceapp"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func readTrace(path string, store io.ReaderFrom) error {
diff --git a/pkg/cmd/pulumi/watch.go b/pkg/cmd/pulumi/watch.go
index dfb8eb1d8..69f343885 100644
--- a/pkg/cmd/pulumi/watch.go
+++ b/pkg/cmd/pulumi/watch.go
@@ -20,11 +20,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/pkg/backend"
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/backend"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // intentionally disabling here for cleaner err declaration/assignment.
diff --git a/pkg/cmd/pulumi/whoami.go b/pkg/cmd/pulumi/whoami.go
index d71a21850..766fc0d03 100644
--- a/pkg/cmd/pulumi/whoami.go
+++ b/pkg/cmd/pulumi/whoami.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/pkg/backend/display"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/pkg/v2/backend/display"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/codegen/docs.go b/pkg/codegen/docs.go
index dc27d17d3..9e2e39393 100644
--- a/pkg/codegen/docs.go
+++ b/pkg/codegen/docs.go
@@ -18,7 +18,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 var (
diff --git a/pkg/codegen/docs/gen.go b/pkg/codegen/docs/gen.go
index b024add73..e050446e8 100644
--- a/pkg/codegen/docs/gen.go
+++ b/pkg/codegen/docs/gen.go
@@ -33,13 +33,13 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/dotnet"
-	go_gen "github.com/pulumi/pulumi/pkg/codegen/go"
-	"github.com/pulumi/pulumi/pkg/codegen/nodejs"
-	"github.com/pulumi/pulumi/pkg/codegen/python"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/dotnet"
+	go_gen "github.com/pulumi/pulumi/pkg/v2/codegen/go"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/nodejs"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/python"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 var (
diff --git a/pkg/codegen/docs/gen_function.go b/pkg/codegen/docs/gen_function.go
index 32872a6ba..466e5d029 100644
--- a/pkg/codegen/docs/gen_function.go
+++ b/pkg/codegen/docs/gen_function.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/codegen/python"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/python"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // functionDocArgs represents the args that a Function doc template needs.
@@ -137,8 +137,8 @@ func (mod *modContext) genFunctionGo(f *schema.Function, resourceName string) []
 			Name:         "ctx",
 			OptionalFlag: "*",
 			Type: propertyType{
-				Name: "Context",
-				Link: "https://pkg.go.dev/github.com/pulumi/pulumi/sdk/go/pulumi?tab=doc#Context",
+				Name: "pulumi.Context",
+				Link: "https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/pulumi?tab=doc#Context",
 			},
 		},
 	}
@@ -158,8 +158,8 @@ func (mod *modContext) genFunctionGo(f *schema.Function, resourceName string) []
 		Name:         "opts",
 		OptionalFlag: "...",
 		Type: propertyType{
-			Name: "InvokeOption",
-			Link: "https://pkg.go.dev/github.com/pulumi/pulumi/sdk/go/pulumi?tab=doc#InvokeOption",
+			Name: "pulumi.InvokeOption",
+			Link: "https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/pulumi?tab=doc#InvokeOption",
 		},
 	})
 	return params
diff --git a/pkg/codegen/docs/gen_kubernetes.go b/pkg/codegen/docs/gen_kubernetes.go
index a0f782537..3f62bc996 100644
--- a/pkg/codegen/docs/gen_kubernetes.go
+++ b/pkg/codegen/docs/gen_kubernetes.go
@@ -24,7 +24,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 func isKubernetesPackage(pkg *schema.Package) bool {
diff --git a/pkg/codegen/docs/gen_test.go b/pkg/codegen/docs/gen_test.go
index 9cd77590e..7735af58d 100644
--- a/pkg/codegen/docs/gen_test.go
+++ b/pkg/codegen/docs/gen_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/codegen/python"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/python"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/codegen/docs/utils.go b/pkg/codegen/docs/utils.go
index 85938ec2e..4e0ad80af 100644
--- a/pkg/codegen/docs/utils.go
+++ b/pkg/codegen/docs/utils.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/pulumi/pulumi/pkg/codegen/dotnet"
-	go_gen "github.com/pulumi/pulumi/pkg/codegen/go"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/dotnet"
+	go_gen "github.com/pulumi/pulumi/pkg/v2/codegen/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func isDotNetTypeNameBoundary(prev rune, next rune) bool {
diff --git a/pkg/codegen/dotnet/doc.go b/pkg/codegen/dotnet/doc.go
index 924b3e2e5..cf2d1d5b4 100644
--- a/pkg/codegen/dotnet/doc.go
+++ b/pkg/codegen/dotnet/doc.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // DocLanguageHelper is the DotNet-specific implementation of the DocLanguageHelper.
diff --git a/pkg/codegen/dotnet/doc_test.go b/pkg/codegen/dotnet/doc_test.go
index 6adb3b44a..453547eb8 100644
--- a/pkg/codegen/dotnet/doc_test.go
+++ b/pkg/codegen/dotnet/doc_test.go
@@ -18,7 +18,7 @@ package dotnet
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/codegen/dotnet/gen.go b/pkg/codegen/dotnet/gen.go
index 3e7acb325..b455ed25f 100644
--- a/pkg/codegen/dotnet/gen.go
+++ b/pkg/codegen/dotnet/gen.go
@@ -33,9 +33,9 @@ import (
 	"unicode"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type stringSet map[string]struct{}
@@ -94,6 +94,11 @@ func csharpIdentifier(s string) string {
 	}
 }
 
+func isImmutableArrayType(t schema.Type, wrapInput bool) bool {
+	_, isArray := t.(*schema.ArrayType)
+	return isArray && !wrapInput
+}
+
 func isValueType(t schema.Type) bool {
 	switch t {
 	case schema.BoolType, schema.IntType, schema.NumberType:
@@ -607,9 +612,6 @@ func (mod *modContext) genResource(w io.Writer, r *schema.Resource) error {
 	}
 
 	optionsType := "CustomResourceOptions"
-	if r.IsProvider {
-		optionsType = "ResourceOptions"
-	}
 
 	tok := r.Token
 	if r.IsProvider {
@@ -626,7 +628,7 @@ func (mod *modContext) genResource(w io.Writer, r *schema.Resource) error {
 	fmt.Fprintf(w, "        /// <param name=\"options\">A bag of options that control this resource's behavior</param>\n")
 
 	fmt.Fprintf(w, "        public %s(string name, %s args%s, %s? options = null)\n", className, argsType, argsDefault, optionsType)
-	fmt.Fprintf(w, "            : base(\"%s\", name, args ?? ResourceArgs.Empty, MakeResourceOptions(options, \"\"))\n", tok)
+	fmt.Fprintf(w, "            : base(\"%s\", name, args ?? new %sArgs(), MakeResourceOptions(options, \"\"))\n", tok, className)
 	fmt.Fprintf(w, "        {\n")
 	fmt.Fprintf(w, "        }\n")
 
@@ -740,19 +742,14 @@ func (mod *modContext) genResource(w io.Writer, r *schema.Resource) error {
 }
 
 func (mod *modContext) genFunction(w io.Writer, fun *schema.Function) error {
-	methodName := tokenToName(fun.Token)
+	className := tokenToName(fun.Token)
 
 	fmt.Fprintf(w, "namespace %s\n", mod.tokenToNamespace(fun.Token))
 	fmt.Fprintf(w, "{\n")
 
-	// Open the partial class we'll use for datasources.
-	// TODO(pdg): this needs a better name that is guaranteed to be unique.
-	fmt.Fprintf(w, "    public static partial class Invokes\n")
-	fmt.Fprintf(w, "    {\n")
-
 	var typeParameter string
 	if fun.Outputs != nil {
-		typeParameter = fmt.Sprintf("<%sResult>", methodName)
+		typeParameter = fmt.Sprintf("<%sResult>", className)
 	}
 
 	var argsParamDef string
@@ -769,16 +766,22 @@ func (mod *modContext) genFunction(w io.Writer, fun *schema.Function) error {
 			argsDefault, sigil = " = null", "?"
 		}
 
-		argsParamDef = fmt.Sprintf("%sArgs%s args%s, ", methodName, sigil, argsDefault)
-		argsParamRef = "args ?? InvokeArgs.Empty"
+		argsParamDef = fmt.Sprintf("%sArgs%s args%s, ", className, sigil, argsDefault)
+		argsParamRef = fmt.Sprintf("args ?? new %sArgs()", className)
 	}
 
+	// Open the class we'll use for datasources.
+	fmt.Fprintf(w, "    public static class %s\n", className)
+	fmt.Fprintf(w, "    {\n")
+
 	// Emit the doc comment, if any.
-	printComment(w, codegen.StripNonRelevantExamples(fun.Comment, "csharp"), "        ")
+	printComment(w, fun.Comment, "        ")
 
 	// Emit the datasource method.
-	fmt.Fprintf(w, "        public static Task%s %s(%sInvokeOptions? options = null)\n", typeParameter, methodName, argsParamDef)
-	fmt.Fprintf(w, "            => Pulumi.Deployment.Instance.InvokeAsync%s(\"%s\", %s, options.WithVersion());\n", typeParameter, fun.Token, argsParamRef)
+	fmt.Fprintf(w, "        public static Task%s InvokeAsync(%sInvokeOptions? options = null)\n",
+		typeParameter, argsParamDef)
+	fmt.Fprintf(w, "            => Pulumi.Deployment.Instance.InvokeAsync%s(\"%s\", %s, options.WithVersion());\n",
+		typeParameter, fun.Token, argsParamRef)
 
 	// Close the class.
 	fmt.Fprintf(w, "    }\n")
@@ -789,7 +792,7 @@ func (mod *modContext) genFunction(w io.Writer, fun *schema.Function) error {
 
 		args := &plainType{
 			mod:                   mod,
-			name:                  methodName + "Args",
+			name:                  className + "Args",
 			baseClass:             "InvokeArgs",
 			propertyTypeQualifier: "Inputs",
 			properties:            fun.Inputs.Properties,
@@ -803,7 +806,7 @@ func (mod *modContext) genFunction(w io.Writer, fun *schema.Function) error {
 
 		res := &plainType{
 			mod:                   mod,
-			name:                  methodName + "Result",
+			name:                  className + "Result",
 			propertyTypeQualifier: "Outputs",
 			properties:            fun.Outputs.Properties,
 		}
@@ -961,7 +964,7 @@ func (mod *modContext) genConfig(variables []*schema.Property) (string, error) {
 				typ := mod.typeString(prop.Type, "Types", false, false, false /*wrapInput*/, false, !prop.IsRequired)
 
 				initializer := ""
-				if !prop.IsRequired {
+				if !prop.IsRequired && !isValueType(prop.Type) && !isImmutableArrayType(prop.Type, false) {
 					initializer = " = null!;"
 				}
 
@@ -1060,6 +1063,7 @@ func (mod *modContext) gen(fs fs) error {
 				return err
 			}
 			addFile("Config.cs", config)
+			return nil
 		}
 	}
 
diff --git a/pkg/codegen/dotnet/templates.go b/pkg/codegen/dotnet/templates.go
index 83e240301..d7176778d 100644
--- a/pkg/codegen/dotnet/templates.go
+++ b/pkg/codegen/dotnet/templates.go
@@ -18,11 +18,11 @@ package dotnet
 import (
 	"text/template"
 
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // nolint:lll
-const csharpUtilitiesTemplateText = `// *** WARNING: this file was generated by {.Tool}. ***
+const csharpUtilitiesTemplateText = `// *** WARNING: this file was generated by {{.Tool}}. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 using System;
@@ -120,7 +120,7 @@ const csharpProjectFileTemplateText = `<Project Sdk="Microsoft.NET.Sdk">
     <RepositoryUrl>{{.Package.Repository}}</RepositoryUrl>
     <PackageIcon>logo.png</PackageIcon>
 
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/pkg/codegen/go/doc.go b/pkg/codegen/go/doc.go
index e313abdfa..e5a31c9db 100644
--- a/pkg/codegen/go/doc.go
+++ b/pkg/codegen/go/doc.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // DocLanguageHelper is the Go-specific implementation of the DocLanguageHelper.
@@ -50,7 +50,7 @@ func (d DocLanguageHelper) GetDocLinkForResourceType(packageName string, moduleN
 	if packageName != "" {
 		return fmt.Sprintf("https://pkg.go.dev/github.com/pulumi/pulumi-%s/sdk/go/%s?tab=doc#%s", packageName, path, typeName)
 	}
-	return fmt.Sprintf("https://pkg.go.dev/github.com/pulumi/pulumi/sdk/go/%s?tab=doc#%s", path, typeName)
+	return fmt.Sprintf("https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/%s?tab=doc#%s", path, typeName)
 }
 
 // GetDocLinkForResourceInputOrOutputType returns the godoc URL for an input or output type.
diff --git a/pkg/codegen/go/gen.go b/pkg/codegen/go/gen.go
index 905b0df33..b40342c45 100644
--- a/pkg/codegen/go/gen.go
+++ b/pkg/codegen/go/gen.go
@@ -33,9 +33,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type stringSet map[string]struct{}
@@ -923,7 +923,7 @@ func (pkg *pkgContext) getImports(member interface{}, imports stringSet) {
 		return
 	}
 
-	imports.add("github.com/pulumi/pulumi/sdk/go/pulumi")
+	imports.add("github.com/pulumi/pulumi/sdk/v2/go/pulumi")
 }
 
 func (pkg *pkgContext) genHeader(w io.Writer, goImports []string, importedPackages stringSet) {
@@ -977,7 +977,7 @@ func (pkg *pkgContext) genHeader(w io.Writer, goImports []string, importedPackag
 }
 
 func (pkg *pkgContext) genConfig(w io.Writer, variables []*schema.Property) error {
-	imports := newStringSet("github.com/pulumi/pulumi/sdk/go/pulumi/config")
+	imports := newStringSet("github.com/pulumi/pulumi/sdk/v2/go/pulumi/config")
 	pkg.getImports(variables, imports)
 
 	pkg.genHeader(w, nil, imports)
diff --git a/pkg/codegen/hcl2/binder.go b/pkg/codegen/hcl2/binder.go
index b54c608cf..5ddbcacb9 100644
--- a/pkg/codegen/hcl2/binder.go
+++ b/pkg/codegen/hcl2/binder.go
@@ -20,10 +20,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type binder struct {
diff --git a/pkg/codegen/hcl2/binder_nodes.go b/pkg/codegen/hcl2/binder_nodes.go
index c2b3ac18f..00608eb7f 100644
--- a/pkg/codegen/hcl2/binder_nodes.go
+++ b/pkg/codegen/hcl2/binder_nodes.go
@@ -17,9 +17,9 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // bindNode binds a single node in a program. The node's dependencies are bound prior to the node itself; it is an
diff --git a/pkg/codegen/hcl2/binder_resource.go b/pkg/codegen/hcl2/binder_resource.go
index 984256a50..bd6bea5a9 100644
--- a/pkg/codegen/hcl2/binder_resource.go
+++ b/pkg/codegen/hcl2/binder_resource.go
@@ -18,10 +18,10 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 func getResourceToken(node *Resource) (string, hcl.Range) {
diff --git a/pkg/codegen/hcl2/binder_schema.go b/pkg/codegen/hcl2/binder_schema.go
index 0618837a8..2dd3bafaf 100644
--- a/pkg/codegen/hcl2/binder_schema.go
+++ b/pkg/codegen/hcl2/binder_schema.go
@@ -20,11 +20,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type packageSchema struct {
diff --git a/pkg/codegen/hcl2/binder_test.go b/pkg/codegen/hcl2/binder_test.go
index 7b450e936..7293c3115 100644
--- a/pkg/codegen/hcl2/binder_test.go
+++ b/pkg/codegen/hcl2/binder_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/pkg/codegen/internal/test"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/internal/test"
 )
 
 var testdataPath = filepath.Join("..", "internal", "test", "testdata")
diff --git a/pkg/codegen/hcl2/component.go b/pkg/codegen/hcl2/component.go
index 687c1d3b4..035f77e1a 100644
--- a/pkg/codegen/hcl2/component.go
+++ b/pkg/codegen/hcl2/component.go
@@ -16,7 +16,7 @@ package hcl2
 
 import (
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 // Component represents a component definition in a program.
diff --git a/pkg/codegen/hcl2/config.go b/pkg/codegen/hcl2/config.go
index c86836f87..785225e9e 100644
--- a/pkg/codegen/hcl2/config.go
+++ b/pkg/codegen/hcl2/config.go
@@ -17,7 +17,7 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 // ConfigVariable represents a program- or component-scoped input variable. The value for a config variable may come
diff --git a/pkg/codegen/hcl2/diagnostics.go b/pkg/codegen/hcl2/diagnostics.go
index 0d46b8a48..621f0a8bd 100644
--- a/pkg/codegen/hcl2/diagnostics.go
+++ b/pkg/codegen/hcl2/diagnostics.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 func errorf(subject hcl.Range, f string, args ...interface{}) *hcl.Diagnostic {
diff --git a/pkg/codegen/hcl2/functions.go b/pkg/codegen/hcl2/functions.go
index d85cf229a..085f002c2 100644
--- a/pkg/codegen/hcl2/functions.go
+++ b/pkg/codegen/hcl2/functions.go
@@ -16,7 +16,7 @@ package hcl2
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 func getEntriesSignature(args []model.Expression) (model.StaticFunctionSignature, hcl.Diagnostics) {
diff --git a/pkg/codegen/hcl2/intrinsics.go b/pkg/codegen/hcl2/intrinsics.go
index be76a23f2..a489db076 100644
--- a/pkg/codegen/hcl2/intrinsics.go
+++ b/pkg/codegen/hcl2/intrinsics.go
@@ -15,8 +15,8 @@
 package hcl2
 
 import (
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 const (
diff --git a/pkg/codegen/hcl2/invoke.go b/pkg/codegen/hcl2/invoke.go
index df11cb293..8de435a06 100644
--- a/pkg/codegen/hcl2/invoke.go
+++ b/pkg/codegen/hcl2/invoke.go
@@ -17,7 +17,7 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/pkg/codegen/hcl2/local.go b/pkg/codegen/hcl2/local.go
index fd31f8a8c..9e6abc14e 100644
--- a/pkg/codegen/hcl2/local.go
+++ b/pkg/codegen/hcl2/local.go
@@ -17,8 +17,8 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // LocalVariable represents a program- or component-scoped local variable.
diff --git a/pkg/codegen/hcl2/model/attribute.go b/pkg/codegen/hcl2/model/attribute.go
index f0b0fc789..826a0de11 100644
--- a/pkg/codegen/hcl2/model/attribute.go
+++ b/pkg/codegen/hcl2/model/attribute.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // Attribute represents an HCL2 attribute.
diff --git a/pkg/codegen/hcl2/model/binder_expression.go b/pkg/codegen/hcl2/model/binder_expression.go
index a4d6bf260..5c7ba1fb9 100644
--- a/pkg/codegen/hcl2/model/binder_expression.go
+++ b/pkg/codegen/hcl2/model/binder_expression.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	_syntax "github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	_syntax "github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 )
diff --git a/pkg/codegen/hcl2/model/binder_expression_test.go b/pkg/codegen/hcl2/model/binder_expression_test.go
index f8f79946f..7926191c8 100644
--- a/pkg/codegen/hcl2/model/binder_expression_test.go
+++ b/pkg/codegen/hcl2/model/binder_expression_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 	"github.com/stretchr/testify/assert"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/pkg/codegen/hcl2/model/block.go b/pkg/codegen/hcl2/model/block.go
index 08ed422d1..1aeb408a6 100644
--- a/pkg/codegen/hcl2/model/block.go
+++ b/pkg/codegen/hcl2/model/block.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // Block represents an HCL2 block.
diff --git a/pkg/codegen/hcl2/model/body.go b/pkg/codegen/hcl2/model/body.go
index 9b6d1ef9f..cf96600eb 100644
--- a/pkg/codegen/hcl2/model/body.go
+++ b/pkg/codegen/hcl2/model/body.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // BodyItem represents either an *Attribute or a *Block that is part of an HCL2 Body.
diff --git a/pkg/codegen/hcl2/model/expression.go b/pkg/codegen/hcl2/model/expression.go
index be381e583..f4a60dd37 100644
--- a/pkg/codegen/hcl2/model/expression.go
+++ b/pkg/codegen/hcl2/model/expression.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/pkg/codegen/hcl2/model/format/gen.go b/pkg/codegen/hcl2/model/format/gen.go
index 512f00192..c38da8030 100644
--- a/pkg/codegen/hcl2/model/format/gen.go
+++ b/pkg/codegen/hcl2/model/format/gen.go
@@ -19,8 +19,8 @@ import (
 	"io"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // ExpressionGenerator is an interface that can be implemented in order to generate code for semantically-analyzed HCL2
diff --git a/pkg/codegen/hcl2/model/functions.go b/pkg/codegen/hcl2/model/functions.go
index 091a84685..6e4c18bf5 100644
--- a/pkg/codegen/hcl2/model/functions.go
+++ b/pkg/codegen/hcl2/model/functions.go
@@ -17,7 +17,7 @@ package model
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // FunctionSignature represents a possibly-type-polymorphic function signature.
diff --git a/pkg/codegen/hcl2/model/scope.go b/pkg/codegen/hcl2/model/scope.go
index f6030ff20..7aa67b3f4 100644
--- a/pkg/codegen/hcl2/model/scope.go
+++ b/pkg/codegen/hcl2/model/scope.go
@@ -17,7 +17,7 @@ package model
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // Definition represents a single definition in a Scope.
diff --git a/pkg/codegen/hcl2/model/traversable.go b/pkg/codegen/hcl2/model/traversable.go
index 7c1e0667c..a04dad578 100644
--- a/pkg/codegen/hcl2/model/traversable.go
+++ b/pkg/codegen/hcl2/model/traversable.go
@@ -16,7 +16,7 @@ package model
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/pkg/codegen/hcl2/model/type.go b/pkg/codegen/hcl2/model/type.go
index ef443b98c..5fb9b715e 100644
--- a/pkg/codegen/hcl2/model/type.go
+++ b/pkg/codegen/hcl2/model/type.go
@@ -15,7 +15,7 @@
 package model
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type ConversionKind int
diff --git a/pkg/codegen/hcl2/model/type_list.go b/pkg/codegen/hcl2/model/type_list.go
index 33ed02f3f..8aac63817 100644
--- a/pkg/codegen/hcl2/model/type_list.go
+++ b/pkg/codegen/hcl2/model/type_list.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // ListType represents lists of particular element types.
diff --git a/pkg/codegen/hcl2/model/type_map.go b/pkg/codegen/hcl2/model/type_map.go
index 4d46bbe78..8ff3a4eb8 100644
--- a/pkg/codegen/hcl2/model/type_map.go
+++ b/pkg/codegen/hcl2/model/type_map.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // MapType represents maps from strings to particular element types.
diff --git a/pkg/codegen/hcl2/model/type_none.go b/pkg/codegen/hcl2/model/type_none.go
index b78b7a398..92701a8cd 100644
--- a/pkg/codegen/hcl2/model/type_none.go
+++ b/pkg/codegen/hcl2/model/type_none.go
@@ -17,7 +17,7 @@ package model
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 type noneType int
diff --git a/pkg/codegen/hcl2/model/type_object.go b/pkg/codegen/hcl2/model/type_object.go
index 986645134..3c825a6c0 100644
--- a/pkg/codegen/hcl2/model/type_object.go
+++ b/pkg/codegen/hcl2/model/type_object.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 )
diff --git a/pkg/codegen/hcl2/model/type_opaque.go b/pkg/codegen/hcl2/model/type_opaque.go
index 4a5b01b8a..c9d634270 100644
--- a/pkg/codegen/hcl2/model/type_opaque.go
+++ b/pkg/codegen/hcl2/model/type_opaque.go
@@ -20,8 +20,8 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // OpaqueType represents a type that is named by a string.
diff --git a/pkg/codegen/hcl2/model/type_output.go b/pkg/codegen/hcl2/model/type_output.go
index 7bde3233b..e96b9b7b7 100644
--- a/pkg/codegen/hcl2/model/type_output.go
+++ b/pkg/codegen/hcl2/model/type_output.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // OutputType represents eventual values that carry additional application-specific information.
diff --git a/pkg/codegen/hcl2/model/type_promise.go b/pkg/codegen/hcl2/model/type_promise.go
index 7eea1d57b..fa993f621 100644
--- a/pkg/codegen/hcl2/model/type_promise.go
+++ b/pkg/codegen/hcl2/model/type_promise.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // PromiseType represents eventual values that do not carry additional information.
diff --git a/pkg/codegen/hcl2/model/type_scope.go b/pkg/codegen/hcl2/model/type_scope.go
index 11b56da74..296fca6c6 100644
--- a/pkg/codegen/hcl2/model/type_scope.go
+++ b/pkg/codegen/hcl2/model/type_scope.go
@@ -2,7 +2,7 @@ package model
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 var typeBuiltins = map[string]Type{
diff --git a/pkg/codegen/hcl2/model/type_set.go b/pkg/codegen/hcl2/model/type_set.go
index 7d3a9d66b..aa3c753c8 100644
--- a/pkg/codegen/hcl2/model/type_set.go
+++ b/pkg/codegen/hcl2/model/type_set.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // SetType represents sets of particular element types.
diff --git a/pkg/codegen/hcl2/model/type_tuple.go b/pkg/codegen/hcl2/model/type_tuple.go
index c88f32e25..c3ec16691 100644
--- a/pkg/codegen/hcl2/model/type_tuple.go
+++ b/pkg/codegen/hcl2/model/type_tuple.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/pkg/codegen/hcl2/model/type_union.go b/pkg/codegen/hcl2/model/type_union.go
index 64886128e..666b9c796 100644
--- a/pkg/codegen/hcl2/model/type_union.go
+++ b/pkg/codegen/hcl2/model/type_union.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // UnionType represents values that may be any one of a specified set of types.
diff --git a/pkg/codegen/hcl2/model/utilities.go b/pkg/codegen/hcl2/model/utilities.go
index 716b0813c..f7461efa3 100644
--- a/pkg/codegen/hcl2/model/utilities.go
+++ b/pkg/codegen/hcl2/model/utilities.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 func syntaxOrNone(node hclsyntax.Node) hclsyntax.Node {
diff --git a/pkg/codegen/hcl2/model/visitor.go b/pkg/codegen/hcl2/model/visitor.go
index d256124db..40a66c076 100644
--- a/pkg/codegen/hcl2/model/visitor.go
+++ b/pkg/codegen/hcl2/model/visitor.go
@@ -16,7 +16,7 @@ package model
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // A BodyItemVisitor is a function that visits and optionally replaces the contents of a body item.
diff --git a/pkg/codegen/hcl2/output.go b/pkg/codegen/hcl2/output.go
index a899e419d..9c8f4001f 100644
--- a/pkg/codegen/hcl2/output.go
+++ b/pkg/codegen/hcl2/output.go
@@ -17,7 +17,7 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 // OutputVariable represents a program- or component-scoped output variable.
diff --git a/pkg/codegen/hcl2/program.go b/pkg/codegen/hcl2/program.go
index 379057dd9..0eccd9c07 100644
--- a/pkg/codegen/hcl2/program.go
+++ b/pkg/codegen/hcl2/program.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // Node represents a single definition in a program or component. Nodes may be config, locals, resources, or outputs.
diff --git a/pkg/codegen/hcl2/resource.go b/pkg/codegen/hcl2/resource.go
index 6b8b2a8b7..be7d87b82 100644
--- a/pkg/codegen/hcl2/resource.go
+++ b/pkg/codegen/hcl2/resource.go
@@ -17,8 +17,8 @@ package hcl2
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 // ResourceOptions represents a resource instantiation's options.
diff --git a/pkg/codegen/hcl2/rewriters.go b/pkg/codegen/hcl2/rewriters.go
index 4493110bc..73448456e 100644
--- a/pkg/codegen/hcl2/rewriters.go
+++ b/pkg/codegen/hcl2/rewriters.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type NameInfo interface {
diff --git a/pkg/codegen/hcl2/syntax/comments.go b/pkg/codegen/hcl2/syntax/comments.go
index 813dcedd3..dbd4d2860 100644
--- a/pkg/codegen/hcl2/syntax/comments.go
+++ b/pkg/codegen/hcl2/syntax/comments.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // tokenList is a list of Tokens with methods to aid in mapping source positions to tokens.
diff --git a/pkg/codegen/hcl2/type.go b/pkg/codegen/hcl2/type.go
index c38d38423..0fc7f032d 100644
--- a/pkg/codegen/hcl2/type.go
+++ b/pkg/codegen/hcl2/type.go
@@ -15,7 +15,7 @@
 package hcl2
 
 import (
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 var (
diff --git a/pkg/codegen/hcl2/utilities.go b/pkg/codegen/hcl2/utilities.go
index 2307d1bcd..238cd4bfb 100644
--- a/pkg/codegen/hcl2/utilities.go
+++ b/pkg/codegen/hcl2/utilities.go
@@ -21,8 +21,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 )
 
 // titleCase replaces the first character in the given string with its upper-case equivalent.
diff --git a/pkg/codegen/internal/test/host.go b/pkg/codegen/internal/test/host.go
index fabcb0538..f52e8fa97 100644
--- a/pkg/codegen/internal/test/host.go
+++ b/pkg/codegen/internal/test/host.go
@@ -2,8 +2,8 @@ package test
 
 import (
 	"github.com/blang/semver"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/deploytest"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/deploytest"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 )
 
 func NewHost(schemaDirectoryPath string) plugin.Host {
diff --git a/pkg/codegen/internal/test/providers.go b/pkg/codegen/internal/test/providers.go
index 0698f090f..ef2671e75 100644
--- a/pkg/codegen/internal/test/providers.go
+++ b/pkg/codegen/internal/test/providers.go
@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/deploytest"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/deploytest"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 )
 
 func GetSchema(schemaDirectoryPath, providerName string) ([]byte, error) {
diff --git a/pkg/codegen/nodejs/doc.go b/pkg/codegen/nodejs/doc.go
index 8d3c1df8d..250677ae4 100644
--- a/pkg/codegen/nodejs/doc.go
+++ b/pkg/codegen/nodejs/doc.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // DocLanguageHelper is the NodeJS-specific implementation of the DocLanguageHelper.
diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go
index b7d70a707..460b04a1d 100644
--- a/pkg/codegen/nodejs/gen.go
+++ b/pkg/codegen/nodejs/gen.go
@@ -32,9 +32,9 @@ import (
 	"unicode"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type stringSet map[string]struct{}
diff --git a/pkg/codegen/nodejs/gen_intrinsics.go b/pkg/codegen/nodejs/gen_intrinsics.go
index 0c0ee72e0..9daf7c8fa 100644
--- a/pkg/codegen/nodejs/gen_intrinsics.go
+++ b/pkg/codegen/nodejs/gen_intrinsics.go
@@ -14,7 +14,7 @@
 
 package nodejs
 
-import "github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
+import "github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
 
 const (
 	// intrinsicAwait is the name of the await intrinsic.
diff --git a/pkg/codegen/nodejs/gen_program.go b/pkg/codegen/nodejs/gen_program.go
index e8d86c82d..c989f718c 100644
--- a/pkg/codegen/nodejs/gen_program.go
+++ b/pkg/codegen/nodejs/gen_program.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model/format"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model/format"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 type generator struct {
diff --git a/pkg/codegen/nodejs/gen_program_expressions.go b/pkg/codegen/nodejs/gen_program_expressions.go
index a0ee12344..4887bf7fa 100644
--- a/pkg/codegen/nodejs/gen_program_expressions.go
+++ b/pkg/codegen/nodejs/gen_program_expressions.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 )
diff --git a/pkg/codegen/nodejs/gen_program_lower.go b/pkg/codegen/nodejs/gen_program_lower.go
index 3e6de4c28..5f41b8a9b 100644
--- a/pkg/codegen/nodejs/gen_program_lower.go
+++ b/pkg/codegen/nodejs/gen_program_lower.go
@@ -3,10 +3,10 @@ package nodejs
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func isOutputType(t model.Type) bool {
diff --git a/pkg/codegen/nodejs/gen_program_test.go b/pkg/codegen/nodejs/gen_program_test.go
index 0278b3e44..3e9eb4d15 100644
--- a/pkg/codegen/nodejs/gen_program_test.go
+++ b/pkg/codegen/nodejs/gen_program_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/pkg/codegen/internal/test"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/internal/test"
 )
 
 var testdataPath = filepath.Join("..", "internal", "test", "testdata")
diff --git a/pkg/codegen/python/doc.go b/pkg/codegen/python/doc.go
index 5dc6e5b98..f94ec9193 100644
--- a/pkg/codegen/python/doc.go
+++ b/pkg/codegen/python/doc.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
 )
 
 // DocLanguageHelper is the Python-specific implementation of the DocLanguageHelper.
diff --git a/pkg/codegen/python/gen.go b/pkg/codegen/python/gen.go
index 5c73f3872..38731e372 100644
--- a/pkg/codegen/python/gen.go
+++ b/pkg/codegen/python/gen.go
@@ -34,9 +34,9 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type stringSet map[string]struct{}
diff --git a/pkg/codegen/python/gen_program.go b/pkg/codegen/python/gen_program.go
index 8aa934206..332825c86 100644
--- a/pkg/codegen/python/gen_program.go
+++ b/pkg/codegen/python/gen_program.go
@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2"
-	"github.com/pulumi/pulumi/pkg/codegen"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model/format"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model/format"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
 )
 
 type generator struct {
diff --git a/pkg/codegen/python/gen_program_expressions.go b/pkg/codegen/python/gen_program_expressions.go
index 63adb2a05..a10edcedf 100644
--- a/pkg/codegen/python/gen_program_expressions.go
+++ b/pkg/codegen/python/gen_program_expressions.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/pkg/codegen/python/gen_program_lower.go b/pkg/codegen/python/gen_program_lower.go
index 36df30082..6d2b584b6 100644
--- a/pkg/codegen/python/gen_program_lower.go
+++ b/pkg/codegen/python/gen_program_lower.go
@@ -3,9 +3,9 @@ package python
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/model"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/model"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // parseProxyApply attempts to match the given parsed apply against the pattern (call __applyArg 0). If the call
diff --git a/pkg/codegen/python/gen_program_test.go b/pkg/codegen/python/gen_program_test.go
index 5fa38457e..55a05b295 100644
--- a/pkg/codegen/python/gen_program_test.go
+++ b/pkg/codegen/python/gen_program_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2"
-	"github.com/pulumi/pulumi/pkg/codegen/hcl2/syntax"
-	"github.com/pulumi/pulumi/pkg/codegen/internal/test"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2/syntax"
+	"github.com/pulumi/pulumi/pkg/v2/codegen/internal/test"
 )
 
 var testdataPath = filepath.Join("..", "internal", "test", "testdata")
diff --git a/pkg/codegen/python/utilities.go b/pkg/codegen/python/utilities.go
index b56753654..63f52a74b 100644
--- a/pkg/codegen/python/utilities.go
+++ b/pkg/codegen/python/utilities.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/pulumi/pulumi/pkg/codegen"
+	"github.com/pulumi/pulumi/pkg/v2/codegen"
 )
 
 // pythonKeywords is a map of reserved keywords used by python 2 and 3. We use this to avoid generating unspeakable
diff --git a/pkg/codegen/utilities.go b/pkg/codegen/utilities.go
index 0521d8d22..1af4151e0 100644
--- a/pkg/codegen/utilities.go
+++ b/pkg/codegen/utilities.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"sort"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type StringSet map[string]struct{}
diff --git a/pkg/engine/destroy.go b/pkg/engine/destroy.go
index 087007339..fdc53640c 100644
--- a/pkg/engine/destroy.go
+++ b/pkg/engine/destroy.go
@@ -15,12 +15,12 @@
 package engine
 
 import (
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func Destroy(u UpdateInfo, ctx *Context, opts UpdateOptions, dryRun bool) (ResourceChanges, result.Result) {
diff --git a/pkg/engine/diff.go b/pkg/engine/diff.go
index 8305a6d52..2f3b6f094 100644
--- a/pkg/engine/diff.go
+++ b/pkg/engine/diff.go
@@ -25,11 +25,11 @@ import (
 
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // GetIndent computes a step's parent indentation.
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index b7d5e443b..fb4a09fbd 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -17,9 +17,9 @@ package engine
 import (
 	"github.com/opentracing/opentracing-go"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/util/cancel"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/util/cancel"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // UpdateInfo abstracts away information about an apply, preview, or destroy.
diff --git a/pkg/engine/errors.go b/pkg/engine/errors.go
index 4fa6a2d14..0f1835ea4 100644
--- a/pkg/engine/errors.go
+++ b/pkg/engine/errors.go
@@ -17,7 +17,7 @@ package engine
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 //
diff --git a/pkg/engine/events.go b/pkg/engine/events.go
index a088fd17b..fd2e6e3b7 100644
--- a/pkg/engine/events.go
+++ b/pkg/engine/events.go
@@ -19,16 +19,16 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Event represents an event generated by the engine during an operation. The underlying
diff --git a/pkg/engine/eventsink.go b/pkg/engine/eventsink.go
index 5fcc28d6f..b7af8ecf1 100644
--- a/pkg/engine/eventsink.go
+++ b/pkg/engine/eventsink.go
@@ -18,11 +18,10 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 func newEventSink(events eventEmitter, statusSink bool) diag.Sink {
diff --git a/pkg/engine/lifecycle_test.go b/pkg/engine/lifecycle_test.go
index 31637dbf1..9c2ed3b77 100644
--- a/pkg/engine/lifecycle_test.go
+++ b/pkg/engine/lifecycle_test.go
@@ -30,23 +30,23 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/deploytest"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/util/cancel"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil/rpcerror"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/deploytest"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/util/cancel"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil/rpcerror"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 
 	combinations "github.com/mxschmitt/golang-combinations"
 )
diff --git a/pkg/engine/plan.go b/pkg/engine/plan.go
index ba8b0c334..71a81dfd3 100644
--- a/pkg/engine/plan.go
+++ b/pkg/engine/plan.go
@@ -19,15 +19,15 @@ import (
 	"sync"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // ProjectInfoContext returns information about the current project, including its pwd, main, and plugin context.
diff --git a/pkg/engine/plugins.go b/pkg/engine/plugins.go
index b525d361b..bdb5e0f4a 100644
--- a/pkg/engine/plugins.go
+++ b/pkg/engine/plugins.go
@@ -21,14 +21,14 @@ import (
 	"github.com/blang/semver"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const (
diff --git a/pkg/engine/plugins_test.go b/pkg/engine/plugins_test.go
index 74f6328e7..71218e85c 100644
--- a/pkg/engine/plugins_test.go
+++ b/pkg/engine/plugins_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/blang/semver"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func mustMakeVersion(v string) *semver.Version {
diff --git a/pkg/engine/project.go b/pkg/engine/project.go
index e0c65592b..4d3969914 100644
--- a/pkg/engine/project.go
+++ b/pkg/engine/project.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type Projinfo struct {
diff --git a/pkg/engine/query.go b/pkg/engine/query.go
index 6344bfa35..3003e4629 100644
--- a/pkg/engine/query.go
+++ b/pkg/engine/query.go
@@ -18,13 +18,13 @@ import (
 	"context"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 type QueryOptions struct {
diff --git a/pkg/engine/refresh.go b/pkg/engine/refresh.go
index b93d6f82a..a56c2d7b8 100644
--- a/pkg/engine/refresh.go
+++ b/pkg/engine/refresh.go
@@ -15,12 +15,12 @@
 package engine
 
 import (
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 func Refresh(u UpdateInfo, ctx *Context, opts UpdateOptions, dryRun bool) (ResourceChanges, result.Result) {
diff --git a/pkg/engine/snapshot.go b/pkg/engine/snapshot.go
index 6d8e50560..ad3a9ce17 100644
--- a/pkg/engine/snapshot.go
+++ b/pkg/engine/snapshot.go
@@ -17,7 +17,7 @@ package engine
 import (
 	"io"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
 )
 
 // SnapshotManager is responsible for maintaining the in-memory representation
diff --git a/pkg/engine/update.go b/pkg/engine/update.go
index 3e8493375..e2c206ef6 100644
--- a/pkg/engine/update.go
+++ b/pkg/engine/update.go
@@ -26,16 +26,16 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
-	resourceanalyzer "github.com/pulumi/pulumi/pkg/resource/analyzer"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	resourceanalyzer "github.com/pulumi/pulumi/pkg/v2/resource/analyzer"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // RequiredPolicy represents a set of policies to apply during an update.
diff --git a/pkg/go.mod b/pkg/go.mod
index 60aca7a88..35cec28c4 100644
--- a/pkg/go.mod
+++ b/pkg/go.mod
@@ -1,10 +1,10 @@
-module github.com/pulumi/pulumi/pkg
+module github.com/pulumi/pulumi/pkg/v2
 
 go 1.13
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
-	github.com/pulumi/pulumi/sdk => ../sdk
+	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.5.0
 	gocloud.dev => github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f
 )
 
@@ -32,11 +32,9 @@ require (
 	github.com/mitchellh/copystructure v1.0.0
 	github.com/mxschmitt/golang-combinations v1.0.0
 	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d
-	github.com/onsi/ginkgo v1.12.0 // indirect
-	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/sdk v0.0.0-20200321193742-f095e64d0f8e
+	github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2
 	github.com/rjeczalik/notify v0.9.2
 	github.com/satori/go.uuid v1.2.0
 	github.com/sergi/go-diff v1.1.0
@@ -57,8 +55,6 @@ require (
 	google.golang.org/genproto v0.0.0-20200318110522-7735f76e9fa5
 	google.golang.org/grpc v1.28.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
 	sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 // indirect
diff --git a/pkg/go.sum b/pkg/go.sum
index 9a669a333..0495a8b28 100644
--- a/pkg/go.sum
+++ b/pkg/go.sum
@@ -84,8 +84,6 @@ github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jB
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/Sirupsen/logrus v1.0.5 h1:447dy9LxSj+Iaa2uN3yoFHOzU9yJcJYiQPtNz8OXtv0=
-github.com/Sirupsen/logrus v1.0.5/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
@@ -154,6 +152,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
@@ -281,8 +280,6 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd h1:anPrsicrIi2ColgWTVPk+TrN42hJIWlfPHSBP9S0ZkM=
 github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84=
@@ -322,6 +319,7 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LE
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -329,6 +327,7 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 h1:HfxbT6/JcvIljmERptWhwa8XzP7H3T+Z2N26gTsaDaA=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
@@ -362,12 +361,6 @@ github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
@@ -396,6 +389,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f h1:5joKrli3VwNBIgG+Jnfj41wIHxvcg0PpdPzNdmQC4Zw=
 github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f/go.mod h1:lhLOb91+9tKB8RnNlsx+weJGEd0AHM94huK1bmrhPwM=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2 h1:qjZFBvcMToKexdKfUHiCP0mBvwxvvrnLJMMAmZGxJrQ=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2/go.mod h1:v+a8Lg5wKLfMKvFMlBhosoXF+IO6kWiu20YFaWQ4Ygg=
 github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
 github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -419,6 +414,8 @@ github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJV
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -527,7 +524,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -565,7 +561,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -576,6 +571,7 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -586,7 +582,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -703,8 +698,6 @@ google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 gopkg.in/AlecAivazis/survey.v1 v1.8.8 h1:5UtTowJZTz1j7NxVzDGKTz6Lm9IWm8DDF6b7a2wq9VY=
 gopkg.in/AlecAivazis/survey.v1 v1.8.8/go.mod h1:CaHjv79TCgAvXMSFJSVgonHXYWxnhzI3eoHtnX5UgUo=
-gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -714,10 +707,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
 gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -727,8 +716,6 @@ gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOA
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
 gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/pkg/graph/dotconv/print.go b/pkg/graph/dotconv/print.go
index dd9e8db36..4516c4ae1 100644
--- a/pkg/graph/dotconv/print.go
+++ b/pkg/graph/dotconv/print.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pulumi/pulumi/pkg/graph"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/graph"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Print prints a resource graph.
diff --git a/pkg/npm/npm.go b/pkg/npm/npm.go
index e381e00a3..a03b22e4f 100644
--- a/pkg/npm/npm.go
+++ b/pkg/npm/npm.go
@@ -13,8 +13,8 @@ import (
 	uuid "github.com/satori/go.uuid"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Pack runs `npm pack` in the given directory, packaging the Node.js app located there into a
diff --git a/pkg/operations/operations_aws.go b/pkg/operations/operations_aws.go
index 554dd5b25..779f65b90 100644
--- a/pkg/operations/operations_aws.go
+++ b/pkg/operations/operations_aws.go
@@ -25,9 +25,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the
diff --git a/pkg/operations/operations_cloud_aws.go b/pkg/operations/operations_cloud_aws.go
index ce3a31d22..dec6b9da1 100644
--- a/pkg/operations/operations_cloud_aws.go
+++ b/pkg/operations/operations_cloud_aws.go
@@ -19,10 +19,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the
diff --git a/pkg/operations/operations_gcp.go b/pkg/operations/operations_gcp.go
index d7b1e947d..0953eb343 100644
--- a/pkg/operations/operations_gcp.go
+++ b/pkg/operations/operations_gcp.go
@@ -28,10 +28,10 @@ import (
 	loggingpb "google.golang.org/genproto/googleapis/logging/v2"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the
diff --git a/pkg/operations/resources.go b/pkg/operations/resources.go
index 0833a2321..1723488b5 100644
--- a/pkg/operations/resources.go
+++ b/pkg/operations/resources.go
@@ -18,10 +18,10 @@ import (
 	"sort"
 
 	"github.com/hashicorp/go-multierror"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Resource is a tree representation of a resource/component hierarchy
diff --git a/pkg/operations/resources_test.go b/pkg/operations/resources_test.go
index 8613a1740..d51b7f9a5 100644
--- a/pkg/operations/resources_test.go
+++ b/pkg/operations/resources_test.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
 )
 
 func getPulumiResources(t *testing.T, path string) *Resource {
diff --git a/pkg/resource/analyzer/config.go b/pkg/resource/analyzer/config.go
index bece4c20a..8e9c731dd 100644
--- a/pkg/resource/analyzer/config.go
+++ b/pkg/resource/analyzer/config.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/xeipuuv/gojsonschema"
 )
 
diff --git a/pkg/resource/analyzer/config_test.go b/pkg/resource/analyzer/config_test.go
index c8b3c5e22..b78b02584 100644
--- a/pkg/resource/analyzer/config_test.go
+++ b/pkg/resource/analyzer/config_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/resource/deploy/builtins.go b/pkg/resource/deploy/builtins.go
index 5b1560be0..59d0f5ac6 100644
--- a/pkg/resource/deploy/builtins.go
+++ b/pkg/resource/deploy/builtins.go
@@ -7,11 +7,11 @@ import (
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type builtinProvider struct {
diff --git a/pkg/resource/deploy/deploytest/backendclient.go b/pkg/resource/deploy/deploytest/backendclient.go
index b76016545..e8da030c0 100644
--- a/pkg/resource/deploy/deploytest/backendclient.go
+++ b/pkg/resource/deploy/deploytest/backendclient.go
@@ -17,7 +17,7 @@ package deploytest
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // BackendClient provides a simple implementation of deploy.BackendClient that defers to a function value.
diff --git a/pkg/resource/deploy/deploytest/languageruntime.go b/pkg/resource/deploy/deploytest/languageruntime.go
index 945af6b5c..2daec5035 100644
--- a/pkg/resource/deploy/deploytest/languageruntime.go
+++ b/pkg/resource/deploy/deploytest/languageruntime.go
@@ -18,10 +18,10 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 type ProgramFunc func(runInfo plugin.RunInfo, monitor *ResourceMonitor) error
diff --git a/pkg/resource/deploy/deploytest/pluginhost.go b/pkg/resource/deploy/deploytest/pluginhost.go
index 0933a2493..7a7400a2d 100644
--- a/pkg/resource/deploy/deploytest/pluginhost.go
+++ b/pkg/resource/deploy/deploytest/pluginhost.go
@@ -20,11 +20,11 @@ import (
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type LoadProviderFunc func() (plugin.Provider, error)
diff --git a/pkg/resource/deploy/deploytest/provider.go b/pkg/resource/deploy/deploytest/provider.go
index 8c63b406f..d3098f9be 100644
--- a/pkg/resource/deploy/deploytest/provider.go
+++ b/pkg/resource/deploy/deploytest/provider.go
@@ -20,11 +20,11 @@ import (
 	"github.com/blang/semver"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type Provider struct {
diff --git a/pkg/resource/deploy/deploytest/resourcemonitor.go b/pkg/resource/deploy/deploytest/resourcemonitor.go
index 29f12e512..b0862eaae 100644
--- a/pkg/resource/deploy/deploytest/resourcemonitor.go
+++ b/pkg/resource/deploy/deploytest/resourcemonitor.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 type ResourceMonitor struct {
diff --git a/pkg/resource/deploy/plan.go b/pkg/resource/deploy/plan.go
index 4f5f37537..6ea9f5ad0 100644
--- a/pkg/resource/deploy/plan.go
+++ b/pkg/resource/deploy/plan.go
@@ -22,14 +22,14 @@ import (
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/resource/graph"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/resource/graph"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // BackendClient provides an interface for retrieving information about other stacks.
diff --git a/pkg/resource/deploy/plan_executor.go b/pkg/resource/deploy/plan_executor.go
index 3156e079e..ece4ab956 100644
--- a/pkg/resource/deploy/plan_executor.go
+++ b/pkg/resource/deploy/plan_executor.go
@@ -19,13 +19,13 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/resource/graph"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/resource/graph"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"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/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // planExecutor is responsible for taking a plan and driving it to completion.
diff --git a/pkg/resource/deploy/plan_test.go b/pkg/resource/deploy/plan_test.go
index 9d07b7462..1ce570252 100644
--- a/pkg/resource/deploy/plan_test.go
+++ b/pkg/resource/deploy/plan_test.go
@@ -4,12 +4,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/secrets/b64"
-
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/b64"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/resource/deploy/providers/provider.go b/pkg/resource/deploy/providers/provider.go
index a80a64ba9..ca17f5fd4 100644
--- a/pkg/resource/deploy/providers/provider.go
+++ b/pkg/resource/deploy/providers/provider.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/blang/semver"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // A ProviderRequest is a tuple of an optional semantic version and a package name. Whenever the engine receives a
diff --git a/pkg/resource/deploy/providers/provider_test.go b/pkg/resource/deploy/providers/provider_test.go
index 8eea7b1c8..d7d3c3c2d 100644
--- a/pkg/resource/deploy/providers/provider_test.go
+++ b/pkg/resource/deploy/providers/provider_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/blang/semver"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 func TestProviderRequestNameNil(t *testing.T) {
diff --git a/pkg/resource/deploy/providers/reference.go b/pkg/resource/deploy/providers/reference.go
index b20eb6390..e6d3ce81f 100644
--- a/pkg/resource/deploy/providers/reference.go
+++ b/pkg/resource/deploy/providers/reference.go
@@ -19,10 +19,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // A provider reference is (URN, ID) tuple that refers to a particular provider instance. A provider reference's
diff --git a/pkg/resource/deploy/providers/reference_test.go b/pkg/resource/deploy/providers/reference_test.go
index 062ed5b1f..dc29d6794 100644
--- a/pkg/resource/deploy/providers/reference_test.go
+++ b/pkg/resource/deploy/providers/reference_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 func TestRoundTripProviderType(t *testing.T) {
diff --git a/pkg/resource/deploy/providers/registry.go b/pkg/resource/deploy/providers/registry.go
index 0608c6a0a..f0f3bc3d4 100644
--- a/pkg/resource/deploy/providers/registry.go
+++ b/pkg/resource/deploy/providers/registry.go
@@ -22,12 +22,12 @@ import (
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // GetProviderVersion fetches and parses a provider version from the given property map. If the version property is not
diff --git a/pkg/resource/deploy/providers/registry_test.go b/pkg/resource/deploy/providers/registry_test.go
index 7f220c065..5bfbe8bef 100644
--- a/pkg/resource/deploy/providers/registry_test.go
+++ b/pkg/resource/deploy/providers/registry_test.go
@@ -22,11 +22,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type testPluginHost struct {
diff --git a/pkg/resource/deploy/snapshot.go b/pkg/resource/deploy/snapshot.go
index 6ff7c5ec8..1d928b445 100644
--- a/pkg/resource/deploy/snapshot.go
+++ b/pkg/resource/deploy/snapshot.go
@@ -21,11 +21,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"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/workspace"
 )
 
 // Snapshot is a view of a collection of resources in an stack at a point in time.  It describes resources; their
diff --git a/pkg/resource/deploy/source.go b/pkg/resource/deploy/source.go
index 31db1e794..4a310aa0c 100644
--- a/pkg/resource/deploy/source.go
+++ b/pkg/resource/deploy/source.go
@@ -19,12 +19,12 @@ import (
 	"io"
 
 	pbempty "github.com/golang/protobuf/ptypes/empty"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // A ProviderSource allows a Source to lookup provider plugins.
diff --git a/pkg/resource/deploy/source_error.go b/pkg/resource/deploy/source_error.go
index 29a9f5237..fb8bd3d74 100644
--- a/pkg/resource/deploy/source_error.go
+++ b/pkg/resource/deploy/source_error.go
@@ -17,8 +17,8 @@ package deploy
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // NewErrorSource creates a source that panics if it is iterated. This is used by the engine to guard against unexpected
diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go
index 1a1872191..155ca195b 100644
--- a/pkg/resource/deploy/source_eval.go
+++ b/pkg/resource/deploy/source_eval.go
@@ -26,17 +26,17 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil/rpcerror"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil/rpcerror"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // EvalRunInfo provides information required to execute and deploy resources within a package.
diff --git a/pkg/resource/deploy/source_eval_test.go b/pkg/resource/deploy/source_eval_test.go
index 8b113fac6..e522450ea 100644
--- a/pkg/resource/deploy/source_eval_test.go
+++ b/pkg/resource/deploy/source_eval_test.go
@@ -22,14 +22,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/deploytest"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/deploytest"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 type testRegEvent struct {
diff --git a/pkg/resource/deploy/source_fixed.go b/pkg/resource/deploy/source_fixed.go
index d94aed4fc..e3f75747b 100644
--- a/pkg/resource/deploy/source_fixed.go
+++ b/pkg/resource/deploy/source_fixed.go
@@ -17,9 +17,9 @@ package deploy
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // NewFixedSource returns a valid planning source that is comprised of a list of pre-computed steps.
diff --git a/pkg/resource/deploy/source_null.go b/pkg/resource/deploy/source_null.go
index 7b7152aa8..018fecf8c 100644
--- a/pkg/resource/deploy/source_null.go
+++ b/pkg/resource/deploy/source_null.go
@@ -17,9 +17,9 @@ package deploy
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // NullSource is a singleton source that never returns any resources.  This may be used in scenarios where the "new"
diff --git a/pkg/resource/deploy/source_query.go b/pkg/resource/deploy/source_query.go
index 28fa0a104..96dc76251 100644
--- a/pkg/resource/deploy/source_query.go
+++ b/pkg/resource/deploy/source_query.go
@@ -25,16 +25,16 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // QuerySource evaluates a query program, and provides the ability to synchronously wait for
diff --git a/pkg/resource/deploy/source_query_test.go b/pkg/resource/deploy/source_query_test.go
index 6a033ed1d..39aba04d0 100644
--- a/pkg/resource/deploy/source_query_test.go
+++ b/pkg/resource/deploy/source_query_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 
 	pbempty "github.com/golang/protobuf/ptypes/empty"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/resource/deploy/step.go b/pkg/resource/deploy/step.go
index c4df601b7..24a299ce6 100644
--- a/pkg/resource/deploy/step.go
+++ b/pkg/resource/deploy/step.go
@@ -20,14 +20,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // StepCompleteFunc is the type of functions returned from Step.Apply. These functions are to be called
diff --git a/pkg/resource/deploy/step_executor.go b/pkg/resource/deploy/step_executor.go
index 23ab1202b..68c7da53c 100644
--- a/pkg/resource/deploy/step_executor.go
+++ b/pkg/resource/deploy/step_executor.go
@@ -21,10 +21,10 @@ import (
 	"sync/atomic"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"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/logging"
 )
 
 const (
diff --git a/pkg/resource/deploy/step_generator.go b/pkg/resource/deploy/step_generator.go
index 1b44538cc..1be9ccad0 100644
--- a/pkg/resource/deploy/step_generator.go
+++ b/pkg/resource/deploy/step_generator.go
@@ -18,17 +18,16 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/resource/graph"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/resource/graph"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // stepGenerator is responsible for turning resource events into steps that
diff --git a/pkg/resource/deploy/step_generator_test.go b/pkg/resource/deploy/step_generator_test.go
index bbe419ffd..dd3e2749b 100644
--- a/pkg/resource/deploy/step_generator_test.go
+++ b/pkg/resource/deploy/step_generator_test.go
@@ -3,7 +3,7 @@ package deploy
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/resource/deploy/target.go b/pkg/resource/deploy/target.go
index 3fc8170c9..2ba48e657 100644
--- a/pkg/resource/deploy/target.go
+++ b/pkg/resource/deploy/target.go
@@ -15,8 +15,8 @@
 package deploy
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // Target represents information about a deployment target.
diff --git a/pkg/resource/edit/errors.go b/pkg/resource/edit/errors.go
index 6c786d04a..01b676497 100644
--- a/pkg/resource/edit/errors.go
+++ b/pkg/resource/edit/errors.go
@@ -17,7 +17,7 @@ package edit
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // ResourceHasDependenciesError is returned by DeleteResource if a resource can't be deleted due to the presence of
diff --git a/pkg/resource/edit/operations.go b/pkg/resource/edit/operations.go
index f19ba82b0..ee3b8d4cd 100644
--- a/pkg/resource/edit/operations.go
+++ b/pkg/resource/edit/operations.go
@@ -17,12 +17,12 @@ package edit
 import (
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/resource/graph"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/resource/graph"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // OperationFunc is the type of functions that edit resources within a snapshot. The edits are made in-place to the
diff --git a/pkg/resource/edit/operations_test.go b/pkg/resource/edit/operations_test.go
index 0a264266f..1ae311b67 100644
--- a/pkg/resource/edit/operations_test.go
+++ b/pkg/resource/edit/operations_test.go
@@ -18,13 +18,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/secrets/b64"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/b64"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/version"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/resource/graph/dependency_graph.go b/pkg/resource/graph/dependency_graph.go
index b20525d08..6fab3704d 100644
--- a/pkg/resource/graph/dependency_graph.go
+++ b/pkg/resource/graph/dependency_graph.go
@@ -3,9 +3,9 @@
 package graph
 
 import (
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // DependencyGraph represents a dependency graph encoded within a resource snapshot.
diff --git a/pkg/resource/graph/dependency_graph_test.go b/pkg/resource/graph/dependency_graph_test.go
index 339e34aee..edf01dd73 100644
--- a/pkg/resource/graph/dependency_graph_test.go
+++ b/pkg/resource/graph/dependency_graph_test.go
@@ -5,9 +5,9 @@ package graph
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/resource/graph/resource_set.go b/pkg/resource/graph/resource_set.go
index a9eb61b77..d262acc02 100644
--- a/pkg/resource/graph/resource_set.go
+++ b/pkg/resource/graph/resource_set.go
@@ -14,7 +14,7 @@
 
 package graph
 
-import "github.com/pulumi/pulumi/sdk/go/common/resource"
+import "github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 
 // ResourceSet represents a set of Resources.
 type ResourceSet map[*resource.State]bool
diff --git a/pkg/resource/provider/host.go b/pkg/resource/provider/host.go
index 5e67f729e..cbf2cc16e 100644
--- a/pkg/resource/provider/host.go
+++ b/pkg/resource/provider/host.go
@@ -18,11 +18,11 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	lumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"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"
+	lumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // HostClient is a client interface into the host's engine RPC interface.
diff --git a/pkg/resource/provider/main.go b/pkg/resource/provider/main.go
index b7ebc5b55..eed684b94 100644
--- a/pkg/resource/provider/main.go
+++ b/pkg/resource/provider/main.go
@@ -21,10 +21,10 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // Tracing is the optional command line flag passed to this provider for configuring a  Zipkin-compatible tracing
diff --git a/pkg/resource/stack/checkpoint.go b/pkg/resource/stack/checkpoint.go
index 020b32885..5b32de1e0 100644
--- a/pkg/resource/stack/checkpoint.go
+++ b/pkg/resource/stack/checkpoint.go
@@ -21,13 +21,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype/migrate"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype/migrate"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func UnmarshalVersionedCheckpointToLatestCheckpoint(bytes []byte) (*apitype.CheckpointV3, error) {
diff --git a/pkg/resource/stack/deployment.go b/pkg/resource/stack/deployment.go
index 6356ac828..6b70de93c 100644
--- a/pkg/resource/stack/deployment.go
+++ b/pkg/resource/stack/deployment.go
@@ -21,14 +21,14 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/resource/deploy"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype/migrate"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype/migrate"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const (
diff --git a/pkg/resource/stack/deployment_test.go b/pkg/resource/stack/deployment_test.go
index 41682bc5e..4ad3bc8ef 100644
--- a/pkg/resource/stack/deployment_test.go
+++ b/pkg/resource/stack/deployment_test.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // TestDeploymentSerialization creates a basic snapshot of a given resource state.
diff --git a/pkg/resource/stack/secrets.go b/pkg/resource/stack/secrets.go
index 307e2e32f..4163e9a04 100644
--- a/pkg/resource/stack/secrets.go
+++ b/pkg/resource/stack/secrets.go
@@ -19,13 +19,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/pkg/secrets/b64"
-	"github.com/pulumi/pulumi/pkg/secrets/cloud"
-	"github.com/pulumi/pulumi/pkg/secrets/passphrase"
-	"github.com/pulumi/pulumi/pkg/secrets/service"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/b64"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/cloud"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/service"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 // DefaultSecretsProvider is the default SecretsProvider to use when deserializing deployments.
diff --git a/pkg/resource/stack/secrets_test.go b/pkg/resource/stack/secrets_test.go
index 1abc47128..46d9fab95 100644
--- a/pkg/resource/stack/secrets_test.go
+++ b/pkg/resource/stack/secrets_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/secrets/b64/manager.go b/pkg/secrets/b64/manager.go
index 9c8844545..c1a53d6f4 100644
--- a/pkg/secrets/b64/manager.go
+++ b/pkg/secrets/b64/manager.go
@@ -17,8 +17,8 @@ package b64
 import (
 	"encoding/base64"
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 const Type = "b64"
diff --git a/pkg/secrets/cloud/manager.go b/pkg/secrets/cloud/manager.go
index d9256d373..9361199af 100644
--- a/pkg/secrets/cloud/manager.go
+++ b/pkg/secrets/cloud/manager.go
@@ -26,8 +26,8 @@ import (
 	_ "gocloud.dev/secrets/gcpkms"        // support for gcpkms://
 	_ "gocloud.dev/secrets/hashivault"    // support for hashivault://
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 // Type is the type of secrets managed by this secrets provider
diff --git a/pkg/secrets/manager.go b/pkg/secrets/manager.go
index 90d7b7ee3..72d783c8d 100644
--- a/pkg/secrets/manager.go
+++ b/pkg/secrets/manager.go
@@ -16,7 +16,7 @@ package secrets
 import (
 	"encoding/json"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 // Manager provides the interface for providing stack encryption.
diff --git a/pkg/secrets/passphrase/manager.go b/pkg/secrets/passphrase/manager.go
index ef9fa2ce8..dee129c5b 100644
--- a/pkg/secrets/passphrase/manager.go
+++ b/pkg/secrets/passphrase/manager.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 const Type = "passphrase"
diff --git a/pkg/secrets/service/manager.go b/pkg/secrets/service/manager.go
index 0a881d209..ae3f82742 100644
--- a/pkg/secrets/service/manager.go
+++ b/pkg/secrets/service/manager.go
@@ -6,15 +6,14 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/pkg/backend/httpstate/client"
-	"github.com/pulumi/pulumi/pkg/secrets"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+
+	"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client"
+	"github.com/pulumi/pulumi/pkg/v2/secrets"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const Type = "service"
diff --git a/pkg/testing/integration/command.go b/pkg/testing/integration/command.go
index 8dded9ded..e0a914875 100644
--- a/pkg/testing/integration/command.go
+++ b/pkg/testing/integration/command.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
 )
 
 // RunCommand executes the specified command and additional arguments, wrapping any output in the
diff --git a/pkg/testing/integration/program.go b/pkg/testing/integration/program.go
index 47499219a..61f197a0b 100644
--- a/pkg/testing/integration/program.go
+++ b/pkg/testing/integration/program.go
@@ -38,21 +38,21 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/engine"
-	"github.com/pulumi/pulumi/pkg/operations"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	pulumi_testing "github.com/pulumi/pulumi/sdk/go/common/testing"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/tools"
-	"github.com/pulumi/pulumi/sdk/go/common/util/ciutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/retry"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/engine"
+	"github.com/pulumi/pulumi/pkg/v2/operations"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	pulumi_testing "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tools"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/ciutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/retry"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const PythonRuntime = "python"
@@ -1041,7 +1041,7 @@ func (pt *ProgramTester) TestLifeCycleDestroy() error {
 	if pt.projdir != "" {
 		// Destroy and remove the stack.
 		fprintf(pt.opts.Stdout, "Destroying stack\n")
-		destroy := []string{"destroy", "--non-interactive", "--skip-preview"}
+		destroy := []string{"destroy", "--non-interactive", "--yes", "--skip-preview"}
 		if pt.opts.GetDebugUpdates() {
 			destroy = append(destroy, "-d")
 		}
@@ -1102,7 +1102,7 @@ func (pt *ProgramTester) TestPreviewUpdateAndEdits() error {
 
 	if !pt.opts.SkipRefresh {
 		// Perform a refresh and ensure it doesn't yield changes.
-		refresh := []string{"refresh", "--non-interactive", "--skip-preview"}
+		refresh := []string{"refresh", "--non-interactive", "--yes", "--skip-preview"}
 		if pt.opts.GetDebugUpdates() {
 			refresh = append(refresh, "-d")
 		}
@@ -1138,7 +1138,7 @@ func (pt *ProgramTester) PreviewAndUpdate(dir string, name string, shouldFail, e
 	expectNopUpdate bool) error {
 
 	preview := []string{"preview", "--non-interactive"}
-	update := []string{"up", "--non-interactive", "--skip-preview", "--event-log", pt.eventLog}
+	update := []string{"up", "--non-interactive", "--yes", "--skip-preview", "--event-log", pt.eventLog}
 	if pt.opts.GetDebugUpdates() {
 		preview = append(preview, "-d")
 		update = append(update, "-d")
@@ -1733,6 +1733,12 @@ func (pt *ProgramTester) prepareGoProject(projinfo *engine.Projinfo) error {
 	for _, pkg := range pt.opts.Dependencies {
 		depParts := append([]string{gopath, "src"}, strings.Split(pkg, "/")...)
 		dep := filepath.Join(depParts...)
+		if strings.Contains(dep, "v2") {
+			// This is something we need to do for a local override. We effectively
+			// map a pkg to a folder location on disk. Local disk doesn't have a v2
+			// in it's path so we need to skip it
+			dep = strings.Replace(dep, "v2", "", -1)
+		}
 		editStr := fmt.Sprintf("%s=%s", pkg, dep)
 		err = pt.runCommand("go-mod-edit", []string{goBin, "mod", "edit", "-replace", editStr}, cwd)
 		if err != nil {
diff --git a/pkg/testing/integration/program_test.go b/pkg/testing/integration/program_test.go
index e6b8ddd0b..2bccc81e1 100644
--- a/pkg/testing/integration/program_test.go
+++ b/pkg/testing/integration/program_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func TestPrefixer(t *testing.T) {
diff --git a/pkg/testing/integration/pulumi.go b/pkg/testing/integration/pulumi.go
index c0f8a55c1..357abd44e 100644
--- a/pkg/testing/integration/pulumi.go
+++ b/pkg/testing/integration/pulumi.go
@@ -21,8 +21,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/testing"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/testing/integration/s3reporter.go b/pkg/testing/integration/s3reporter.go
index 8707acae7..2e898f7ef 100644
--- a/pkg/testing/integration/s3reporter.go
+++ b/pkg/testing/integration/s3reporter.go
@@ -25,7 +25,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // S3Reporter is a TestStatsReporter that publises test data to S3
diff --git a/pkg/testing/integration/util.go b/pkg/testing/integration/util.go
index 89a19ab68..bc62524e0 100644
--- a/pkg/testing/integration/util.go
+++ b/pkg/testing/integration/util.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // DecodeMapString takes a string of the form key1=value1:key2=value2 and returns a go map.
diff --git a/pkg/util/cancel/context.go b/pkg/util/cancel/context.go
index b81e72197..97d9c5056 100644
--- a/pkg/util/cancel/context.go
+++ b/pkg/util/cancel/context.go
@@ -17,7 +17,7 @@ package cancel
 import (
 	"context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Context provides the ability to observe cancellation and termination requests from a Source. A termination request
diff --git a/pkg/util/testutil/testdiagsink.go b/pkg/util/testutil/testdiagsink.go
index bbdceab85..942dabbdf 100644
--- a/pkg/util/testutil/testdiagsink.go
+++ b/pkg/util/testutil/testdiagsink.go
@@ -17,7 +17,7 @@ package testutil
 import (
 	"io/ioutil"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
 )
 
 // TestDiagSink suppresses message output, but captures them, so that they can be compared to expected results.
diff --git a/pkg/util/validation/stack.go b/pkg/util/validation/stack.go
index 6e4cf8050..50973ec93 100644
--- a/pkg/util/validation/stack.go
+++ b/pkg/util/validation/stack.go
@@ -18,7 +18,7 @@ import (
 	"regexp"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
 )
 
 // validateStackName checks if s is a valid stack name, otherwise returns a descriptive error.
diff --git a/pkg/util/validation/stack_test.go b/pkg/util/validation/stack_test.go
index 4c363c125..52df4336a 100644
--- a/pkg/util/validation/stack_test.go
+++ b/pkg/util/validation/stack_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/scripts/build-and-publish-docker b/scripts/build-and-publish-docker
index 4b4ab6501..144fb526a 100755
--- a/scripts/build-and-publish-docker
+++ b/scripts/build-and-publish-docker
@@ -61,7 +61,7 @@ echo "Publishing containers..."
 for container in pulumi actions; do
     echo "- pulumi/${container}"
     docker push "pulumi/${container}:${CLI_VERSION}"
-    docker push "pulumi/${container}:latest"
+    #docker push "pulumi/${container}:latest"
 done
 
 docker logout
diff --git a/scripts/get-py-version.go b/scripts/get-py-version.go
index 014e819db..bfeb7330e 100644
--- a/scripts/get-py-version.go
+++ b/scripts/get-py-version.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/buildutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/buildutil"
 )
 
 func main() {
diff --git a/scripts/go.mod b/scripts/go.mod
index 2db8df36c..24319c005 100644
--- a/scripts/go.mod
+++ b/scripts/go.mod
@@ -1,7 +1,7 @@
-module github.com/pulumi/pulumi/scripts
+module github.com/pulumi/pulumi/scripts/v2
 
 go 1.13
 
-require github.com/pulumi/pulumi/sdk v0.0.0-00010101000000-000000000000
+require github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2
 
-replace github.com/pulumi/pulumi/sdk => ../sdk
+replace github.com/pulumi/pulumi/sdk/v2 => ../sdk
diff --git a/scripts/make_release.ps1 b/scripts/make_release.ps1
index 64aa93d42..53abeda54 100644
--- a/scripts/make_release.ps1
+++ b/scripts/make_release.ps1
@@ -13,7 +13,7 @@ $PublishTargets = @($GitHash, $Version, $Branch)
 function RunGoBuild($goPackage, $dir, $outputName) {
     $binRoot = New-Item -ItemType Directory -Force -Path "$PublishDir\bin"
     Push-Location $dir
-    go build -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=$Version" -o "$binRoot\$outputName" $goPackage
+    go build -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=$Version" -o "$binRoot\$outputName" $goPackage
     Pop-Location
 }
 
@@ -28,11 +28,11 @@ function CopyPackage($pathToModule, $moduleName) {
     }
 }
 
-RunGoBuild "github.com/pulumi/pulumi/pkg/cmd/pulumi" "pkg" "pulumi.exe"
-RunGoBuild "github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs" "sdk" "pulumi-language-nodejs.exe"
-RunGoBuild "github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python" "sdk" "pulumi-language-python.exe"
-RunGoBuild "github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet" "sdk" "pulumi-language-dotnet.exe"
-RunGoBuild "github.com/pulumi/pulumi/sdk/go/pulumi-language-go" "sdk" "pulumi-language-go.exe"
+RunGoBuild "github.com/pulumi/pulumi/pkg/v2/cmd/pulumi" "pkg" "pulumi.exe"
+RunGoBuild "github.com/pulumi/pulumi/sdk/v2/nodejs/cmd/pulumi-language-nodejs" "sdk" "pulumi-language-nodejs.exe"
+RunGoBuild "github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python" "sdk" "pulumi-language-python.exe"
+RunGoBuild "github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet" "sdk" "pulumi-language-dotnet.exe"
+RunGoBuild "github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go" "sdk" "pulumi-language-go.exe"
 CopyPackage "$Root\sdk\nodejs\bin" "pulumi"
 
 Copy-Item "$Root\sdk\nodejs\dist\pulumi-resource-pulumi-nodejs.cmd" "$PublishDir\bin"
diff --git a/scripts/make_release.sh b/scripts/make_release.sh
index 5e858bccc..4241103de 100755
--- a/scripts/make_release.sh
+++ b/scripts/make_release.sh
@@ -25,7 +25,7 @@ run_go_build() {
 
     mkdir -p "${PUBDIR}/bin"
     pushd "$2" > /dev/null && go build \
-       -ldflags "-X github.com/pulumi/pulumi/pkg/version.Version=${VERSION}" \
+       -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" \
        -o "${PUBDIR}/bin/${output_name}${bin_suffix}" \
        "$1"
     popd > /dev/null
diff --git a/scripts/publish_packages.sh b/scripts/publish_packages.sh
index e4e1b5098..8e7667b45 100755
--- a/scripts/publish_packages.sh
+++ b/scripts/publish_packages.sh
@@ -66,7 +66,7 @@ if [[ "${TRAVIS_PUBLISH_PACKAGES:-}" == "true" ]]; then
 
     "${ROOT}/scripts/build-and-publish-docker" "${NPM_VERSION}"
 
-    "$(go env GOPATH)/src/github.com/pulumi/scripts/ci/build-package-docs.sh" pulumi
+    #"$(go env GOPATH)/src/github.com/pulumi/scripts/ci/build-package-docs.sh" pulumi
 fi
 
 exit 0
diff --git a/sdk/dotnet/Makefile b/sdk/dotnet/Makefile
index f40ac9802..6bf6b7e39 100644
--- a/sdk/dotnet/Makefile
+++ b/sdk/dotnet/Makefile
@@ -1,5 +1,5 @@
 PROJECT_NAME         := Pulumi .NET Core SDK
-LANGHOST_PKG         := github.com/pulumi/pulumi/sdk/dotnet/cmd/pulumi-language-dotnet
+LANGHOST_PKG         := github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet
 
 PROJECT_PKGS         := $(shell go list ./cmd...)
 
@@ -12,11 +12,11 @@ VERSION_THIRD_WORD   := $(word 3,$(subst -, ,${VERSION_DOTNET})) # e.g. featbran
 VERSION_PREFIX       := $(strip ${VERSION_FIRST_WORD})
 
 ifeq ($(strip ${VERSION_SECOND_WORD}),)
-	VERSION_SUFFIX   := preview
+	VERSION_SUFFIX   := ""
 else ifeq ($(strip ${VERSION_THIRD_WORD}),)
-	VERSION_SUFFIX   := preview-$(strip ${VERSION_SECOND_WORD})
+	VERSION_SUFFIX   := $(strip ${VERSION_SECOND_WORD})
 else
-	VERSION_SUFFIX   := preview-$(strip ${VERSION_THIRD_WORD})-$(strip ${VERSION_SECOND_WORD})
+	VERSION_SUFFIX   := $(strip ${VERSION_THIRD_WORD})-$(strip ${VERSION_SECOND_WORD})
 endif
 
 TESTPARALLELISM := 10
@@ -37,19 +37,16 @@ build::
 	#
 	#     -alpha: Alpha release, typically used for work-in-progress and experimentation
 	dotnet build dotnet.sln /p:VersionPrefix=${VERSION_PREFIX} /p:VersionSuffix=${VERSION_SUFFIX}
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 install_plugin::
-	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 install:: install_plugin
 	echo "Copying NuGet packages to ${PULUMI_NUGET}"
 	[ ! -e "$(PULUMI_NUGET)" ] || rm -rf "$(PULUMI_NUGET)/*"
 	find . -name '*.nupkg' -exec cp -p {} ${PULUMI_NUGET} \;
 
-lint::
-	golangci-lint run
-
 dotnet_test::
 	# include the version prefix/suffix to avoid generating a separate nupkg file
 	dotnet test /p:VersionPrefix=${VERSION_PREFIX} /p:VersionSuffix=${VERSION_SUFFIX}
@@ -63,4 +60,4 @@ test_all:: dotnet_test
 	$(GO_TEST) ${PROJECT_PKGS}
 
 dist::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
diff --git a/sdk/dotnet/Pulumi.Tests/PulumiTest.cs b/sdk/dotnet/Pulumi.Tests/PulumiTest.cs
index d09da5f61..90d80ac09 100644
--- a/sdk/dotnet/Pulumi.Tests/PulumiTest.cs
+++ b/sdk/dotnet/Pulumi.Tests/PulumiTest.cs
@@ -20,7 +20,7 @@ namespace Pulumi.Tests
             var mock = new Mock<IDeployment>(MockBehavior.Strict);
             mock.Setup(d => d.IsDryRun).Returns(dryRun);
 
-            Deployment.Instance = mock.Object;
+            Deployment.Instance = new DeploymentInstance(mock.Object);
             await func().ConfigureAwait(false);
             Deployment.Instance = null!;
         }
diff --git a/sdk/dotnet/Pulumi.Tests/StackTests.cs b/sdk/dotnet/Pulumi.Tests/StackTests.cs
index 634d382ac..b9f477109 100644
--- a/sdk/dotnet/Pulumi.Tests/StackTests.cs
+++ b/sdk/dotnet/Pulumi.Tests/StackTests.cs
@@ -98,7 +98,7 @@ namespace Pulumi.Tests
             mock.Setup(d => d.RegisterResourceOutputs(It.IsAny<Stack>(), It.IsAny<Output<IDictionary<string, object?>>>()))
                 .Callback((Resource _, Output<IDictionary<string, object?>> o) => outputs = o);
 
-            Deployment.Instance = mock.Object;
+            Deployment.Instance = new DeploymentInstance(mock.Object);
 
             // Act
             var stack = new T();
diff --git a/sdk/dotnet/Pulumi/Deployment/Deployment.cs b/sdk/dotnet/Pulumi/Deployment/Deployment.cs
index 8580e68f2..c8c026cff 100644
--- a/sdk/dotnet/Pulumi/Deployment/Deployment.cs
+++ b/sdk/dotnet/Pulumi/Deployment/Deployment.cs
@@ -32,21 +32,21 @@ namespace Pulumi
     /// </summary>
     public sealed partial class Deployment : IDeploymentInternal
     {
-        private static IDeployment? _instance;
+        private static DeploymentInstance? _instance;
         private static readonly object _instanceLock = new object();
 
         /// <summary>
         /// The current running deployment instance. This is only available from inside the function
         /// passed to <see cref="Deployment.RunAsync(Action)"/> (or its overloads).
         /// </summary>
-        public static IDeployment Instance
+        public static DeploymentInstance Instance
         {
             get => _instance ?? throw new InvalidOperationException("Trying to acquire Deployment.Instance before 'Run' was called.");
             internal set => _instance = value;
         }
 
         internal static IDeploymentInternal InternalInstance
-            => (IDeploymentInternal)Instance;
+            => Instance.Internal;
 
         private readonly string _projectName;
         private readonly string _stackName;
diff --git a/sdk/dotnet/Pulumi/Deployment/DeploymentInstance.cs b/sdk/dotnet/Pulumi/Deployment/DeploymentInstance.cs
new file mode 100644
index 000000000..ba2f27775
--- /dev/null
+++ b/sdk/dotnet/Pulumi/Deployment/DeploymentInstance.cs
@@ -0,0 +1,54 @@
+using System.Threading.Tasks;
+
+namespace Pulumi
+{
+    /// <summary>
+    /// Metadata of the deployment that is currently running. Accessible via <see cref="Deployment.Instance"/>.
+    /// </summary>
+    public sealed class DeploymentInstance : IDeployment
+    {
+        private readonly IDeployment _deployment;
+        
+        internal DeploymentInstance(IDeployment deployment)
+        {
+            _deployment = deployment;
+        }
+
+        /// <summary>
+        /// Returns the current stack name.
+        /// </summary>
+        public string StackName => _deployment.StackName;
+
+        /// <summary>
+        /// Returns the current project name.
+        /// </summary>
+        public string ProjectName => _deployment.ProjectName;
+
+        /// <summary>
+        /// Whether or not the application is currently being previewed or actually applied.
+        /// </summary>
+        public bool IsDryRun => _deployment.IsDryRun;
+
+        /// <summary>
+        /// Dynamically invokes the function '<paramref name="token"/>', which is offered by a
+        /// provider plugin.
+        /// <para/>
+        /// The result of <see cref="InvokeAsync"/> will be a <see cref="Task"/> resolved to the
+        /// result value of the provider plugin.
+        /// <para/>
+        /// The <paramref name="args"/> inputs can be a bag of computed values(including, `T`s,
+        /// <see cref="Task{TResult}"/>s, <see cref="Output{T}"/>s etc.).
+        /// </summary>
+        public Task<T> InvokeAsync<T>(string token, InvokeArgs args, InvokeOptions? options = null)
+            => _deployment.InvokeAsync<T>(token, args, options);
+
+        /// <summary>
+        /// Same as <see cref="InvokeAsync{T}(string, InvokeArgs, InvokeOptions)"/>, however the
+        /// return value is ignored.
+        /// </summary>
+        public Task InvokeAsync(string token, InvokeArgs args, InvokeOptions? options = null)
+            => _deployment.InvokeAsync(token, args, options);
+
+        internal IDeploymentInternal Internal => (IDeploymentInternal)_deployment;
+    }
+}
diff --git a/sdk/dotnet/Pulumi/Deployment/Deployment_Run.cs b/sdk/dotnet/Pulumi/Deployment/Deployment_Run.cs
index be05d7214..265a6fd41 100644
--- a/sdk/dotnet/Pulumi/Deployment/Deployment_Run.cs
+++ b/sdk/dotnet/Pulumi/Deployment/Deployment_Run.cs
@@ -125,7 +125,7 @@ namespace Pulumi
                     throw new NotSupportedException($"Mulitple executions of {nameof(TestAsync)} must run serially. Please configure your unit test suite to run tests one-by-one.");
 
                 deployment = new Deployment(engine, monitor, options);
-                Instance = deployment;
+                Instance = new DeploymentInstance(deployment);
             }
 
             try
@@ -159,7 +159,7 @@ namespace Pulumi
 
                 Serilog.Log.Debug("Creating new Deployment.");
                 var deployment = new Deployment();
-                Instance = deployment;
+                Instance = new DeploymentInstance(deployment);
                 return deployment._runner;
             }
         }
diff --git a/sdk/dotnet/Pulumi/Deployment/IDeployment.cs b/sdk/dotnet/Pulumi/Deployment/IDeployment.cs
index 9c45529bd..4062336e8 100644
--- a/sdk/dotnet/Pulumi/Deployment/IDeployment.cs
+++ b/sdk/dotnet/Pulumi/Deployment/IDeployment.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 
 namespace Pulumi
 {
-    public interface IDeployment
+    internal interface IDeployment
     {
         /// <summary>
         /// Returns the current stack name.
diff --git a/sdk/dotnet/Pulumi/PublicAPI.Unshipped.txt b/sdk/dotnet/Pulumi/PublicAPI.Unshipped.txt
index 4c6f15ddf..da2f6e15e 100644
--- a/sdk/dotnet/Pulumi/PublicAPI.Unshipped.txt
+++ b/sdk/dotnet/Pulumi/PublicAPI.Unshipped.txt
@@ -71,16 +71,16 @@ Pulumi.CustomTimeouts.Update.set -> void
 Pulumi.DictionaryResourceArgs
 Pulumi.DictionaryResourceArgs.DictionaryResourceArgs(System.Collections.Immutable.ImmutableDictionary<string, object> dictionary) -> void
 Pulumi.Deployment
+Pulumi.DeploymentInstance
+Pulumi.DeploymentInstance.InvokeAsync(string token, Pulumi.InvokeArgs args, Pulumi.InvokeOptions options = null) -> System.Threading.Tasks.Task
+Pulumi.DeploymentInstance.InvokeAsync<T>(string token, Pulumi.InvokeArgs args, Pulumi.InvokeOptions options = null) -> System.Threading.Tasks.Task<T>
+Pulumi.DeploymentInstance.IsDryRun.get -> bool
+Pulumi.DeploymentInstance.ProjectName.get -> string
+Pulumi.DeploymentInstance.StackName.get -> string
 Pulumi.FileArchive
 Pulumi.FileArchive.FileArchive(string path) -> void
 Pulumi.FileAsset
 Pulumi.FileAsset.FileAsset(string path) -> void
-Pulumi.IDeployment
-Pulumi.IDeployment.InvokeAsync(string token, Pulumi.InvokeArgs args, Pulumi.InvokeOptions options = null) -> System.Threading.Tasks.Task
-Pulumi.IDeployment.InvokeAsync<T>(string token, Pulumi.InvokeArgs args, Pulumi.InvokeOptions options = null) -> System.Threading.Tasks.Task<T>
-Pulumi.IDeployment.IsDryRun.get -> bool
-Pulumi.IDeployment.ProjectName.get -> string
-Pulumi.IDeployment.StackName.get -> string
 Pulumi.Input<T>
 Pulumi.InputArgs
 Pulumi.InputArgs.InputArgs() -> void
@@ -224,7 +224,7 @@ override Pulumi.Union<T0, T1>.GetHashCode() -> int
 override Pulumi.Union<T0, T1>.ToString() -> string
 static Pulumi.ComponentResourceOptions.Merge(Pulumi.ComponentResourceOptions options1, Pulumi.ComponentResourceOptions options2) -> Pulumi.ComponentResourceOptions
 static Pulumi.CustomResourceOptions.Merge(Pulumi.CustomResourceOptions options1, Pulumi.CustomResourceOptions options2) -> Pulumi.CustomResourceOptions
-static Pulumi.Deployment.Instance.get -> Pulumi.IDeployment
+static Pulumi.Deployment.Instance.get -> Pulumi.DeploymentInstance
 static Pulumi.Deployment.RunAsync(System.Action action) -> System.Threading.Tasks.Task<int>
 static Pulumi.Deployment.RunAsync(System.Func<System.Collections.Generic.IDictionary<string, object>> func) -> System.Threading.Tasks.Task<int>
 static Pulumi.Deployment.RunAsync(System.Func<System.Threading.Tasks.Task> func) -> System.Threading.Tasks.Task<int>
diff --git a/sdk/dotnet/cmd/pulumi-language-dotnet/main.go b/sdk/dotnet/cmd/pulumi-language-dotnet/main.go
index 616b89955..fe832941a 100644
--- a/sdk/dotnet/cmd/pulumi-language-dotnet/main.go
+++ b/sdk/dotnet/cmd/pulumi-language-dotnet/main.go
@@ -27,11 +27,11 @@ import (
 
 	pbempty "github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	"github.com/pulumi/pulumi/sdk/go/common/version"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/version"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"google.golang.org/grpc"
 )
 
diff --git a/sdk/go.mod b/sdk/go.mod
index 5dc593ab0..e854d4c6a 100644
--- a/sdk/go.mod
+++ b/sdk/go.mod
@@ -1,9 +1,7 @@
-module github.com/pulumi/pulumi/sdk
+module github.com/pulumi/pulumi/sdk/v2
 
 go 1.13
 
-replace github.com/pulumi/pulumi/sdk => ../sdk
-
 require (
 	github.com/Microsoft/go-winio v0.4.14
 	github.com/blang/semver v3.5.1+incompatible
diff --git a/sdk/go/Makefile b/sdk/go/Makefile
index 46d5a2b47..ddf865b1a 100644
--- a/sdk/go/Makefile
+++ b/sdk/go/Makefile
@@ -1,5 +1,5 @@
 PROJECT_NAME     := Pulumi Go SDK
-LANGHOST_PKG     := github.com/pulumi/pulumi/sdk/go/pulumi-language-go
+LANGHOST_PKG     := github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go
 VERSION          := $(shell ../../scripts/get-version HEAD)
 PROJECT_PKGS     := $(shell go list ./pulumi/... ./pulumi-language-go/... ./common/...| grep -v /vendor/ | grep -v templates)
 
@@ -11,20 +11,17 @@ gen::
 	go generate ./pulumi/...
 
 build:: gen
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 install_plugin::
-	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 install:: install_plugin
 
-lint::
-	golangci-lint run
-
 test_all:: test_fast
 
 test_fast::
 	go test -count=1 -cover -parallel ${TESTPARALLELISM} ${PROJECT_PKGS}
 
 dist::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
diff --git a/sdk/go/common/apitype/core.go b/sdk/go/common/apitype/core.go
index d51ec45f4..a255c3694 100644
--- a/sdk/go/common/apitype/core.go
+++ b/sdk/go/common/apitype/core.go
@@ -32,10 +32,10 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 const (
diff --git a/sdk/go/common/apitype/migrate/checkpoint.go b/sdk/go/common/apitype/migrate/checkpoint.go
index c3909a952..679ba9d90 100644
--- a/sdk/go/common/apitype/migrate/checkpoint.go
+++ b/sdk/go/common/apitype/migrate/checkpoint.go
@@ -15,8 +15,8 @@
 package migrate
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
 )
 
 // UpToCheckpointV2 migrates a CheckpointV1 to a CheckpointV2.
diff --git a/sdk/go/common/apitype/migrate/checkpoint_test.go b/sdk/go/common/apitype/migrate/checkpoint_test.go
index b9291555b..aedfae666 100644
--- a/sdk/go/common/apitype/migrate/checkpoint_test.go
+++ b/sdk/go/common/apitype/migrate/checkpoint_test.go
@@ -17,9 +17,9 @@ package migrate
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/common/apitype/migrate/deployment.go b/sdk/go/common/apitype/migrate/deployment.go
index bf750c4ca..aa59c93e9 100644
--- a/sdk/go/common/apitype/migrate/deployment.go
+++ b/sdk/go/common/apitype/migrate/deployment.go
@@ -14,7 +14,7 @@
 
 package migrate
 
-import "github.com/pulumi/pulumi/sdk/go/common/apitype"
+import "github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
 
 // UpToDeploymentV2 migrates a deployment from DeploymentV1 to DeploymentV2.
 func UpToDeploymentV2(v1 apitype.DeploymentV1) apitype.DeploymentV2 {
diff --git a/sdk/go/common/apitype/migrate/deployment_test.go b/sdk/go/common/apitype/migrate/deployment_test.go
index ac98f8ec8..b5ba2deb3 100644
--- a/sdk/go/common/apitype/migrate/deployment_test.go
+++ b/sdk/go/common/apitype/migrate/deployment_test.go
@@ -17,8 +17,8 @@ package migrate
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/common/apitype/migrate/operation.go b/sdk/go/common/apitype/migrate/operation.go
index 4da3b9fa3..447f89dc9 100644
--- a/sdk/go/common/apitype/migrate/operation.go
+++ b/sdk/go/common/apitype/migrate/operation.go
@@ -14,7 +14,7 @@
 
 package migrate
 
-import "github.com/pulumi/pulumi/sdk/go/common/apitype"
+import "github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
 
 // UpToOperationV2 migrates a resource from OperationV1 to OperationV2.
 func UpToOperationV2(v1 apitype.OperationV1) apitype.OperationV2 {
diff --git a/sdk/go/common/apitype/migrate/resource.go b/sdk/go/common/apitype/migrate/resource.go
index 910eb03c5..94179d1f8 100644
--- a/sdk/go/common/apitype/migrate/resource.go
+++ b/sdk/go/common/apitype/migrate/resource.go
@@ -15,8 +15,8 @@
 package migrate
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // UpToResourceV2 migrates a resource from ResourceV1 to ResourceV2.
diff --git a/sdk/go/common/apitype/migrate/resource_test.go b/sdk/go/common/apitype/migrate/resource_test.go
index c5a28fdd0..825c106d2 100644
--- a/sdk/go/common/apitype/migrate/resource_test.go
+++ b/sdk/go/common/apitype/migrate/resource_test.go
@@ -17,9 +17,9 @@ package migrate
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/common/apitype/updates.go b/sdk/go/common/apitype/updates.go
index 34a2ac93f..c052c72ba 100644
--- a/sdk/go/common/apitype/updates.go
+++ b/sdk/go/common/apitype/updates.go
@@ -17,7 +17,7 @@ package apitype
 import (
 	"encoding/json"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
 )
 
 // CreateUpdateConfig describes the configuration data for an request to `POST /updates`.
diff --git a/sdk/go/common/diag/colors/colors.go b/sdk/go/common/diag/colors/colors.go
index 88a9f8dd2..85d667e8d 100644
--- a/sdk/go/common/diag/colors/colors.go
+++ b/sdk/go/common/diag/colors/colors.go
@@ -20,7 +20,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 const colorLeft = "<{%"
diff --git a/sdk/go/common/diag/colors/diag.go b/sdk/go/common/diag/colors/diag.go
index 7ea4443be..8690892af 100644
--- a/sdk/go/common/diag/colors/diag.go
+++ b/sdk/go/common/diag/colors/diag.go
@@ -15,7 +15,7 @@
 package colors
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type Colorization string
diff --git a/sdk/go/common/diag/diag.go b/sdk/go/common/diag/diag.go
index 0d2eaa334..c9bf2570d 100644
--- a/sdk/go/common/diag/diag.go
+++ b/sdk/go/common/diag/diag.go
@@ -15,7 +15,7 @@
 package diag
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // ID is a unique diagnostics identifier.
diff --git a/sdk/go/common/diag/errors.go b/sdk/go/common/diag/errors.go
index c28548fcc..4c1818f52 100644
--- a/sdk/go/common/diag/errors.go
+++ b/sdk/go/common/diag/errors.go
@@ -15,7 +15,7 @@
 package diag
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // newError registers a new error message underneath the given id.
diff --git a/sdk/go/common/diag/sink.go b/sdk/go/common/diag/sink.go
index 15573c0d5..5d0195f10 100644
--- a/sdk/go/common/diag/sink.go
+++ b/sdk/go/common/diag/sink.go
@@ -20,9 +20,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Sink facilitates pluggable diagnostics messages.
diff --git a/sdk/go/common/diag/sink_test.go b/sdk/go/common/diag/sink_test.go
index a905b393b..bbbebb515 100644
--- a/sdk/go/common/diag/sink_test.go
+++ b/sdk/go/common/diag/sink_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
 )
 
 func discardSink() Sink {
diff --git a/sdk/go/common/encoding/init.go b/sdk/go/common/encoding/init.go
index 2fe9c27ad..a6c0ac4ba 100644
--- a/sdk/go/common/encoding/init.go
+++ b/sdk/go/common/encoding/init.go
@@ -15,7 +15,7 @@
 package encoding
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func init() {
diff --git a/sdk/go/common/resource/asset.go b/sdk/go/common/resource/asset.go
index 78c816a6d..d5cfe12af 100644
--- a/sdk/go/common/resource/asset.go
+++ b/sdk/go/common/resource/asset.go
@@ -36,8 +36,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil"
 )
 
 const (
diff --git a/sdk/go/common/resource/asset_test.go b/sdk/go/common/resource/asset_test.go
index 8fb480a59..be50c75be 100644
--- a/sdk/go/common/resource/asset_test.go
+++ b/sdk/go/common/resource/asset_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 const (
diff --git a/sdk/go/common/resource/config/crypt.go b/sdk/go/common/resource/config/crypt.go
index b1f5b7702..4b115e627 100644
--- a/sdk/go/common/resource/config/crypt.go
+++ b/sdk/go/common/resource/config/crypt.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/sdk/go/common/resource/config/key.go b/sdk/go/common/resource/config/key.go
index ea3cd30e1..d15026793 100644
--- a/sdk/go/common/resource/config/key.go
+++ b/sdk/go/common/resource/config/key.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 type Key struct {
diff --git a/sdk/go/common/resource/config/map.go b/sdk/go/common/resource/config/map.go
index a244d8a28..aa1f251fb 100644
--- a/sdk/go/common/resource/config/map.go
+++ b/sdk/go/common/resource/config/map.go
@@ -19,11 +19,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 var errSecureKeyReserved = errors.New(`"secure" key in maps of length 1 are reserved`)
diff --git a/sdk/go/common/resource/config/map_test.go b/sdk/go/common/resource/config/map_test.go
index 3cc6a6926..ed37ac9f3 100644
--- a/sdk/go/common/resource/config/map_test.go
+++ b/sdk/go/common/resource/config/map_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/stretchr/testify/assert"
 	yaml "gopkg.in/yaml.v2"
 )
diff --git a/sdk/go/common/resource/errors.go b/sdk/go/common/resource/errors.go
index b933baa7e..6be70c749 100644
--- a/sdk/go/common/resource/errors.go
+++ b/sdk/go/common/resource/errors.go
@@ -15,7 +15,7 @@
 package resource
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/mapper"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/mapper"
 )
 
 // NewErrors creates a new error list pertaining to a resource.  Note that it just turns around and defers to
diff --git a/sdk/go/common/resource/plugin/analyzer.go b/sdk/go/common/resource/plugin/analyzer.go
index 4f901d316..ab75cb68f 100644
--- a/sdk/go/common/resource/plugin/analyzer.go
+++ b/sdk/go/common/resource/plugin/analyzer.go
@@ -17,10 +17,10 @@ package plugin
 import (
 	"io"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // Analyzer provides a pluggable interface for performing arbitrary analysis of entire projects/stacks/snapshots, and/or
diff --git a/sdk/go/common/resource/plugin/analyzer_plugin.go b/sdk/go/common/resource/plugin/analyzer_plugin.go
index 3ff423d46..6cf8f6764 100644
--- a/sdk/go/common/resource/plugin/analyzer_plugin.go
+++ b/sdk/go/common/resource/plugin/analyzer_plugin.go
@@ -29,14 +29,14 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil/rpcerror"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil/rpcerror"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // analyzer reflects an analyzer plugin, loaded dynamically for a single suite of checks.
diff --git a/sdk/go/common/resource/plugin/check.go b/sdk/go/common/resource/plugin/check.go
index dd55e8757..9a1a62e22 100644
--- a/sdk/go/common/resource/plugin/check.go
+++ b/sdk/go/common/resource/plugin/check.go
@@ -15,8 +15,8 @@
 package plugin
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/util/mapper"
-	lumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/mapper"
+	lumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // NewCheckResponse produces a response with property validation failures from the given array of mapper failures.
diff --git a/sdk/go/common/resource/plugin/config_source.go b/sdk/go/common/resource/plugin/config_source.go
index 2608645ce..e8e8d7177 100644
--- a/sdk/go/common/resource/plugin/config_source.go
+++ b/sdk/go/common/resource/plugin/config_source.go
@@ -15,8 +15,8 @@
 package plugin
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // ConfigSource is an interface that allows a plugin context to fetch configuration data for a plugin named by
diff --git a/sdk/go/common/resource/plugin/context.go b/sdk/go/common/resource/plugin/context.go
index 8b8a22251..7d11ce0c7 100644
--- a/sdk/go/common/resource/plugin/context.go
+++ b/sdk/go/common/resource/plugin/context.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/opentracing/opentracing-go"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
 )
 
 // Context is used to group related operations together so that associated OS resources can be cached, shared, and
diff --git a/sdk/go/common/resource/plugin/host.go b/sdk/go/common/resource/plugin/host.go
index 8dc7b4c1c..adea878f7 100644
--- a/sdk/go/common/resource/plugin/host.go
+++ b/sdk/go/common/resource/plugin/host.go
@@ -21,14 +21,14 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // A Host hosts provider plugins and makes them easily accessible by package name.
diff --git a/sdk/go/common/resource/plugin/host_server.go b/sdk/go/common/resource/plugin/host_server.go
index d70a113db..31f8ff014 100644
--- a/sdk/go/common/resource/plugin/host_server.go
+++ b/sdk/go/common/resource/plugin/host_server.go
@@ -23,10 +23,10 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	lumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	lumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // hostServer is the server side of the host RPC machinery.
diff --git a/sdk/go/common/resource/plugin/langruntime.go b/sdk/go/common/resource/plugin/langruntime.go
index 770aeb6d7..0ecdff3d4 100644
--- a/sdk/go/common/resource/plugin/langruntime.go
+++ b/sdk/go/common/resource/plugin/langruntime.go
@@ -17,8 +17,8 @@ package plugin
 import (
 	"io"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // LanguageRuntime is a convenient interface for interacting with language runtime plugins.  These tend to be
diff --git a/sdk/go/common/resource/plugin/langruntime_plugin.go b/sdk/go/common/resource/plugin/langruntime_plugin.go
index 11b2cafd7..1eaa9433f 100644
--- a/sdk/go/common/resource/plugin/langruntime_plugin.go
+++ b/sdk/go/common/resource/plugin/langruntime_plugin.go
@@ -23,12 +23,12 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil/rpcerror"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil/rpcerror"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // langhost reflects a language host plugin, loaded dynamically for a single language/runtime pair.
diff --git a/sdk/go/common/resource/plugin/plugin.go b/sdk/go/common/resource/plugin/plugin.go
index ee58476e0..339b08a45 100644
--- a/sdk/go/common/resource/plugin/plugin.go
+++ b/sdk/go/common/resource/plugin/plugin.go
@@ -33,11 +33,11 @@ import (
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/status"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
 )
 
 type plugin struct {
diff --git a/sdk/go/common/resource/plugin/provider.go b/sdk/go/common/resource/plugin/provider.go
index 2dacaee53..b32c7dc9f 100644
--- a/sdk/go/common/resource/plugin/provider.go
+++ b/sdk/go/common/resource/plugin/provider.go
@@ -17,10 +17,10 @@ package plugin
 import (
 	"io"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 )
 
 // Provider presents a simple interface for orchestrating resource create, read, update, and delete operations.  Each
diff --git a/sdk/go/common/resource/plugin/provider_plugin.go b/sdk/go/common/resource/plugin/provider_plugin.go
index 1550f52b5..53dcb7c3e 100644
--- a/sdk/go/common/resource/plugin/provider_plugin.go
+++ b/sdk/go/common/resource/plugin/provider_plugin.go
@@ -27,13 +27,13 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil/rpcerror"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil/rpcerror"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // The `Type()` for the NodeJS dynamic provider.  Logically, this is the same as calling
diff --git a/sdk/go/common/resource/plugin/provider_plugin_test.go b/sdk/go/common/resource/plugin/provider_plugin_test.go
index 11aad2eda..db07eebd1 100644
--- a/sdk/go/common/resource/plugin/provider_plugin_test.go
+++ b/sdk/go/common/resource/plugin/provider_plugin_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 func TestAnnotateSecrets(t *testing.T) {
diff --git a/sdk/go/common/resource/plugin/rpc.go b/sdk/go/common/resource/plugin/rpc.go
index 47eb2726c..48b28778d 100644
--- a/sdk/go/common/resource/plugin/rpc.go
+++ b/sdk/go/common/resource/plugin/rpc.go
@@ -21,9 +21,9 @@ import (
 	structpb "github.com/golang/protobuf/ptypes/struct"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"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/logging"
 )
 
 // MarshalOptions controls the marshaling of RPC structures.
diff --git a/sdk/go/common/resource/plugin/rpc_test.go b/sdk/go/common/resource/plugin/rpc_test.go
index d8ace5112..70d910565 100644
--- a/sdk/go/common/resource/plugin/rpc_test.go
+++ b/sdk/go/common/resource/plugin/rpc_test.go
@@ -22,8 +22,8 @@ import (
 	structpb "github.com/golang/protobuf/ptypes/struct"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func setProperty(s *structpb.Value, k string, v interface{}) {
diff --git a/sdk/go/common/resource/properties.go b/sdk/go/common/resource/properties.go
index 7b891da13..6e1c3ef86 100644
--- a/sdk/go/common/resource/properties.go
+++ b/sdk/go/common/resource/properties.go
@@ -20,9 +20,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/mapper"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/mapper"
 )
 
 // PropertyKey is the name of a property.
diff --git a/sdk/go/common/resource/properties_diff_test.go b/sdk/go/common/resource/properties_diff_test.go
index f5968fded..648fb7a7c 100644
--- a/sdk/go/common/resource/properties_diff_test.go
+++ b/sdk/go/common/resource/properties_diff_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func TestNullPropertyValueDiffs(t *testing.T) {
diff --git a/sdk/go/common/resource/resource_goal.go b/sdk/go/common/resource/resource_goal.go
index ead624542..2a641158e 100644
--- a/sdk/go/common/resource/resource_goal.go
+++ b/sdk/go/common/resource/resource_goal.go
@@ -15,7 +15,7 @@
 package resource
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // Goal is a desired state for a resource object.  Normally it represents a subset of the resource's state expressed by
diff --git a/sdk/go/common/resource/resource_id.go b/sdk/go/common/resource/resource_id.go
index 2c404a6ac..4410b0857 100644
--- a/sdk/go/common/resource/resource_id.go
+++ b/sdk/go/common/resource/resource_id.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // ID is a unique resource identifier; it is managed by the provider and is mostly opaque.
diff --git a/sdk/go/common/resource/resource_state.go b/sdk/go/common/resource/resource_state.go
index d38f2a457..f22266d1a 100644
--- a/sdk/go/common/resource/resource_state.go
+++ b/sdk/go/common/resource/resource_state.go
@@ -15,8 +15,8 @@
 package resource
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // State is a structure containing state associated with a resource.  This resource may have been serialized and
diff --git a/sdk/go/common/resource/stack.go b/sdk/go/common/resource/stack.go
index 48a68eaa5..f74c1d9c1 100644
--- a/sdk/go/common/resource/stack.go
+++ b/sdk/go/common/resource/stack.go
@@ -15,7 +15,7 @@
 package resource
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // RootStackType is the type name that will be used for the root component in the Pulumi resource tree.
diff --git a/sdk/go/common/resource/urn.go b/sdk/go/common/resource/urn.go
index 089d6ec85..049fc568a 100644
--- a/sdk/go/common/resource/urn.go
+++ b/sdk/go/common/resource/urn.go
@@ -17,8 +17,8 @@ package resource
 import (
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // URN is a friendly, but unique, URN for a resource, most often auto-assigned by Pulumi.  These are
diff --git a/sdk/go/common/resource/urn_test.go b/sdk/go/common/resource/urn_test.go
index 9acae2f28..b345ed012 100644
--- a/sdk/go/common/resource/urn_test.go
+++ b/sdk/go/common/resource/urn_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 func TestURNRoundTripping(t *testing.T) {
diff --git a/sdk/go/common/testing/environment.go b/sdk/go/common/testing/environment.go
index d1e4d25e7..a0ad2fc4b 100644
--- a/sdk/go/common/testing/environment.go
+++ b/sdk/go/common/testing/environment.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tools"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tools"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/common/tokens/names.go b/sdk/go/common/tokens/names.go
index 64ddacda3..ab4a60425 100644
--- a/sdk/go/common/tokens/names.go
+++ b/sdk/go/common/tokens/names.go
@@ -18,7 +18,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Name is an identifier.  It conforms to the regex [A-Za-z_.][A-Za-z0-9_]*.
diff --git a/sdk/go/common/tokens/tokens.go b/sdk/go/common/tokens/tokens.go
index f405cf135..765546d2d 100644
--- a/sdk/go/common/tokens/tokens.go
+++ b/sdk/go/common/tokens/tokens.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Token is a qualified name that is capable of resolving to a symbol entirely on its own.  Most uses of tokens are
diff --git a/sdk/go/common/tools/gen.go b/sdk/go/common/tools/gen.go
index 6f3d85902..5d59374ae 100644
--- a/sdk/go/common/tools/gen.go
+++ b/sdk/go/common/tools/gen.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // GenWriter adds some convenient helpers atop a buffered writer.
diff --git a/sdk/go/common/util/archive/archive.go b/sdk/go/common/util/archive/archive.go
index f6432c2d2..06ab2d3bf 100644
--- a/sdk/go/common/util/archive/archive.go
+++ b/sdk/go/common/util/archive/archive.go
@@ -26,7 +26,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Untgz uncompresses a .tar.gz/.tgz file into a specific directory.
diff --git a/sdk/go/common/util/buildutil/semver.go b/sdk/go/common/util/buildutil/semver.go
index e6bfd1d09..319744784 100644
--- a/sdk/go/common/util/buildutil/semver.go
+++ b/sdk/go/common/util/buildutil/semver.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/sdk/go/common/util/cmdutil/args.go b/sdk/go/common/util/cmdutil/args.go
index 1b4004f6c..298fbc377 100644
--- a/sdk/go/common/util/cmdutil/args.go
+++ b/sdk/go/common/util/cmdutil/args.go
@@ -17,7 +17,7 @@ package cmdutil
 import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"github.com/spf13/cobra"
 )
 
diff --git a/sdk/go/common/util/cmdutil/console.go b/sdk/go/common/util/cmdutil/console.go
index 0e3579a2d..5a6bd911b 100644
--- a/sdk/go/common/util/cmdutil/console.go
+++ b/sdk/go/common/util/cmdutil/console.go
@@ -24,7 +24,7 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/ciutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/ciutil"
 )
 
 // Emoji controls whether emojis will by default be printed in the output.
diff --git a/sdk/go/common/util/cmdutil/diag.go b/sdk/go/common/util/cmdutil/diag.go
index 7921d394c..fa7bcc084 100644
--- a/sdk/go/common/util/cmdutil/diag.go
+++ b/sdk/go/common/util/cmdutil/diag.go
@@ -18,9 +18,9 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 var snk diag.Sink
diff --git a/sdk/go/common/util/cmdutil/exit.go b/sdk/go/common/util/cmdutil/exit.go
index 51dd23fcc..fe7667c88 100644
--- a/sdk/go/common/util/cmdutil/exit.go
+++ b/sdk/go/common/util/cmdutil/exit.go
@@ -23,9 +23,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/result"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/result"
 )
 
 // DetailedError extracts a detailed error message, including stack trace, if there is one.
diff --git a/sdk/go/common/util/cmdutil/profile.go b/sdk/go/common/util/cmdutil/profile.go
index 0d601d989..9492e4229 100644
--- a/sdk/go/common/util/cmdutil/profile.go
+++ b/sdk/go/common/util/cmdutil/profile.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func InitProfiling(prefix string) error {
diff --git a/sdk/go/common/util/cmdutil/trace.go b/sdk/go/common/util/cmdutil/trace.go
index bbd509770..c625c7c58 100644
--- a/sdk/go/common/util/cmdutil/trace.go
+++ b/sdk/go/common/util/cmdutil/trace.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	jaeger "github.com/uber/jaeger-client-go"
 	"github.com/uber/jaeger-client-go/transport/zipkin"
 	"sourcegraph.com/sourcegraph/appdash"
diff --git a/sdk/go/common/util/contract/ignore.go b/sdk/go/common/util/contract/ignore.go
index ba5eb8ea0..759f192ea 100644
--- a/sdk/go/common/util/contract/ignore.go
+++ b/sdk/go/common/util/contract/ignore.go
@@ -17,7 +17,7 @@ package contract
 import (
 	"io"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Ignore explicitly ignores a value.  This is similar to `_ = x`, but tells linters ignoring is intentional.
diff --git a/sdk/go/common/util/fsutil/chdir.go b/sdk/go/common/util/fsutil/chdir.go
index d86dbeada..619c8eacc 100644
--- a/sdk/go/common/util/fsutil/chdir.go
+++ b/sdk/go/common/util/fsutil/chdir.go
@@ -18,7 +18,7 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Chdir changes the directory so that all operations from now on are relative to the project we are working with.
diff --git a/sdk/go/common/util/fsutil/lock.go b/sdk/go/common/util/fsutil/lock.go
index 8b81e6a73..aa4ad0b04 100644
--- a/sdk/go/common/util/fsutil/lock.go
+++ b/sdk/go/common/util/fsutil/lock.go
@@ -17,7 +17,7 @@ package fsutil
 import (
 	"sync"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 
 	"github.com/gofrs/flock"
 )
diff --git a/sdk/go/common/util/fsutil/qname.go b/sdk/go/common/util/fsutil/qname.go
index 3710e0929..4d3962a3b 100644
--- a/sdk/go/common/util/fsutil/qname.go
+++ b/sdk/go/common/util/fsutil/qname.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 // QnamePath just cleans a name and makes sure it's appropriate to use as a path.
diff --git a/sdk/go/common/util/gitutil/git.go b/sdk/go/common/util/gitutil/git.go
index 135e23735..9de032707 100644
--- a/sdk/go/common/util/gitutil/git.go
+++ b/sdk/go/common/util/gitutil/git.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
 	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/config"
 	"gopkg.in/src-d/go-git.v4/plumbing"
diff --git a/sdk/go/common/util/gitutil/git_test.go b/sdk/go/common/util/gitutil/git_test.go
index 4393a6875..fdd70098f 100644
--- a/sdk/go/common/util/gitutil/git_test.go
+++ b/sdk/go/common/util/gitutil/git_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/common/util/httputil/http.go b/sdk/go/common/util/httputil/http.go
index cf7c6cb4a..b3ae15199 100644
--- a/sdk/go/common/util/httputil/http.go
+++ b/sdk/go/common/util/httputil/http.go
@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/retry"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/retry"
 )
 
 // maxRetryCount is the number of times to try an http request before giving up an returning the last error
diff --git a/sdk/go/common/util/mapper/mapper.go b/sdk/go/common/util/mapper/mapper.go
index 09242be8d..64ebc989b 100644
--- a/sdk/go/common/util/mapper/mapper.go
+++ b/sdk/go/common/util/mapper/mapper.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Mapper can map from weakly typed JSON-like property bags to strongly typed structs, and vice versa.
diff --git a/sdk/go/common/util/mapper/mapper_decode.go b/sdk/go/common/util/mapper/mapper_decode.go
index f28617210..46b573fdd 100644
--- a/sdk/go/common/util/mapper/mapper_decode.go
+++ b/sdk/go/common/util/mapper/mapper_decode.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Decoder is a func that knows how to decode into particular type.
diff --git a/sdk/go/common/util/mapper/mapper_encode.go b/sdk/go/common/util/mapper/mapper_encode.go
index fdf98a5e5..4988c0481 100644
--- a/sdk/go/common/util/mapper/mapper_encode.go
+++ b/sdk/go/common/util/mapper/mapper_encode.go
@@ -17,7 +17,7 @@ package mapper
 import (
 	"reflect"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Encode encodes a strongly typed struct into a weakly typed JSON-like property bag.
diff --git a/sdk/go/common/util/rpcutil/interceptor.go b/sdk/go/common/util/rpcutil/interceptor.go
index c82e84476..b8d502397 100644
--- a/sdk/go/common/util/rpcutil/interceptor.go
+++ b/sdk/go/common/util/rpcutil/interceptor.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	opentracing "github.com/opentracing/opentracing-go"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/sdk/go/common/util/rpcutil/rpcerror/rpcerror.go b/sdk/go/common/util/rpcutil/rpcerror/rpcerror.go
index ac3d7e6f6..e11af078a 100644
--- a/sdk/go/common/util/rpcutil/rpcerror/rpcerror.go
+++ b/sdk/go/common/util/rpcutil/rpcerror/rpcerror.go
@@ -36,8 +36,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // Error represents an error response from an RPC server endpoint.
diff --git a/sdk/go/common/workspace/creds.go b/sdk/go/common/workspace/creds.go
index 539300999..2fcbccef7 100644
--- a/sdk/go/common/workspace/creds.go
+++ b/sdk/go/common/workspace/creds.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // PulumiCredentialsPathEnvVar is a path to the folder where credentials are stored.
diff --git a/sdk/go/common/workspace/paths.go b/sdk/go/common/workspace/paths.go
index e26ae7347..279040b14 100644
--- a/sdk/go/common/workspace/paths.go
+++ b/sdk/go/common/workspace/paths.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/encoding"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/encoding"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
 )
 
 const (
diff --git a/sdk/go/common/workspace/plugins.go b/sdk/go/common/workspace/plugins.go
index b37e7499a..16187ffd9 100644
--- a/sdk/go/common/workspace/plugins.go
+++ b/sdk/go/common/workspace/plugins.go
@@ -28,18 +28,17 @@ import (
 	"sort"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/archive"
-
 	"github.com/blang/semver"
 	"github.com/cheggaaa/pb"
 	"github.com/djherbis/times"
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/diag/colors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/httputil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/archive"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/version"
 )
 
 const (
diff --git a/sdk/go/common/workspace/project.go b/sdk/go/common/workspace/project.go
index 3ce18f7c7..f858156d8 100644
--- a/sdk/go/common/workspace/project.go
+++ b/sdk/go/common/workspace/project.go
@@ -20,13 +20,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-
 	"github.com/pkg/errors"
 
-	"github.com/pulumi/pulumi/sdk/go/common/encoding"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/encoding"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Analyzers is a list of analyzers to run on this project.
diff --git a/sdk/go/common/workspace/templates.go b/sdk/go/common/workspace/templates.go
index 8f8fcd110..b284a3a53 100644
--- a/sdk/go/common/workspace/templates.go
+++ b/sdk/go/common/workspace/templates.go
@@ -23,13 +23,13 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/pkg/errors"
 	"github.com/texttheater/golang-levenshtein/levenshtein"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 
-	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/gitutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/gitutil"
 )
 
 const (
diff --git a/sdk/go/common/workspace/workspace.go b/sdk/go/common/workspace/workspace.go
index e5c8d01c9..15484c8e2 100644
--- a/sdk/go/common/workspace/workspace.go
+++ b/sdk/go/common/workspace/workspace.go
@@ -26,8 +26,9 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // W offers functionality for interacting with Pulumi workspaces.
diff --git a/sdk/go/pulumi-language-go/main.go b/sdk/go/pulumi-language-go/main.go
index 81e50242c..7b5744b3d 100644
--- a/sdk/go/pulumi-language-go/main.go
+++ b/sdk/go/pulumi-language-go/main.go
@@ -32,14 +32,14 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/buildutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/executable"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	"github.com/pulumi/pulumi/sdk/go/common/version"
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/buildutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+  "github.com/pulumi/pulumi/sdk/v2/go/common/util/executable"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/version"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 func findProgram(binary string) (*exec.Cmd, error) {
diff --git a/sdk/go/pulumi/asset.go b/sdk/go/pulumi/asset.go
index 5d199c8e6..345f40f55 100644
--- a/sdk/go/pulumi/asset.go
+++ b/sdk/go/pulumi/asset.go
@@ -17,7 +17,7 @@ package pulumi
 import (
 	"reflect"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 	"golang.org/x/net/context"
 )
 
diff --git a/sdk/go/pulumi/config/config.go b/sdk/go/pulumi/config/config.go
index c3c904f77..26f99efed 100644
--- a/sdk/go/pulumi/config/config.go
+++ b/sdk/go/pulumi/config/config.go
@@ -15,7 +15,7 @@
 package config
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Config is a struct that permits access to config as a "bag" with a package name.  This avoids needing to access
diff --git a/sdk/go/pulumi/config/config_test.go b/sdk/go/pulumi/config/config_test.go
index 78877b92a..c32e89921 100644
--- a/sdk/go/pulumi/config/config_test.go
+++ b/sdk/go/pulumi/config/config_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type TestStruct struct {
diff --git a/sdk/go/pulumi/config/get.go b/sdk/go/pulumi/config/get.go
index 162d3c5dc..73a9dbede 100644
--- a/sdk/go/pulumi/config/get.go
+++ b/sdk/go/pulumi/config/get.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Get loads an optional configuration value by its key, or returns "" if it doesn't exist.
diff --git a/sdk/go/pulumi/config/require.go b/sdk/go/pulumi/config/require.go
index a5f99d2f3..cb0d868d5 100644
--- a/sdk/go/pulumi/config/require.go
+++ b/sdk/go/pulumi/config/require.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Require loads a configuration value by its key, or panics if it doesn't exist.
diff --git a/sdk/go/pulumi/config/try.go b/sdk/go/pulumi/config/try.go
index cbf62f08d..c6a8511d6 100644
--- a/sdk/go/pulumi/config/try.go
+++ b/sdk/go/pulumi/config/try.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Try loads a configuration value by its key, returning a non-nil error if it doesn't exist.
diff --git a/sdk/go/pulumi/context.go b/sdk/go/pulumi/context.go
index 6b332f7b0..53c99db14 100644
--- a/sdk/go/pulumi/context.go
+++ b/sdk/go/pulumi/context.go
@@ -29,11 +29,11 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	"google.golang.org/grpc"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // Context handles registration of resources and exposes metadata about the current deployment context.
diff --git a/sdk/go/pulumi/log.go b/sdk/go/pulumi/log.go
index 79510d279..5e8b30e48 100644
--- a/sdk/go/pulumi/log.go
+++ b/sdk/go/pulumi/log.go
@@ -17,7 +17,7 @@
 package pulumi
 
 import (
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"golang.org/x/net/context"
 )
 
diff --git a/sdk/go/pulumi/mocks.go b/sdk/go/pulumi/mocks.go
index 3d42e948e..3fe339156 100644
--- a/sdk/go/pulumi/mocks.go
+++ b/sdk/go/pulumi/mocks.go
@@ -4,13 +4,13 @@ import (
 	"log"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 type MockResourceMonitor interface {
diff --git a/sdk/go/pulumi/rpc.go b/sdk/go/pulumi/rpc.go
index e954f5289..86cf2dacf 100644
--- a/sdk/go/pulumi/rpc.go
+++ b/sdk/go/pulumi/rpc.go
@@ -22,8 +22,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func mapStructTypes(from, to reflect.Type) func(reflect.Value, int) (reflect.StructField, reflect.Value) {
diff --git a/sdk/go/pulumi/rpc_test.go b/sdk/go/pulumi/rpc_test.go
index 5e9374b75..49571f728 100644
--- a/sdk/go/pulumi/rpc_test.go
+++ b/sdk/go/pulumi/rpc_test.go
@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/plugin"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/pulumi/run.go b/sdk/go/pulumi/run.go
index d9ff42c9b..ee5b671b1 100644
--- a/sdk/go/pulumi/run.go
+++ b/sdk/go/pulumi/run.go
@@ -24,7 +24,7 @@ import (
 
 	multierror "github.com/hashicorp/go-multierror"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 var ErrPlugins = errors.New("pulumi: plugins requested")
diff --git a/sdk/go/pulumi/run_test.go b/sdk/go/pulumi/run_test.go
index d49c854e1..e5c836353 100644
--- a/sdk/go/pulumi/run_test.go
+++ b/sdk/go/pulumi/run_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/pulumi/stack_reference_test.go b/sdk/go/pulumi/stack_reference_test.go
index 5a0ef1b05..dc7ecbd50 100644
--- a/sdk/go/pulumi/stack_reference_test.go
+++ b/sdk/go/pulumi/stack_reference_test.go
@@ -3,7 +3,7 @@ package pulumi
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/go/pulumi/templates/config-config.go.template b/sdk/go/pulumi/templates/config-config.go.template
index ecf84047f..65837f7bf 100644
--- a/sdk/go/pulumi/templates/config-config.go.template
+++ b/sdk/go/pulumi/templates/config-config.go.template
@@ -15,7 +15,7 @@
 package config
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Config is a struct that permits access to config as a "bag" with a package name.  This avoids needing to access
@@ -163,4 +163,4 @@ func (c *Config) TrySecret{{.Name}}(key string) (pulumi.Output, error) {
 }
 
 {{end}}
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/sdk/go/pulumi/templates/config-get.go.template b/sdk/go/pulumi/templates/config-get.go.template
index 3d8184d87..b85f27435 100644
--- a/sdk/go/pulumi/templates/config-get.go.template
+++ b/sdk/go/pulumi/templates/config-get.go.template
@@ -19,7 +19,7 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Get loads an optional configuration value by its key, or returns "" if it doesn't exist.
@@ -72,4 +72,4 @@ func GetSecret{{.Name}}(ctx *pulumi.Context, key string) pulumi.Output {
 	return pulumi.ToSecret(Get{{.Name}}(ctx, key))
 }
 {{end}}
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/sdk/go/pulumi/templates/config-require.go.template b/sdk/go/pulumi/templates/config-require.go.template
index 746203530..b9ab94328 100644
--- a/sdk/go/pulumi/templates/config-require.go.template
+++ b/sdk/go/pulumi/templates/config-require.go.template
@@ -19,8 +19,8 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Require loads a configuration value by its key, or panics if it doesn't exist.
@@ -72,4 +72,4 @@ func RequireSecret{{.Name}}(ctx *pulumi.Context, key string) pulumi.Output {
 	return pulumi.ToSecret(Require{{.Name}}(ctx, key))
 }
 {{end}}
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/sdk/go/pulumi/templates/config-try.go.template b/sdk/go/pulumi/templates/config-try.go.template
index f08862320..63c53d80d 100644
--- a/sdk/go/pulumi/templates/config-try.go.template
+++ b/sdk/go/pulumi/templates/config-try.go.template
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/cast"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // Try loads a configuration value by its key, returning a non-nil error if it doesn't exist.
diff --git a/sdk/go/pulumi/types.go b/sdk/go/pulumi/types.go
index 3866249de..76b4941e5 100644
--- a/sdk/go/pulumi/types.go
+++ b/sdk/go/pulumi/types.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 // Output helps encode the relationship between resources in a Pulumi application. Specifically an output property
diff --git a/sdk/nodejs/Makefile b/sdk/nodejs/Makefile
index 66617307b..18c4fa886 100644
--- a/sdk/nodejs/Makefile
+++ b/sdk/nodejs/Makefile
@@ -2,7 +2,7 @@ PROJECT_NAME     := Pulumi Node.JS SDK
 NODE_MODULE_NAME := @pulumi/pulumi
 VERSION          := $(shell ../../scripts/get-version HEAD)
 
-LANGUAGE_HOST    := github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs
+LANGUAGE_HOST    := github.com/pulumi/pulumi/sdk/v2/nodejs/cmd/pulumi-language-nodejs
 
 PROJECT_PKGS    := $(shell go list ./cmd...)
 TESTPARALLELISM := 10
@@ -13,7 +13,6 @@ include ../../build/common.mk
 export PATH:=$(shell yarn bin 2>/dev/null):$(PATH)
 
 lint::
-	golangci-lint run
 	./node_modules/.bin/tslint -c tslint.json -p tsconfig.json
 
 build_package::
@@ -28,7 +27,7 @@ build_package::
 	find tests/runtime/langhost/cases/* -type d -exec cp -R {} bin/tests/runtime/langhost/cases/ \;
 
 build_plugin::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
 
 build:: build_package build_plugin
 
@@ -37,7 +36,7 @@ install_package::
 	cp dist/pulumi-analyzer-policy "$(PULUMI_BIN)"
 
 install_plugin::
-	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
+	GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
 
 install:: install_package install_plugin
 
@@ -57,6 +56,6 @@ test_all:: sxs_tests istanbul_tests
 	$(GO_TEST) ${PROJECT_PKGS}
 
 dist::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGUAGE_HOST}
 	cp dist/pulumi-resource-pulumi-nodejs "$$(go env GOPATH)"/bin/
 	cp dist/pulumi-analyzer-policy "$$(go env GOPATH)"/bin/
diff --git a/sdk/nodejs/cmd/dynamic-provider/index.ts b/sdk/nodejs/cmd/dynamic-provider/index.ts
index 142ff36e6..358c10ff4 100644
--- a/sdk/nodejs/cmd/dynamic-provider/index.ts
+++ b/sdk/nodejs/cmd/dynamic-provider/index.ts
@@ -15,13 +15,14 @@
 import * as minimist from "minimist";
 import * as path from "path";
 
+import * as grpc from "@grpc/grpc-js";
+
 import * as dynamic from "../../dynamic";
 import * as resource from "../../resource";
 import * as runtime from "../../runtime";
 import { version } from "../../version";
 
 const requireFromString = require("require-from-string");
-const grpc = require("grpc");
 const anyproto = require("google-protobuf/google/protobuf/any_pb.js");
 const emptyproto = require("google-protobuf/google/protobuf/empty_pb.js");
 const structproto = require("google-protobuf/google/protobuf/struct_pb.js");
@@ -32,6 +33,27 @@ const statusproto = require("../../proto/status_pb.js");
 
 const providerKey: string = "__provider";
 
+// We track all uncaught errors here.  If we have any, we will make sure we always have a non-0 exit
+// code.
+const uncaughtErrors = new Set<Error>();
+const uncaughtHandler = (err: Error) => {
+    if (!uncaughtErrors.has(err)) {
+        uncaughtErrors.add(err);
+        console.error(err.stack || err.message || ("" + err));
+    }
+};
+
+process.on("uncaughtException", uncaughtHandler);
+// @ts-ignore 'unhandledRejection' will almost always invoke uncaughtHandler with an Error. so just
+// suppress the TS strictness here.
+process.on("unhandledRejection", uncaughtHandler);
+process.on("exit", (code: number) => {
+    // If there were any uncaught errors at all, we always want to exit with an error code.
+    if (code === 0 && uncaughtErrors.size > 0) {
+        process.exitCode = 1;
+    }
+});
+
 function getProvider(props: any): dynamic.ResourceProvider {
     // TODO[pulumi/pulumi#414]: investigate replacing requireFromString with eval
     return requireFromString(props[providerKey]).handler();
@@ -187,7 +209,8 @@ async function createRPC(call: any, callback: any): Promise<void> {
 
         callback(undefined, resp);
     } catch (e) {
-        return callback(grpcResponseFromError(e));
+        const response = grpcResponseFromError(e);
+        return callback(/*err:*/ response, /*value:*/ null, /*metadata:*/ response.metadata);
     }
 }
 
@@ -238,7 +261,8 @@ async function updateRPC(call: any, callback: any): Promise<void> {
 
         callback(undefined, resp);
     } catch (e) {
-        return callback(grpcResponseFromError(e));
+        const response = grpcResponseFromError(e);
+        return callback(/*err:*/ response, /*value:*/ null, /*metadata:*/ response.metadata);
     }
 }
 
@@ -281,7 +305,7 @@ function resultIncludingProvider(result: any, props: any): any {
 // rejected the resource, or an initialization error, where the API server has accepted the
 // resource, but it failed to initialize (e.g., the app code is continually crashing and the
 // resource has failed to become alive).
-function grpcResponseFromError(e: {id: string, properties: any, message: string, reasons?: string[]}): any {
+function grpcResponseFromError(e: {id: string, properties: any, message: string, reasons?: string[]}) {
     // Create response object.
     const resp = new statusproto.Status();
     resp.setCode(grpc.status.UNKNOWN);
@@ -316,7 +340,7 @@ function grpcResponseFromError(e: {id: string, properties: any, message: string,
 }
 
 /** @internal */
-export function main(args: string[]): void {
+export async function main(args: string[]) {
     // The program requires a single argument: the address of the RPC endpoint for the engine.  It
     // optionally also takes a second argument, a reference back to the engine, but this may be missing.
     if (args.length === 0) {
@@ -344,8 +368,15 @@ export function main(args: string[]): void {
         getPluginInfo: getPluginInfoRPC,
         getSchema: getSchemaRPC,
     });
-    const port: number = server.bind(`0.0.0.0:0`, grpc.ServerCredentials.createInsecure());
-
+    const port: number = await new Promise<number>((resolve, reject) => {
+        server.bindAsync(`0.0.0.0:0`, grpc.ServerCredentials.createInsecure(), (err, p) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(p);
+            }
+        });
+    });
     server.start();
 
     // Emit the address so the monitor can read it to connect.  The gRPC server will keep the message loop alive.
diff --git a/sdk/nodejs/cmd/pulumi-language-nodejs/main.go b/sdk/nodejs/cmd/pulumi-language-nodejs/main.go
index e62884627..e237a3b32 100644
--- a/sdk/nodejs/cmd/pulumi-language-nodejs/main.go
+++ b/sdk/nodejs/cmd/pulumi-language-nodejs/main.go
@@ -45,13 +45,13 @@ import (
 	opentracing "github.com/opentracing/opentracing-go"
 
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	"github.com/pulumi/pulumi/sdk/go/common/version"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/version"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"google.golang.org/grpc"
 
 	"github.com/blang/semver"
diff --git a/sdk/nodejs/cmd/pulumi-language-nodejs/main_test.go b/sdk/nodejs/cmd/pulumi-language-nodejs/main_test.go
index 319ec1e83..d4e11c2db 100644
--- a/sdk/nodejs/cmd/pulumi-language-nodejs/main_test.go
+++ b/sdk/nodejs/cmd/pulumi-language-nodejs/main_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy.go b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy.go
index ab78b0db3..38240895c 100644
--- a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy.go
+++ b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy.go
@@ -24,8 +24,8 @@ import (
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 )
 
 // pipes is the platform agnostic abstraction over a pair of channels we can read and write binary
diff --git a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_unix.go b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_unix.go
index 16b9a60e2..5e6131891 100644
--- a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_unix.go
+++ b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_unix.go
@@ -23,8 +23,8 @@ import (
 	"path"
 	"syscall"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Unix specific pipe implementation. Fairly simple as it sits on top of a pair of standard fifo
diff --git a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_windows.go b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_windows.go
index eb1d090dc..ce8b0a536 100644
--- a/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_windows.go
+++ b/sdk/nodejs/cmd/pulumi-language-nodejs/proxy_windows.go
@@ -25,7 +25,7 @@ import (
 
 	winio "github.com/Microsoft/go-winio"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
 )
 
 // Windows specific pipe implementation. Slightly complex as it sits on top of a pair of named pipes
diff --git a/sdk/nodejs/invoke.ts b/sdk/nodejs/invoke.ts
index 2f2a6774a..c9655b915 100644
--- a/sdk/nodejs/invoke.ts
+++ b/sdk/nodejs/invoke.ts
@@ -36,8 +36,12 @@ export interface InvokeOptions {
     version?: string;
 
     /**
-     * Invoke this function asynchronously.  If 'true' is passed in here, then an invoked function
-     * will only supply the `Promise<>` side of its result.
+     * Invoke this data source function asynchronously.  Defaults to `true` if unspecified.
+     *
+     * When `true`, only the `Promise<>` side of the invoke result is present.  Explicitly pass in
+     * `false` to get the non-Promise side of the result.  Invoking data source functions
+     * synchronously is deprecated.  The ability to do this will be removed at a later point in
+     * time.
      */
     async?: boolean;
 }
diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json
index c515802f8..57e0999f9 100644
--- a/sdk/nodejs/package.json
+++ b/sdk/nodejs/package.json
@@ -10,9 +10,8 @@
     },
     "dependencies": {
         "@pulumi/query": "^0.3.0",
-        "deasync": "^0.1.15",
+        "@grpc/grpc-js": "^0.6.15",
         "google-protobuf": "^3.5.0",
-        "grpc": "1.24.2",
         "minimist": "^1.2.0",
         "normalize-package-data": "^2.4.0",
         "protobufjs": "^6.8.6",
@@ -25,7 +24,6 @@
         "upath": "^1.1.0"
     },
     "devDependencies": {
-        "@types/deasync": "^0.1.0",
         "@types/minimist": "^1.2.0",
         "@types/mocha": "^2.2.42",
         "@types/node": "^12.0.0",
@@ -34,13 +32,12 @@
         "@types/semver": "^5.5.0",
         "istanbul": "^0.4.5",
         "mocha": "^3.5.0",
-        "node-gyp": "^3.6.2",
         "tslint": "^5.11.0"
     },
     "pulumi": {
         "comment": "Do not remove. Marks this as as a deployment-time-only package"
     },
     "engines": {
-        "node": ">=8.0.0"
+        "node": ">=8.13.0 || >=10.10.0"
     }
 }
diff --git a/sdk/nodejs/proto/analyzer_grpc_pb.js b/sdk/nodejs/proto/analyzer_grpc_pb.js
index 88e13cacc..9f2bffa25 100644
--- a/sdk/nodejs/proto/analyzer_grpc_pb.js
+++ b/sdk/nodejs/proto/analyzer_grpc_pb.js
@@ -16,7 +16,7 @@
 // limitations under the License.
 //
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var analyzer_pb = require('./analyzer_pb.js');
 var plugin_pb = require('./plugin_pb.js');
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
diff --git a/sdk/nodejs/proto/engine_grpc_pb.js b/sdk/nodejs/proto/engine_grpc_pb.js
index 534d50b0b..c06270c56 100644
--- a/sdk/nodejs/proto/engine_grpc_pb.js
+++ b/sdk/nodejs/proto/engine_grpc_pb.js
@@ -16,7 +16,7 @@
 // limitations under the License.
 //
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var engine_pb = require('./engine_pb.js');
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
 
diff --git a/sdk/nodejs/proto/language_grpc_pb.js b/sdk/nodejs/proto/language_grpc_pb.js
index 9b15c310d..3a0676016 100644
--- a/sdk/nodejs/proto/language_grpc_pb.js
+++ b/sdk/nodejs/proto/language_grpc_pb.js
@@ -16,7 +16,7 @@
 // limitations under the License.
 //
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var language_pb = require('./language_pb.js');
 var plugin_pb = require('./plugin_pb.js');
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
diff --git a/sdk/nodejs/proto/provider_grpc_pb.js b/sdk/nodejs/proto/provider_grpc_pb.js
index cbbdba17c..c6d8be349 100644
--- a/sdk/nodejs/proto/provider_grpc_pb.js
+++ b/sdk/nodejs/proto/provider_grpc_pb.js
@@ -16,7 +16,7 @@
 // limitations under the License.
 //
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var provider_pb = require('./provider_pb.js');
 var plugin_pb = require('./plugin_pb.js');
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
diff --git a/sdk/nodejs/proto/resource_grpc_pb.js b/sdk/nodejs/proto/resource_grpc_pb.js
index de97c946d..72b285fde 100644
--- a/sdk/nodejs/proto/resource_grpc_pb.js
+++ b/sdk/nodejs/proto/resource_grpc_pb.js
@@ -16,7 +16,7 @@
 // limitations under the License.
 //
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var resource_pb = require('./resource_pb.js');
 var google_protobuf_empty_pb = require('google-protobuf/google/protobuf/empty_pb.js');
 var google_protobuf_struct_pb = require('google-protobuf/google/protobuf/struct_pb.js');
diff --git a/sdk/nodejs/runtime/invoke.ts b/sdk/nodejs/runtime/invoke.ts
index e9d363353..b16fb8f9b 100644
--- a/sdk/nodejs/runtime/invoke.ts
+++ b/sdk/nodejs/runtime/invoke.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import * as grpc from "@grpc/grpc-js";
 import * as fs from "fs";
-import * as grpc from "grpc";
 
 import { AsyncIterable } from "@pulumi/query/interfaces";
 
@@ -68,38 +68,7 @@ const providerproto = require("../proto/provider_pb.js");
  * synchronously.
  */
 export function invoke(tok: string, props: Inputs, opts: InvokeOptions = {}): Promise<any> {
-    if (opts.async) {
-        // User specifically requested async invoking.  Respect that.
-        return invokeAsync(tok, props, opts);
-    }
-
-    const config = new Config("pulumi");
-    const noSyncCalls = config.getBoolean("noSyncCalls");
-    if (noSyncCalls) {
-        // User globally disabled sync invokes.
-        return invokeAsync(tok, props, opts);
-    }
-
-    const syncResult = invokeSync(tok, props, opts);
-
-    // Wrap the synchronous value in a Promise view as well so that consumers can treat it
-    // either as the real value or something they can use as a Promise.
-    return createLiftedPromise(syncResult);
-}
-
-/**
- * Invokes the provided token *synchronously* no matter what.
- * @internal
- */
-export function invokeSync<T>(tok: string, props: Inputs, opts: InvokeOptions = {}): T {
-    const syncInvokes = tryGetSyncInvokes();
-    if (!syncInvokes) {
-        // We weren't launched from a pulumi CLI that supports sync-invokes.  Let the user know they
-        // should update and fall back to synchronously blocking on the async invoke.
-        return invokeFallbackToAsync<T>(tok, props, opts);
-    }
-
-    return invokeSyncWorker<T>(tok, props, opts, syncInvokes);
+    return invokeAsync(tok, props, opts);
 }
 
 export async function streamInvoke(
@@ -153,10 +122,6 @@ export async function streamInvoke(
     }
 }
 
-export function invokeFallbackToAsync<T>(tok: string, props: Inputs, opts: InvokeOptions): T {
-    return utils.promiseResult(invokeAsync(tok, props, opts));
-}
-
 async function invokeAsync(tok: string, props: Inputs, opts: InvokeOptions): Promise<any> {
     const label = `Invoking function: tok=${tok} asynchronously`;
     log.debug(label + (excessiveDebugOutput ? `, props=${JSON.stringify(props)}` : ``));
@@ -201,58 +166,6 @@ async function invokeAsync(tok: string, props: Inputs, opts: InvokeOptions): Pro
     }
 }
 
-function invokeSyncWorker<T>(tok: string, props: any, opts: InvokeOptions, syncInvokes: SyncInvokes): T {
-    const label = `Invoking function: tok=${tok} synchronously`;
-    log.debug(label + (excessiveDebugOutput ? `, props=${JSON.stringify(props)}` : ``));
-
-    const serialized = serializePropertiesSync(props);
-    log.debug(`Invoke RPC prepared: tok=${tok}` + excessiveDebugOutput ? `, obj=${JSON.stringify(serialized)}` : ``);
-
-    const providerRef = getProviderRefSync();
-    const req = createInvokeRequest(tok, serialized, providerRef, opts);
-
-    // Encode the request.
-    const reqBytes = Buffer.from(req.serializeBinary());
-
-    // Write the request length.
-    const reqLen = Buffer.alloc(4);
-    reqLen.writeUInt32BE(reqBytes.length, /*offset:*/ 0);
-    fs.writeSync(syncInvokes.requests, reqLen);
-    fs.writeSync(syncInvokes.requests, reqBytes);
-
-    // Read the response.
-    const respLenBytes = Buffer.alloc(4);
-    fs.readSync(syncInvokes.responses, respLenBytes, /*offset:*/ 0, /*length:*/ 4, /*position:*/ null);
-    const respLen = respLenBytes.readUInt32BE(/*offset:*/ 0);
-    const respBytes = Buffer.alloc(respLen);
-    fs.readSync(syncInvokes.responses, respBytes, /*offset:*/ 0, /*length:*/ respLen, /*position:*/ null);
-
-    // Decode the response.
-    const resp = providerproto.InvokeResponse.deserializeBinary(new Uint8Array(respBytes));
-    const resultValue = deserializeResponse(tok, resp);
-
-    return resultValue;
-
-    function getProviderRefSync() {
-        const provider = getProvider(tok, opts);
-
-        if (provider === undefined) {
-            return undefined;
-        }
-
-        if (provider.__registrationId === undefined) {
-            // Have to do an explicit console.log here as the call to utils.promiseResult may hang
-            // node, and that may prevent our normal logging calls from making it back to the user.
-            console.log(
-`Synchronous call made to "${tok}" with an unregistered provider. This is now deprecated and may cause the program to hang.
-For more details see: https://www.pulumi.com/docs/troubleshooting/#synchronous-call`);
-            utils.promiseResult(ProviderResource.register(provider));
-        }
-
-        return provider.__registrationId;
-    }
-}
-
 // StreamInvokeResponse represents a (potentially infinite) streaming response to `streamInvoke`,
 // with facilities to gracefully cancel and clean up the stream.
 export class StreamInvokeResponse<T> implements AsyncIterable<T> {
@@ -271,16 +184,6 @@ export class StreamInvokeResponse<T> implements AsyncIterable<T> {
     }
 }
 
-// Expose the properties of the actual result of invoke directly on the promise itself. Note this
-// doesn't actually involve any asynchrony.  The promise will be created synchronously and the
-// values copied to it can be used immediately.  We simply make a Promise so that any consumers that
-// do a `.then()` on it continue to work even though we've switched from being async to sync.
-function createLiftedPromise(value: any): Promise<any> {
-    const promise = Promise.resolve(value);
-    Object.assign(promise, value);
-    return promise;
-}
-
 function createInvokeRequest(tok: string, serialized: any, provider: string | undefined, opts: InvokeOptions) {
     if (provider !== undefined && typeof provider !== "string") {
         throw new Error("Incorrect provider type.");
@@ -301,57 +204,6 @@ function getProvider(tok: string, opts: InvokeOptions) {
            opts.parent ? opts.parent.getProvider(tok) : undefined;
 }
 
-function serializePropertiesSync(prop: any): any {
-    if (prop === undefined ||
-        prop === null ||
-        typeof prop === "boolean" ||
-        typeof prop === "number" ||
-        typeof prop === "string") {
-
-        return prop;
-    }
-
-    if (asset.Asset.isInstance(prop) || asset.Archive.isInstance(prop)) {
-        throw new Error("Assets and Archives cannot be passed in as arguments to a data source call.");
-    }
-
-    if (prop instanceof Promise) {
-        throw new Error("Promises cannot be passed in as arguments to a data source call.");
-    }
-
-    if (Output.isInstance(prop)) {
-        throw new Error("Outputs cannot be passed in as arguments to a data source call.");
-    }
-
-    if (Resource.isInstance(prop)) {
-        throw new Error("Resources cannot be passed in as arguments to a data source call.");
-    }
-
-    if (prop instanceof Array) {
-        const result: any[] = [];
-        for (let i = 0; i < prop.length; i++) {
-            // When serializing arrays, we serialize any undefined values as `null`. This matches JSON semantics.
-            const elem = serializePropertiesSync(prop[i]);
-            result.push(elem === undefined ? null : elem);
-        }
-        return result;
-    }
-
-    return serializeAllKeys(prop, {});
-
-    function serializeAllKeys(innerProp: any, obj: any) {
-        for (const k of Object.keys(innerProp)) {
-            // When serializing an object, we omit any keys with undefined values. This matches JSON semantics.
-            const v = serializePropertiesSync(innerProp[k]);
-            if (v !== undefined) {
-                obj[k] = v;
-            }
-        }
-
-        return obj;
-    }
-}
-
 function deserializeResponse(tok: string, resp: any): any {
     const failures: any = resp.getFailuresList();
     if (failures && failures.length) {
diff --git a/sdk/nodejs/runtime/resource.ts b/sdk/nodejs/runtime/resource.ts
index afb623462..3e9364c13 100644
--- a/sdk/nodejs/runtime/resource.ts
+++ b/sdk/nodejs/runtime/resource.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import * as grpc from "@grpc/grpc-js";
 import * as query from "@pulumi/query";
-import * as grpc from "grpc";
 import * as log from "../log";
 import * as utils from "../utils";
 
diff --git a/sdk/nodejs/runtime/settings.ts b/sdk/nodejs/runtime/settings.ts
index d179b2ce8..adc5ed739 100644
--- a/sdk/nodejs/runtime/settings.ts
+++ b/sdk/nodejs/runtime/settings.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import * as grpc from "@grpc/grpc-js";
 import * as fs from "fs";
-import * as grpc from "grpc";
 import * as path from "path";
 import { ComponentResource, URN } from "../resource";
 import { debuggablePromise } from "./debuggable";
diff --git a/sdk/nodejs/stackReference.ts b/sdk/nodejs/stackReference.ts
index 79713df84..b7beae4fa 100644
--- a/sdk/nodejs/stackReference.ts
+++ b/sdk/nodejs/stackReference.ts
@@ -14,8 +14,6 @@
 
 import { all, Input, Output, output } from "./output";
 import { CustomResource, CustomResourceOptions } from "./resource";
-import * as invoke from "./runtime/invoke";
-import { promiseResult } from "./utils";
 
 /**
  * Manages a reference to a Pulumi stack. The referenced stack's outputs are available via the
@@ -37,15 +35,6 @@ export class StackReference extends CustomResource {
      */
     public readonly secretOutputNames!: Output<string[]>;
 
-    // Values we stash to support the getOutputSync and requireOutputSync calls without
-    // having to go through the async values above.
-
-    private readonly stackReferenceName: Input<string>;
-    private syncOutputsSupported: boolean | undefined;
-    private syncName: string | undefined;
-    private syncOutputs: Record<string, any> | undefined;
-    private syncSecretOutputNames: string[] | undefined;
-
     /**
      * Create a StackReference resource with the given unique name, arguments, and options.
      *
@@ -65,8 +54,6 @@ export class StackReference extends CustomResource {
             outputs: undefined,
             secretOutputNames: undefined,
         }, { ...opts, id: stackReferenceName });
-
-        this.stackReferenceName = stackReferenceName;
     }
 
     /**
@@ -114,10 +101,10 @@ export class StackReference extends CustomResource {
      *
      * @param name The name of the stack output to fetch.
      */
-    public getOutputSync(name: string): any {
-        const [out, isSecret] = this.readOutputSync("getOutputSync", name, false /*required*/);
+    public async getOutputValue(name: string): Promise<any> {
+        const [out, isSecret] = await this.readOutputValue("getOutputValue", name, false /*required*/);
         if (isSecret) {
-            throw new Error("Cannot call 'getOutputSync' if the referenced stack output is a secret. Use 'getOutput' instead.");
+            throw new Error("Cannot call 'getOutputValue' if the referenced stack output is a secret. Use 'getOutput' instead.");
         }
         return out;
     }
@@ -130,79 +117,17 @@ export class StackReference extends CustomResource {
      *
      * @param name The name of the stack output to fetch.
      */
-    public requireOutputSync(name: string): any {
-        const [out, isSecret] = this.readOutputSync("requireOutputSync", name, true /*required*/);
+    public async requireOutputValue(name: string): Promise<any> {
+        const [out, isSecret] = await this.readOutputValue("requireOutputSync", name, true /*required*/);
         if (isSecret) {
-            throw new Error("Cannot call 'requireOutputSync' if the referenced stack output is a secret. Use 'requireOutput' instead.");
+            throw new Error("Cannot call 'requireOutputValue' if the referenced stack output is a secret. Use 'requireOutput' instead.");
         }
         return out;
     }
 
-    private readOutputSync(callerName: string, outputName: string, required: boolean): [any, boolean] {
-        const [stackName, outputs, secretNames, supported] = this.readOutputsSync("requireOutputSync");
-
-        // If the synchronous readStackOutputs call is supported by the engine, use its results.
-        if (supported) {
-            if (required && !outputs.hasOwnProperty(outputName)) {
-                throw new Error(`Required output '${outputName}' does not exist on stack '${stackName}'.`);
-            }
-
-            return [outputs[outputName], secretNames.includes(outputName)];
-        }
-
-        // Otherwise, fall back to promiseResult.
-        console.log(`StackReference.${callerName} may cause your program to hang. Please update to the latest version of the Pulumi CLI.
-For more details see: https://www.pulumi.com/docs/troubleshooting/#stackreference-sync`);
-
+    private async readOutputValue(callerName: string, outputName: string, required: boolean): Promise<[any, boolean]> {
         const out = required ? this.requireOutput(outputName) : this.getOutput(outputName);
-        return [promiseResult(out.promise()), promiseResult(out.isSecret)];
-    }
-
-    private readOutputsSync(callerName: string): [string, Record<string, any>, string[], boolean] {
-        // See if we already attempted to read in the outputs synchronously. If so, just use those values.
-        if (this.syncOutputs) {
-            return [this.syncName!, this.syncOutputs, this.syncSecretOutputNames!, this.syncOutputsSupported!];
-        }
-
-        // We need to pass along our StackReference name to the engine so it knows what results to
-        // return.  However, because we're doing this synchronously, we can only do this safely if
-        // the stack-reference name is synchronously known (i.e. it's a string and not a
-        // Promise/Output). If it is only asynchronously known, then warn the user and make an unsafe
-        // call to the deasync lib to get the name.
-        let stackName: string;
-        if (this.stackReferenceName instanceof Promise) {
-            // Have to do an explicit console.log here as the call to utils.promiseResult may hang
-            // node, and that may prevent our normal logging calls from making it back to the user.
-            console.log(
-                `Call made to StackReference.${callerName} with a StackReference with a Promise name. This is now deprecated and may cause the program to hang.
-For more details see: https://www.pulumi.com/docs/troubleshooting/#stackreference-sync`);
-
-            stackName = promiseResult(this.stackReferenceName);
-        }
-        else if (Output.isInstance(this.stackReferenceName)) {
-            console.log(
-                `Call made to StackReference.${callerName} with a StackReference with an Output name. This is now deprecated and may cause the program to hang.
-For more details see: https://www.pulumi.com/docs/troubleshooting/#stackreference-sync`);
-
-            stackName = promiseResult(this.stackReferenceName.promise());
-        }
-        else {
-            stackName = this.stackReferenceName;
-        }
-
-        try {
-            const res = invoke.invokeSync<ReadStackOutputsResult>(
-                "pulumi:pulumi:readStackOutputs", { name: stackName });
-            this.syncName = stackName;
-            this.syncOutputs = res.outputs;
-            this.syncSecretOutputNames = res.secretOutputNames;
-            this.syncOutputsSupported = true;
-        } catch {
-            this.syncOutputs = {};
-            this.syncOutputsSupported = false;
-        }
-
-        return [this.syncName!, this.syncOutputs, this.syncSecretOutputNames!, this.syncOutputsSupported];
+        return Promise.all([out.promise(), out.isSecret]);
     }
 }
 
diff --git a/sdk/nodejs/tests/deasync.spec.ts b/sdk/nodejs/tests/deasync.spec.ts
deleted file mode 100644
index 77209c599..000000000
--- a/sdk/nodejs/tests/deasync.spec.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2016-2018, 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.
-
-// tslint:disable
-
-import * as assert from "assert";
-import { asyncTest } from "./util";
-import { promiseResult } from "../utils";
-
-describe("deasync", () => {
-    it("handles simple promise", () => {
-        const actual = 4;
-        const promise = new Promise<number>((resolve) => {
-            resolve(actual);
-        });
-
-        const result = promiseResult(promise);
-        assert.equal(result, actual);
-    });
-
-    it("handles rejected promise", () => {
-        const message = "etc";
-        const promise = new Promise<number>((resolve, reject) => {
-            reject(new Error(message));
-        });
-
-        try {
-            const result = promiseResult(promise);
-            assert.fail("Should not be able to reach here 1.")
-        }
-        catch (err) {
-            assert.equal(err.message, message);
-            return;
-        }
-
-        assert.fail("Should not be able to reach here 2.")
-    });
-
-    it("handles pumping", () => {
-        const actual = 4;
-        const promise = new Promise<number>((resolve) => {
-            setTimeout(resolve, 500 /*ms*/, actual);
-        });
-
-        const result = promiseResult(promise);
-        assert.equal(result, actual);
-    });
-});
\ No newline at end of file
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/009.invoke/index.js b/sdk/nodejs/tests/runtime/langhost/cases/009.invoke/index.js
index 6e1438c26..873544ba9 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/009.invoke/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/009.invoke/index.js
@@ -11,21 +11,7 @@ let args = {
     urn: "some-urn",
 };
 
-let result1 = pulumi.runtime.invoke("invoke:index:echo", args);
-
-// When invoking synchronously: Ensure the properties come back synchronously and are present on the
-// result.
-for (const key in args) {
-    assert.deepEqual(result1[key], args[key]);
-}
-
-// When invoking synchronously: Ensure the properties are available asynchronously through normal
-// Promise semantics.
-result1.then(v => {
-    assert.deepEqual(v, args);
-});
-
-let result2 = pulumi.runtime.invoke("invoke:index:echo", args, { async: true });
+let result2 = pulumi.runtime.invoke("invoke:index:echo", args);
 
 // When invoking asynchronously: Ensure the properties are *not* present on the result.
 for (const key in args) {
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/044.versions/index.js b/sdk/nodejs/tests/runtime/langhost/cases/044.versions/index.js
index 685ddb10d..4da6aee82 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/044.versions/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/044.versions/index.js
@@ -10,13 +10,13 @@ new MyResource("testResource", "0.19.1");
 new MyResource("testResource2", "0.19.2");
 new MyResource("testResource3");
 
+pulumi.runtime.invoke("invoke:index:doit", {}, { version: "0.19.1" }, { async: false });
+pulumi.runtime.invoke("invoke:index:doit_v2", {}, { version: "0.19.2" }, { async: false });
+pulumi.runtime.invoke("invoke:index:doit_noversion", {}, { async: false });
+
 pulumi.runtime.invoke("invoke:index:doit", {}, { version: "0.19.1" });
 pulumi.runtime.invoke("invoke:index:doit_v2", {}, { version: "0.19.2" });
 pulumi.runtime.invoke("invoke:index:doit_noversion", {});
 
-pulumi.runtime.invoke("invoke:index:doit", {}, { version: "0.19.1" }, { async: true });
-pulumi.runtime.invoke("invoke:index:doit_v2", {}, { version: "0.19.2" }, { async: true });
-pulumi.runtime.invoke("invoke:index:doit_noversion", {}, { async: true });
-
 new pulumi.CustomResource("test:index:ReadResource", "foo", {}, { id: "readme", version: "0.20.0" });
 new pulumi.CustomResource("test:index:ReadResource", "foo_noversion", {}, { id: "readme" });
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/060.provider_invokes/index.js b/sdk/nodejs/tests/runtime/langhost/cases/060.provider_invokes/index.js
index 7947b1bab..c55950ca5 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/060.provider_invokes/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/060.provider_invokes/index.js
@@ -20,21 +20,7 @@ let args = {
     urn: "some-urn",
 };
 
-if (semver.lt(process.version, "12.11.0")) {
-	// These tests hang on runtimes later than 12.10.x due to their use of deasync.
-
-	let result1 = pulumi.runtime.invoke("test:index:echo", args, { provider });
-	for (const key in args) {
-		assert.deepEqual(result1[key], args[key]);
-	}
-
-	let result2 = pulumi.runtime.invoke("test:index:echo", args, { provider });
-	result2.then((v) => {
-		assert.deepEqual(v, args);
-	});
-}
-
-let result3 = pulumi.runtime.invoke("test:index:echo", args, { provider, async: true });
-result3.then((v) => {
-    assert.deepEqual(v, args);
+let result2 = pulumi.runtime.invoke("test:index:echo", args, { provider });
+result2.then((v) => {
+	assert.deepEqual(v, args);
 });
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/061.provider_in_parent_invokes/index.js b/sdk/nodejs/tests/runtime/langhost/cases/061.provider_in_parent_invokes/index.js
index 52a3ad1c0..5361c2f2f 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/061.provider_in_parent_invokes/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/061.provider_in_parent_invokes/index.js
@@ -27,21 +27,7 @@ let args = {
     urn: "some-urn",
 };
 
-if (semver.lt(process.version, "12.11.0")) {
-	// These tests hang on runtimes later than 12.10.x due to their use of deasync.
-
-	let result1 = pulumi.runtime.invoke("test:index:echo", args, { parent });
-	for (const key in args) {
-		assert.deepEqual(result1[key], args[key]);
-	}
-
-	let result2 = pulumi.runtime.invoke("test:index:echo", args, { parent });
-	result2.then((v) => {
-		assert.deepEqual(v, args);
-	});
-}
-
-let result3 = pulumi.runtime.invoke("test:index:echo", args, { parent, async: true });
-result3.then((v) => {
-    assert.deepEqual(v, args);
+let result2 = pulumi.runtime.invoke("test:index:echo", args, { parent });
+result2.then((v) => {
+	assert.deepEqual(v, args);
 });
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/062.providerref_invokes/index.js b/sdk/nodejs/tests/runtime/langhost/cases/062.providerref_invokes/index.js
index 1894fa352..aaefaa886 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/062.providerref_invokes/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/062.providerref_invokes/index.js
@@ -21,18 +21,13 @@ let pulumi = require("../../../../../");
         urn: "some-urn",
     };
 
-    let result1 = pulumi.runtime.invoke("test:index:echo", args, { provider });
+    let result1 = await pulumi.runtime.invoke("test:index:echo", args, { provider });
     for (const key in args) {
         assert.deepEqual(result1[key], args[key]);
     }
 
-    let result2 = pulumi.runtime.invoke("test:index:echo", args, { provider });
+    let result2 = pulumi.runtime.invoke("test:index:echo", args, { provider, async: false });
     result2.then((v) => {
         assert.deepEqual(v, args);
     });
-
-    let result3 = pulumi.runtime.invoke("test:index:echo", args, { provider, async: true });
-    result3.then((v) => {
-        assert.deepEqual(v, args);
-    });
 })();
\ No newline at end of file
diff --git a/sdk/nodejs/tests/runtime/langhost/cases/063.providerref_in_parent_invokes/index.js b/sdk/nodejs/tests/runtime/langhost/cases/063.providerref_in_parent_invokes/index.js
index 5a8469eb4..090a9c4b5 100644
--- a/sdk/nodejs/tests/runtime/langhost/cases/063.providerref_in_parent_invokes/index.js
+++ b/sdk/nodejs/tests/runtime/langhost/cases/063.providerref_in_parent_invokes/index.js
@@ -29,18 +29,13 @@ let pulumi = require("../../../../../");
         urn: "some-urn",
     };
 
-    let result1 = pulumi.runtime.invoke("test:index:echo", args, { parent });
+    let result1 = await pulumi.runtime.invoke("test:index:echo", args, { parent });
     for (const key in args) {
         assert.deepEqual(result1[key], args[key]);
     }
 
-    let result2 = pulumi.runtime.invoke("test:index:echo", args, { parent });
+    let result2 = pulumi.runtime.invoke("test:index:echo", args, { parent, async: false });
     result2.then((v) => {
         assert.deepEqual(v, args);
     });
-
-    let result3 = pulumi.runtime.invoke("test:index:echo", args, { parent, async: true });
-    result3.then((v) => {
-        assert.deepEqual(v, args);
-    });
 })();
\ No newline at end of file
diff --git a/sdk/nodejs/tests/runtime/langhost/run.spec.ts b/sdk/nodejs/tests/runtime/langhost/run.spec.ts
index 78760bb61..a60ec49af 100644
--- a/sdk/nodejs/tests/runtime/langhost/run.spec.ts
+++ b/sdk/nodejs/tests/runtime/langhost/run.spec.ts
@@ -19,11 +19,12 @@ import * as path from "path";
 import { ID, runtime, URN } from "../../../index";
 import { asyncTest } from "../../util";
 
+import * as grpc from "@grpc/grpc-js";
+
 const enginerpc = require("../../../proto/engine_grpc_pb.js");
 const engineproto = require("../../../proto/engine_pb.js");
 const gempty = require("google-protobuf/google/protobuf/empty_pb.js");
 const gstruct = require("google-protobuf/google/protobuf/struct_pb.js");
-const grpc = require("grpc");
 const langrpc = require("../../../proto/language_grpc_pb.js");
 const langproto = require("../../../proto/language_pb.js");
 const resrpc = require("../../../proto/resource_grpc_pb.js");
@@ -1154,7 +1155,7 @@ describe("rpc", () => {
                 let rootResource: string | undefined;
                 let regCnt = 0;
                 let logCnt = 0;
-                const monitor = createMockEngine(opts,
+                const monitor = await createMockEngineAsync(opts,
                     // Invoke callback
                     (call: any, callback: any) => {
                         const resp = new providerproto.InvokeResponse();
@@ -1331,20 +1332,12 @@ describe("rpc", () => {
                 }
 
                 // Finally, tear down everything so each test case starts anew.
+
                 await new Promise<void>((resolve, reject) => {
                     langHost.proc.kill();
                     langHost.proc.on("close", () => { resolve(); });
                 });
-                await new Promise<void>((resolve, reject) => {
-                    monitor.server.tryShutdown((err: Error) => {
-                        if (err) {
-                            reject(err);
-                        }
-                        else {
-                            resolve();
-                        }
-                    });
-                });
+                monitor.server.forceShutdown();
             }
         }));
     }
@@ -1435,7 +1428,7 @@ function mockRun(langHostClient: any, monitor: string, opts: RunCase, dryrun: bo
 
 // Despite the name, the "engine" RPC endpoint is only a logging endpoint. createMockEngine fires up a fake
 // logging server so tests can assert that certain things get logged.
-function createMockEngine(
+async function createMockEngineAsync(
     opts: RunCase,
     invokeCallback: (call: any, request: any) => any,
     readResourceCallback: (call: any, request: any) => any,
@@ -1444,7 +1437,7 @@ function createMockEngine(
     logCallback: (call: any, request: any) => any,
     getRootResourceCallback: (call: any, request: any) => any,
     setRootResourceCallback: (call: any, request: any) => any,
-    supportsFeatureCallback: (call: any, request: any) => any): { server: any, addr: string } {
+    supportsFeatureCallback: (call: any, request: any) => any) {
     // The resource monitor is hosted in the current process so it can record state, etc.
     const server = new grpc.Server();
     server.addService(resrpc.ResourceMonitorService, {
@@ -1456,7 +1449,7 @@ function createMockEngine(
         registerResourceOutputs: registerResourceOutputsCallback,
     });
 
-    let engineImpl: Object = {
+    let engineImpl: grpc.UntypedServiceImplementation = {
         log: logCallback,
     };
 
@@ -1469,8 +1462,19 @@ function createMockEngine(
     }
 
     server.addService(enginerpc.EngineService, engineImpl);
-    const port = server.bind("0.0.0.0:0", grpc.ServerCredentials.createInsecure());
+
+    const port = await new Promise<number>((resolve, reject) => {
+        server.bindAsync("0.0.0.0:0", grpc.ServerCredentials.createInsecure(), (err, p) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(p);
+            }
+        });
+    });
+
     server.start();
+
     return { server: server, addr: `0.0.0.0:${port}` };
 }
 
diff --git a/sdk/nodejs/tests/runtime/tsClosureCases.ts b/sdk/nodejs/tests/runtime/tsClosureCases.ts
index 45160a43e..1954adf71 100644
--- a/sdk/nodejs/tests/runtime/tsClosureCases.ts
+++ b/sdk/nodejs/tests/runtime/tsClosureCases.ts
@@ -5991,22 +5991,22 @@ return function () { typescript.parseCommandLine([""]); };
         });
     }
 
-    {
-        cases.push({
-            title: "Fail to capture non-deployment module due to native code",
-            func: function () { console.log(pulumi); },
-            error: `Error serializing function 'func': tsClosureCases.js(0,0)
+//     {
+//         cases.push({
+//             title: "Fail to capture non-deployment module due to native code",
+//             func: function () { console.log(pulumi); },
+//             error: `Error serializing function 'func': tsClosureCases.js(0,0)
 
-function 'func':(...)
-  module './bin/index.js' which indirectly referenced
-    function 'debug':(...)
-(...)
-Function code:
-  function (...)() { [native code] }
+// function 'func':(...)
+//   module './bin/index.js' which indirectly referenced
+//     function 'debug':(...)
+// (...)
+// Function code:
+//   function (...)() { [native code] }
 
-Module './bin/index.js' is a 'deployment only' module. In general these cannot be captured inside a 'run time' function.`
-        });
-    }
+// Module './bin/index.js' is a 'deployment only' module. In general these cannot be captured inside a 'run time' function.`
+//         });
+//     }
 
     {
        // Used just to validate that if we capture a Config object we see these values serialized over.
diff --git a/sdk/nodejs/tsconfig.json b/sdk/nodejs/tsconfig.json
index 89c76229c..efe41e41d 100644
--- a/sdk/nodejs/tsconfig.json
+++ b/sdk/nodejs/tsconfig.json
@@ -64,7 +64,6 @@
         "cmd/run-policy-pack/run.ts",
 
         "tests/config.spec.ts",
-        "tests/deasync.spec.ts",
         "tests/init.spec.ts",
         "tests/iterable.spec.ts",
         "tests/options.spec.ts",
diff --git a/sdk/nodejs/utils.ts b/sdk/nodejs/utils.ts
index 9987a04dd..3f37add78 100644
--- a/sdk/nodejs/utils.ts
+++ b/sdk/nodejs/utils.ts
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import * as deasync from "deasync";
-
 import { InvokeOptions } from "./invoke";
 
 /**
@@ -59,53 +57,3 @@ export function values(obj: object): any[] {
 export function union<T>(set1: Set<T>, set2: Set<T>) {
     return new Set([...set1, ...set2]);
 }
-
-/**
- * Synchronously blocks until the result of this promise is computed.  If the promise is rejected,
- * this will throw the error the promise was rejected with.  If this promise does not complete this
- * will block indefinitely.
- *
- * Be very careful with this function.  Only wait on a promise if you are certain it is safe to do
- * so.
- *
- * @internal
- */
-export function promiseResult<T>(promise: Promise<T>): T {
-    enum State {
-        running,
-        finishedSuccessfully,
-        finishedWithError,
-    }
-
-    let result: T;
-    let error = undefined;
-    let state = <State>State.running;
-
-    promise.then(
-        val => {
-            result = val;
-            state = State.finishedSuccessfully;
-        },
-        err => {
-            error = err;
-            state = State.finishedWithError;
-        });
-
-    deasync.loopWhile(() => state === State.running);
-    if (state === State.finishedWithError) {
-        throw error;
-    }
-
-    return result!;
-}
-
-/**
- * This is an advanced compat function for libraries and should not generally be used by normal
- * Pulumi application.
- *
- * @deprecated No longer supported. This function is now a no-op and will directly return the promise
- * passed into it.
- */
-export function liftProperties<T>(promise: Promise<T>, opts: InvokeOptions = {}): Promise<T> & T {
-    return <any>promise;
-}
diff --git a/sdk/proto/generate.sh b/sdk/proto/generate.sh
index ed45384a5..b916cd285 100755
--- a/sdk/proto/generate.sh
+++ b/sdk/proto/generate.sh
@@ -60,6 +60,7 @@ $DOCKER_RUN /bin/bash -c 'set -x && JS_PULUMIRPC=/nodejs/proto && \
     protoc --js_out=$JS_PROTOFLAGS:$JS_PULUMIRPC --grpc_out=minimum_node_version=6:$JS_PULUMIRPC --plugin=protoc-gen-grpc=/usr/bin/grpc_tools_node_protoc_plugin status.proto && \
     protoc --js_out=$JS_PROTOFLAGS:$TEMP_DIR --grpc_out=minimum_node_version=6:$TEMP_DIR --plugin=protoc-gen-grpc=/usr/bin/grpc_tools_node_protoc_plugin $JS_HACK_PROTOS && \
     sed -i "s/^var global = .*;/var proto = { pulumirpc: {} }, global = proto;/" "$TEMP_DIR"/*.js && \
+    sed -i "s/^var grpc = require(.*);/var grpc = require('\''@grpc\/grpc-js'\'');/" "$TEMP_DIR"/*.js && \
     cp "$TEMP_DIR"/*.js "$JS_PULUMIRPC"'
 
 function on_exit() {
diff --git a/sdk/python/Makefile b/sdk/python/Makefile
index 63045f581..02b82d7e1 100644
--- a/sdk/python/Makefile
+++ b/sdk/python/Makefile
@@ -1,7 +1,7 @@
 PROJECT_NAME     := Pulumi Python SDK
-LANGHOST_PKG     := github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python
+LANGHOST_PKG     := github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python
 VERSION          := $(shell ../../scripts/get-version HEAD)
-PYPI_VERSION 	 := $(shell ../../scripts/get-py-version HEAD)
+PYPI_VERSION     := $(shell ../../scripts/get-py-version HEAD)
 
 PYENV := ./env
 PYENVSRC := $(PYENV)/src
@@ -19,7 +19,7 @@ build_package::
 	cd $(PYENVSRC) && pipenv run python setup.py build bdist_wheel --universal
 
 build_plugin::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 build:: build_package build_plugin
 
@@ -34,7 +34,7 @@ install_package::
 
 install_plugin::
 	GOBIN=$(PULUMI_BIN) go install \
-		  -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+		  -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 
 install:: install_package install_plugin
 
@@ -45,7 +45,7 @@ test_fast::
 test_all:: test_fast
 
 dist::
-	go install -ldflags "-X github.com/pulumi/pulumi/sdk/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
+	go install -ldflags "-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=${VERSION}" ${LANGHOST_PKG}
 	cp ./cmd/pulumi-language-python-exec "$$(go env GOPATH)"/bin/
 	cp ./dist/pulumi-resource-pulumi-python "$$(go env GOPATH)"/bin/
 	cp ./dist/pulumi-analyzer-policy-python "$$(go env GOPATH)"/bin/
diff --git a/sdk/python/cmd/pulumi-language-python/main.go b/sdk/python/cmd/pulumi-language-python/main.go
index 6800baaf8..2c2228869 100644
--- a/sdk/python/cmd/pulumi-language-python/main.go
+++ b/sdk/python/cmd/pulumi-language-python/main.go
@@ -36,12 +36,12 @@ import (
 
 	pbempty "github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
-	"github.com/pulumi/pulumi/sdk/go/common/util/cmdutil"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/util/logging"
-	"github.com/pulumi/pulumi/sdk/go/common/util/rpcutil"
-	"github.com/pulumi/pulumi/sdk/go/common/version"
-	pulumirpc "github.com/pulumi/pulumi/sdk/proto/go"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/rpcutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/version"
+	pulumirpc "github.com/pulumi/pulumi/sdk/v2/proto/go"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/containers/containers_test.go b/tests/containers/containers_test.go
index 7c0f43af9..1686df656 100644
--- a/tests/containers/containers_test.go
+++ b/tests/containers/containers_test.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
 )
 
 // TestPulumiDockerImage simulates building and running Pulumi programs on the pulumi/pulumi Docker image.
diff --git a/tests/examples/examples_test.go b/tests/examples/examples_test.go
index 881cb027c..f57e63ac6 100644
--- a/tests/examples/examples_test.go
+++ b/tests/examples/examples_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
 )
 
 func TestAccMinimal(t *testing.T) {
diff --git a/tests/go.mod b/tests/go.mod
index ae503cf87..4b1f771c7 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -4,15 +4,17 @@ go 1.13
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
-	github.com/pulumi/pulumi/pkg => ../pkg
-	github.com/pulumi/pulumi/sdk => ../sdk
+	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.5.0
+	github.com/pulumi/pulumi/pkg/v2 => ../pkg
+	github.com/pulumi/pulumi/sdk/v2 => ../sdk
 	gocloud.dev => github.com/pulumi/go-cloud v0.18.1-0.20191119155701-6a8381d0793f
 )
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/pkg v0.0.0-00010101000000-000000000000
-	github.com/pulumi/pulumi/sdk v0.0.0-20200321193742-f095e64d0f8e
+	github.com/pulumi/pulumi/pkg/v2 v2.0.0-beta.2
+	github.com/pulumi/pulumi/sdk/v2 v2.0.0-beta.2
 	github.com/stretchr/testify v1.5.1
 )
diff --git a/tests/go.sum b/tests/go.sum
index 6b88d52a8..50a0b6d74 100644
--- a/tests/go.sum
+++ b/tests/go.sum
@@ -84,8 +84,6 @@ github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jB
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/Sirupsen/logrus v1.0.5 h1:447dy9LxSj+Iaa2uN3yoFHOzU9yJcJYiQPtNz8OXtv0=
-github.com/Sirupsen/logrus v1.0.5/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
@@ -151,6 +149,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
@@ -205,6 +204,7 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
@@ -276,8 +276,6 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd h1:anPrsicrIi2ColgWTVPk+TrN42hJIWlfPHSBP9S0ZkM=
 github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84=
@@ -316,6 +314,7 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LE
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
@@ -323,12 +322,14 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 h1:HfxbT6/JcvIljmERptWhwa8XzP7H3T+Z2N26gTsaDaA=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
 github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -354,12 +355,6 @@ github.com/mxschmitt/golang-combinations v1.0.0/go.mod h1:RbMhWvfCelHR6WROvT2bVf
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
@@ -398,6 +393,7 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -407,6 +403,8 @@ github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJV
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -512,7 +510,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -550,7 +547,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -561,6 +557,7 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -571,7 +568,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -660,6 +656,7 @@ google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dT
 google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
 google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
@@ -688,21 +685,16 @@ google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 gopkg.in/AlecAivazis/survey.v1 v1.8.8 h1:5UtTowJZTz1j7NxVzDGKTz6Lm9IWm8DDF6b7a2wq9VY=
 gopkg.in/AlecAivazis/survey.v1 v1.8.8/go.mod h1:CaHjv79TCgAvXMSFJSVgonHXYWxnhzI3eoHtnX5UgUo=
-gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
 gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -712,8 +704,6 @@ gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOA
 gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
 gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/tests/history_test.go b/tests/history_test.go
index 84cca3412..8ae5244ba 100755
--- a/tests/history_test.go
+++ b/tests/history_test.go
@@ -16,10 +16,9 @@ package tests
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
 	"github.com/stretchr/testify/assert"
-
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
 )
 
 // deleteIfNotFailed deletes the files in the testing environment if the testcase has
@@ -73,7 +72,7 @@ func TestHistoryCommand(t *testing.T) {
 		e.RunCommand("yarn", "install")
 		e.RunCommand("yarn", "link", "@pulumi/pulumi")
 		// Update the history-test stack.
-		e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview", "-m", "this is an updated stack")
+		e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview", "-m", "this is an updated stack")
 		// Confirm we see the update message in thie history output.
 		out, err := e.RunCommand("pulumi", "history")
 		assert.Equal(t, "", err)
diff --git a/tests/integration/aliases/aliases_test.go b/tests/integration/aliases/aliases_test.go
index a6a974166..8f1067ffb 100644
--- a/tests/integration/aliases/aliases_test.go
+++ b/tests/integration/aliases/aliases_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 var dirs = []string{
@@ -88,7 +88,7 @@ func TestGoAliases(t *testing.T) {
 			integration.ProgramTest(t, &integration.ProgramTestOptions{
 				Dir: filepath.Join(d, "step1"),
 				Dependencies: []string{
-					"github.com/pulumi/pulumi/sdk",
+					"github.com/pulumi/pulumi/sdk/v2",
 				},
 				Quick: true,
 				EditDirs: []integration.EditDir{
diff --git a/tests/integration/aliases/go/adopt_into_component/step1/main.go b/tests/integration/aliases/go/adopt_into_component/step1/main.go
index 6936a04d1..9f5972ee5 100644
--- a/tests/integration/aliases/go/adopt_into_component/step1/main.go
+++ b/tests/integration/aliases/go/adopt_into_component/step1/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // FooComponent is a component resource
diff --git a/tests/integration/aliases/go/adopt_into_component/step2/main.go b/tests/integration/aliases/go/adopt_into_component/step2/main.go
index 5f205c98a..dcfb48f3f 100644
--- a/tests/integration/aliases/go/adopt_into_component/step2/main.go
+++ b/tests/integration/aliases/go/adopt_into_component/step2/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // FooComponent is a component resource
diff --git a/tests/integration/aliases/go/rename/step1/main.go b/tests/integration/aliases/go/rename/step1/main.go
index 20f1b7b8a..4e7567398 100644
--- a/tests/integration/aliases/go/rename/step1/main.go
+++ b/tests/integration/aliases/go/rename/step1/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // FooComponent is a component resource
diff --git a/tests/integration/aliases/go/rename/step2/main.go b/tests/integration/aliases/go/rename/step2/main.go
index fcc6b15ac..1d4984e84 100644
--- a/tests/integration/aliases/go/rename/step2/main.go
+++ b/tests/integration/aliases/go/rename/step2/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // FooComponent is a component resource
diff --git a/tests/integration/aliases/go/rename_component/step1/main.go b/tests/integration/aliases/go/rename_component/step1/main.go
index 2466821ad..7a3995898 100644
--- a/tests/integration/aliases/go/rename_component/step1/main.go
+++ b/tests/integration/aliases/go/rename_component/step1/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 // FooComponent is a component resource
diff --git a/tests/integration/aliases/go/rename_component/step2/main.go b/tests/integration/aliases/go/rename_component/step2/main.go
index 636881921..6e01f66b1 100644
--- a/tests/integration/aliases/go/rename_component/step2/main.go
+++ b/tests/integration/aliases/go/rename_component/step2/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type FooResource struct {
diff --git a/tests/integration/aliases/go/rename_component_and_child/step1/main.go b/tests/integration/aliases/go/rename_component_and_child/step1/main.go
index c66eaa5b5..40a6c1e8e 100644
--- a/tests/integration/aliases/go/rename_component_and_child/step1/main.go
+++ b/tests/integration/aliases/go/rename_component_and_child/step1/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type FooResource struct {
diff --git a/tests/integration/aliases/go/rename_component_and_child/step2/main.go b/tests/integration/aliases/go/rename_component_and_child/step2/main.go
index 81fa4312c..c4b11793a 100644
--- a/tests/integration/aliases/go/rename_component_and_child/step2/main.go
+++ b/tests/integration/aliases/go/rename_component_and_child/step2/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type FooResource struct {
diff --git a/tests/integration/aliases/go/retype_component/step1/main.go b/tests/integration/aliases/go/retype_component/step1/main.go
index ebe6a06f3..4c0419c5e 100644
--- a/tests/integration/aliases/go/retype_component/step1/main.go
+++ b/tests/integration/aliases/go/retype_component/step1/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type FooResource struct {
diff --git a/tests/integration/aliases/go/retype_component/step2/main.go b/tests/integration/aliases/go/retype_component/step2/main.go
index 60f060d91..c305de900 100644
--- a/tests/integration/aliases/go/retype_component/step2/main.go
+++ b/tests/integration/aliases/go/retype_component/step2/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 type FooResource struct {
diff --git a/tests/integration/config_basic/go/main.go b/tests/integration/config_basic/go/main.go
index 798d22a19..c08ecfcfc 100644
--- a/tests/integration/config_basic/go/main.go
+++ b/tests/integration/config_basic/go/main.go
@@ -5,8 +5,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
 )
 
 func main() {
diff --git a/tests/integration/custom_timeouts/custom_timeouts_test.go b/tests/integration/custom_timeouts/custom_timeouts_test.go
index 20b9bb254..ef351afcd 100644
--- a/tests/integration/custom_timeouts/custom_timeouts_test.go
+++ b/tests/integration/custom_timeouts/custom_timeouts_test.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 func TestCustomTimeouts(t *testing.T) {
diff --git a/tests/integration/delete_before_create/delete_before_create_test.go b/tests/integration/delete_before_create/delete_before_create_test.go
index 96469c433..0da163595 100644
--- a/tests/integration/delete_before_create/delete_before_create_test.go
+++ b/tests/integration/delete_before_create/delete_before_create_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // TestDeleteBeforeCreate tests a few different operational modes for
diff --git a/tests/integration/dependency_steps/dependency_steps_test.go b/tests/integration/dependency_steps/dependency_steps_test.go
index 3795658d7..d0453960e 100644
--- a/tests/integration/dependency_steps/dependency_steps_test.go
+++ b/tests/integration/dependency_steps/dependency_steps_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // TestDependencySteps tests a case where the dependency graph between two
diff --git a/tests/integration/double_pending_delete/double_pending_delete_test.go b/tests/integration/double_pending_delete/double_pending_delete_test.go
index da9a4754c..3aacc341a 100644
--- a/tests/integration/double_pending_delete/double_pending_delete_test.go
+++ b/tests/integration/double_pending_delete/double_pending_delete_test.go
@@ -5,9 +5,9 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/integration/duplicate_urns/duplicate_urns_test.go b/tests/integration/duplicate_urns/duplicate_urns_test.go
index 36ba3388f..1ceb1da48 100644
--- a/tests/integration/duplicate_urns/duplicate_urns_test.go
+++ b/tests/integration/duplicate_urns/duplicate_urns_test.go
@@ -17,7 +17,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine does not tolerate duplicate URNs in the same plan.
diff --git a/tests/integration/empty/go/main.go b/tests/integration/empty/go/main.go
index 2c9eb9065..0b45e1d28 100644
--- a/tests/integration/empty/go/main.go
+++ b/tests/integration/empty/go/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 func main() {
diff --git a/tests/integration/empty/gorun/main.go b/tests/integration/empty/gorun/main.go
index 2c9eb9065..0b45e1d28 100644
--- a/tests/integration/empty/gorun/main.go
+++ b/tests/integration/empty/gorun/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 func main() {
diff --git a/tests/integration/empty/gorun_main/gorun_main_src/main.go b/tests/integration/empty/gorun_main/gorun_main_src/main.go
index 2c9eb9065..0b45e1d28 100644
--- a/tests/integration/empty/gorun_main/gorun_main_src/main.go
+++ b/tests/integration/empty/gorun_main/gorun_main_src/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
 func main() {
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index 3881ed81f..214b404b0 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -12,17 +12,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/secrets/cloud"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/secrets/cloud"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/resource/config"
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
 )
 
 const WindowsOS = "windows"
@@ -82,7 +81,7 @@ func TestEmptyGo(t *testing.T) {
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Dir: filepath.Join("empty", "go"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi/sdk",
+			"github.com/pulumi/pulumi/sdk/v2",
 		},
 		Quick: true,
 	})
@@ -93,7 +92,7 @@ func TestEmptyGoRun(t *testing.T) {
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Dir: filepath.Join("empty", "gorun"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi/sdk",
+			"github.com/pulumi/pulumi/sdk/v2",
 		},
 		Quick: true,
 	})
@@ -104,7 +103,7 @@ func TestEmptyGoRunMain(t *testing.T) {
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Dir: filepath.Join("empty", "gorun_main"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi/sdk",
+			"github.com/pulumi/pulumi/sdk/v2",
 		},
 		Quick: true,
 	})
@@ -189,7 +188,7 @@ func TestProjectMain(t *testing.T) {
 		e.ImportDirectory("project_main_abs")
 		e.RunCommand("pulumi", "login", "--cloud-url", e.LocalURL())
 		e.RunCommand("pulumi", "stack", "init", "main-abs")
-		stdout, stderr := e.RunCommandExpectError("pulumi", "up", "--non-interactive", "--skip-preview")
+		stdout, stderr := e.RunCommandExpectError("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 		assert.Equal(t, "Updating (main-abs):\n \n", stdout)
 		assert.Contains(t, stderr, "project 'main' must be a relative path")
 		e.RunCommand("pulumi", "stack", "rm", "--yes")
@@ -205,7 +204,7 @@ func TestProjectMain(t *testing.T) {
 		e.ImportDirectory("project_main_parent")
 		e.RunCommand("pulumi", "login", "--cloud-url", e.LocalURL())
 		e.RunCommand("pulumi", "stack", "init", "main-parent")
-		stdout, stderr := e.RunCommandExpectError("pulumi", "up", "--non-interactive", "--skip-preview")
+		stdout, stderr := e.RunCommandExpectError("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 		assert.Equal(t, "Updating (main-parent):\n \n", stdout)
 		assert.Contains(t, stderr, "project 'main' must be a subfolder")
 		e.RunCommand("pulumi", "stack", "rm", "--yes")
@@ -287,7 +286,7 @@ func TestRemoveWithResourcesBlocked(t *testing.T) {
 	e.ImportDirectory("single_resource")
 	e.RunCommand("pulumi", "stack", "init", stackName)
 	e.RunCommand("yarn", "link", "@pulumi/pulumi")
-	e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview")
+	e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 	_, stderr := e.RunCommandExpectError("pulumi", "stack", "rm", "--yes")
 	assert.Contains(t, stderr, "--force")
 	e.RunCommand("pulumi", "destroy", "--skip-preview", "--non-interactive", "--yes")
@@ -375,7 +374,7 @@ func TestStackOutputsJSON(t *testing.T) {
 	e.RunCommand("yarn", "link", "@pulumi/pulumi")
 	e.RunCommand("pulumi", "login", "--cloud-url", e.LocalURL())
 	e.RunCommand("pulumi", "stack", "init", "stack-outs")
-	e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview")
+	e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 	stdout, _ := e.RunCommand("pulumi", "stack", "output", "--json")
 	assert.Equal(t, `{
   "foo": 42,
@@ -995,7 +994,7 @@ func TestConfigBasicGo(t *testing.T) {
 	integration.ProgramTest(t, &integration.ProgramTestOptions{
 		Dir: filepath.Join("config_basic", "go"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi/sdk",
+			"github.com/pulumi/pulumi/sdk/v2",
 		},
 		Quick: true,
 		Config: map[string]string{
@@ -1270,7 +1269,7 @@ func TestStackReferenceGo(t *testing.T) {
 	opts := &integration.ProgramTestOptions{
 		Dir: filepath.Join("stack_reference", "go"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi/sdk",
+			"github.com/pulumi/pulumi/sdk/v2",
 		},
 		Quick: true,
 		Config: map[string]string{
diff --git a/tests/integration/partial_state/partial_state_test.go b/tests/integration/partial_state/partial_state_test.go
index 8520eb839..8cb69f965 100644
--- a/tests/integration/partial_state/partial_state_test.go
+++ b/tests/integration/partial_state/partial_state_test.go
@@ -5,9 +5,9 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/integration/policy/policy_test.go b/tests/integration/policy/policy_test.go
index f4227fa88..03c983e06 100644
--- a/tests/integration/policy/policy_test.go
+++ b/tests/integration/policy/policy_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
 )
 
 // TestPolicyWithConfig runs integration tests against the policy pack in the policy_pack_w_config
diff --git a/tests/integration/protect_resources/protect_test.go b/tests/integration/protect_resources/protect_test.go
index a95533d2b..6d8828ac8 100644
--- a/tests/integration/protect_resources/protect_test.go
+++ b/tests/integration/protect_resources/protect_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 // TestProtectedResources tests some interesting operations on protected resources.
diff --git a/tests/integration/query/query_test.go b/tests/integration/query/query_test.go
index 36c3ff463..ad68cbf0f 100644
--- a/tests/integration/query/query_test.go
+++ b/tests/integration/query/query_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // TestQuery creates a stack and runs a query over the stack's resource ouptputs.
diff --git a/tests/integration/read/import_acquire/import_acquire_test.go b/tests/integration/read/import_acquire/import_acquire_test.go
index c70e08121..ee006ab36 100644
--- a/tests/integration/read/import_acquire/import_acquire_test.go
+++ b/tests/integration/read/import_acquire/import_acquire_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine is capable of assuming control of a resource that was external.
diff --git a/tests/integration/read/read_dbr/read_dbr_test.go b/tests/integration/read/read_dbr/read_dbr_test.go
index 262d21806..b16405fc5 100644
--- a/tests/integration/read/read_dbr/read_dbr_test.go
+++ b/tests/integration/read/read_dbr/read_dbr_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine tolerates two deletions of the same URN in the same plan.
diff --git a/tests/integration/read/read_relinquish/read_relinquish_test.go b/tests/integration/read/read_relinquish/read_relinquish_test.go
index 621e36b11..26d7f948a 100644
--- a/tests/integration/read/read_relinquish/read_relinquish_test.go
+++ b/tests/integration/read/read_relinquish/read_relinquish_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine is capable of relinquishing control of a resource without deleting it.
diff --git a/tests/integration/read/read_replace/read_dbr_test.go b/tests/integration/read/read_replace/read_dbr_test.go
index d0cbad4d1..2897804a9 100644
--- a/tests/integration/read/read_replace/read_dbr_test.go
+++ b/tests/integration/read/read_replace/read_dbr_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine handles the replacement of an external resource with a
diff --git a/tests/integration/recreate_resource_check/resource_recreate_check_test.go b/tests/integration/recreate_resource_check/resource_recreate_check_test.go
index 5effcdbd8..5c72c17ea 100644
--- a/tests/integration/recreate_resource_check/resource_recreate_check_test.go
+++ b/tests/integration/recreate_resource_check/resource_recreate_check_test.go
@@ -5,7 +5,7 @@ package ints
 import (
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
 )
 
 // Test that the engine does not consider old inputs when calling Check during re-creation of
diff --git a/tests/integration/stack_reference/go/main.go b/tests/integration/stack_reference/go/main.go
index bf694c0e8..44c9afaf1 100644
--- a/tests/integration/stack_reference/go/main.go
+++ b/tests/integration/stack_reference/go/main.go
@@ -5,8 +5,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
 )
 
 func main() {
diff --git a/tests/integration/stack_reference/go/step1/main.go b/tests/integration/stack_reference/go/step1/main.go
index c4cf55d1d..90b3184b2 100644
--- a/tests/integration/stack_reference/go/step1/main.go
+++ b/tests/integration/stack_reference/go/step1/main.go
@@ -5,8 +5,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
 )
 
 func main() {
diff --git a/tests/integration/stack_reference/go/step2/main.go b/tests/integration/stack_reference/go/step2/main.go
index 3e45a4c40..0abcd3eff 100644
--- a/tests/integration/stack_reference/go/step2/main.go
+++ b/tests/integration/stack_reference/go/step2/main.go
@@ -5,8 +5,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/pulumi/pulumi/sdk/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
 )
 
 // Tests that the stack export that included secrets in step1 is read into a secret output.
diff --git a/tests/integration/steps/steps_test.go b/tests/integration/steps/steps_test.go
index 77b46821c..14eb7c146 100644
--- a/tests/integration/steps/steps_test.go
+++ b/tests/integration/steps/steps_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/resource/deploy/providers"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
+	"github.com/pulumi/pulumi/pkg/v2/resource/deploy/providers"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
 )
 
 func validateResources(t *testing.T, resources []apitype.ResourceV3, expectedNames ...string) {
diff --git a/tests/integration/targets/targets_test.go b/tests/integration/targets/targets_test.go
index cedfb04a5..c603330fc 100644
--- a/tests/integration/targets/targets_test.go
+++ b/tests/integration/targets/targets_test.go
@@ -8,11 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
-	"github.com/pulumi/pulumi/sdk/go/common/util/fsutil"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil"
 )
 
 func TestUntargetedCreateDuringTargetedUpdate(t *testing.T) {
@@ -44,7 +43,7 @@ func TestUntargetedCreateDuringTargetedUpdate(t *testing.T) {
 	}
 
 	e.RunCommand("pulumi", "up", "--target", strings.TrimSpace(urn), "--non-interactive", "--skip-preview", "--yes")
-	e.RunCommand("pulumi", "refresh")
+	e.RunCommand("pulumi", "refresh", "--non-interactive", "--yes")
 
 	e.RunCommand("pulumi", "destroy", "--skip-preview", "--non-interactive", "--yes")
 	e.RunCommand("pulumi", "stack", "rm", "--yes")
diff --git a/tests/integration/transformations/transformations_test.go b/tests/integration/transformations/transformations_test.go
index e6f80de91..821ff173f 100644
--- a/tests/integration/transformations/transformations_test.go
+++ b/tests/integration/transformations/transformations_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/tokens"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/tokens"
 )
 
 var dirs = []string{
diff --git a/tests/main_test.go b/tests/main_test.go
index 11d658fd1..76d412793 100644
--- a/tests/main_test.go
+++ b/tests/main_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
 )
 
 func TestMain(m *testing.M) {
diff --git a/tests/stack_test.go b/tests/stack_test.go
index 3dff627b6..eff3389a8 100644
--- a/tests/stack_test.go
+++ b/tests/stack_test.go
@@ -28,16 +28,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pulumi/pulumi/pkg/backend/filestate"
-	"github.com/pulumi/pulumi/pkg/resource/stack"
-	"github.com/pulumi/pulumi/pkg/testing/integration"
-	"github.com/pulumi/pulumi/sdk/go/common/apitype"
-	"github.com/pulumi/pulumi/sdk/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/go/common/util/contract"
-	"github.com/pulumi/pulumi/sdk/go/common/workspace"
+	"github.com/pulumi/pulumi/pkg/v2/backend/filestate"
+	"github.com/pulumi/pulumi/pkg/v2/resource/stack"
+	"github.com/pulumi/pulumi/pkg/v2/testing/integration"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/apitype"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+	ptesting "github.com/pulumi/pulumi/sdk/v2/go/common/testing"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
+	"github.com/pulumi/pulumi/sdk/v2/go/common/workspace"
 	"github.com/stretchr/testify/assert"
-
-	ptesting "github.com/pulumi/pulumi/sdk/go/common/testing"
 )
 
 func TestStackCommands(t *testing.T) {
@@ -219,7 +218,7 @@ func TestStackCommands(t *testing.T) {
 		e.RunCommand("pulumi", "stack", "init", stackName)
 		e.RunCommand("yarn", "install")
 		e.RunCommand("yarn", "link", "@pulumi/pulumi")
-		e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview")
+		e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 		// We're going to futz with the stack a little so that one of the resources we just created
 		// becomes invalid.
 		stackFile := path.Join(e.RootPath, "stack.json")
@@ -264,7 +263,7 @@ func TestStackCommands(t *testing.T) {
 		_, stderr := e.RunCommand("pulumi", "stack", "import", "--file", "stack.json")
 		assert.Contains(t, stderr, fmt.Sprintf("removing pending operation 'deleting' on '%s'", res.URN))
 		// The engine should be happy now that there are no invalid resources.
-		e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview")
+		e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 		e.RunCommand("pulumi", "stack", "rm", "--yes", "--force")
 	})
 }
@@ -308,7 +307,7 @@ func TestStackBackups(t *testing.T) {
 
 		// Now run pulumi up.
 		before := time.Now().UnixNano()
-		e.RunCommand("pulumi", "up", "--non-interactive", "--skip-preview")
+		e.RunCommand("pulumi", "up", "--non-interactive", "--yes", "--skip-preview")
 		after := time.Now().UnixNano()
 
 		// Verify the backup directory contains a single backup.
@@ -324,7 +323,7 @@ func TestStackBackups(t *testing.T) {
 
 		// Now run pulumi destroy.
 		before = time.Now().UnixNano()
-		e.RunCommand("pulumi", "destroy", "--non-interactive", "--skip-preview")
+		e.RunCommand("pulumi", "destroy", "--non-interactive", "--yes", "--skip-preview")
 		after = time.Now().UnixNano()
 
 		// Verify the backup directory has been updated with 1 additional backups.