maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[breaking] Changing the version of go.mod in sdk / pkg to be v3

Browse source
This commit is contained in:
pulumi-bot 2021-03-17 13:20:05 +00:00 committed by stack72
parent 11c2ae3bd2
commit 73a66f48ea
615 changed files with 9494 additions and 3226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/run-codegen-test.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
env: env:
GOPROXY: "https://proxy.golang.org" GOPROXY: "https://proxy.golang.org"
with: with:
replacements: github.com/pulumi/pulumi/pkg/v2=pulumi/pkg,github.com/pulumi/pulumi/sdk/v2=pulumi/sdk replacements: github.com/pulumi/pulumi/pkg/v3=pulumi/pkg,github.com/pulumi/pulumi/sdk/v3=pulumi/sdk
downstream-name: pulumi-${{ matrix.provider }} downstream-name: pulumi-${{ matrix.provider }}
downstream-url: https://github.com/pulumi/pulumi-${{ matrix.provider }} downstream-url: https://github.com/pulumi/pulumi-${{ matrix.provider }}
pulumi-bot-token: ${{ secrets.PULUMI_BOT_TOKEN }} pulumi-bot-token: ${{ secrets.PULUMI_BOT_TOKEN }}

14
.goreleaser.prerelease.yml
View file

@ -13,10 +13,8 @@ blobs:
- pulumi-windows - pulumi-windows
provider: s3 provider: s3
region: us-west-2 region: us-west-2
changelog:
skip: true
release: release:
disable: true prerelease: auto
builds: builds:
# UNIX builds # UNIX builds
- id: pulumi-unix - id: pulumi-unix
@ -29,7 +27,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./cmd/pulumi main: ./cmd/pulumi
- id: pulumi-language-nodejs-unix - id: pulumi-language-nodejs-unix
binary: pulumi-language-nodejs binary: pulumi-language-nodejs
@ -41,7 +39,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./nodejs/cmd/pulumi-language-nodejs main: ./nodejs/cmd/pulumi-language-nodejs
- id: pulumi-language-python-unix - id: pulumi-language-python-unix
binary: pulumi-language-python binary: pulumi-language-python
@ -53,7 +51,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./python/cmd/pulumi-language-python main: ./python/cmd/pulumi-language-python
- id: pulumi-language-dotnet-unix - id: pulumi-language-dotnet-unix
binary: pulumi-language-dotnet binary: pulumi-language-dotnet
@ -65,7 +63,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./dotnet/cmd/pulumi-language-dotnet main: ./dotnet/cmd/pulumi-language-dotnet
- id: pulumi-language-go-unix - id: pulumi-language-go-unix
binary: pulumi-language-go binary: pulumi-language-go
@ -77,7 +75,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./go/pulumi-language-go main: ./go/pulumi-language-go

10
.goreleaser.yml
View file

@ -24,7 +24,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./cmd/pulumi main: ./cmd/pulumi
- id: pulumi-language-nodejs-unix - id: pulumi-language-nodejs-unix
binary: pulumi-language-nodejs binary: pulumi-language-nodejs
@ -36,7 +36,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./nodejs/cmd/pulumi-language-nodejs main: ./nodejs/cmd/pulumi-language-nodejs
- id: pulumi-language-python-unix - id: pulumi-language-python-unix
binary: pulumi-language-python binary: pulumi-language-python
@ -48,7 +48,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./python/cmd/pulumi-language-python main: ./python/cmd/pulumi-language-python
- id: pulumi-language-dotnet-unix - id: pulumi-language-dotnet-unix
binary: pulumi-language-dotnet binary: pulumi-language-dotnet
@ -60,7 +60,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./dotnet/cmd/pulumi-language-dotnet main: ./dotnet/cmd/pulumi-language-dotnet
- id: pulumi-language-go-unix - id: pulumi-language-go-unix
binary: pulumi-language-go binary: pulumi-language-go
@ -72,7 +72,7 @@ builds:
- linux - linux
- darwin - darwin
ldflags: ldflags:
- -X github.com/pulumi/pulumi/pkg/v2/version.Version={{.Tag}} - -X github.com/pulumi/pulumi/pkg/v3/version.Version={{.Tag}}
main: ./go/pulumi-language-go main: ./go/pulumi-language-go

12
Makefile
View file

@ -3,7 +3,7 @@ SUB_PROJECTS := sdk/dotnet sdk/nodejs sdk/python sdk/go
include build/common.mk include build/common.mk
PROJECT := github.com/pulumi/pulumi/pkg/v2/cmd/pulumi PROJECT := github.com/pulumi/pulumi/pkg/v3/cmd/pulumi
PROJECT_PKGS := $(shell cd ./pkg && go list ./... | grep -v /vendor/) PROJECT_PKGS := $(shell cd ./pkg && go list ./... | grep -v /vendor/)
TESTS_PKGS := $(shell cd ./tests && go list ./... | grep -v tests/templates | grep -v /vendor/) TESTS_PKGS := $(shell cd ./tests && go list ./... | grep -v tests/templates | grep -v /vendor/)
VERSION := $(shell pulumictl get version) VERSION := $(shell pulumictl get version)
@ -26,23 +26,23 @@ generate::
cd pkg && go generate ./codegen/docs/gen.go cd pkg && go generate ./codegen/docs/gen.go
build:: generate build:: generate
cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT} cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}
build_debug:: generate build_debug:: generate
cd pkg && go install -gcflags="all=-N -l" -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT} cd pkg && go install -gcflags="all=-N -l" -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}
install:: generate install:: generate
cd pkg && GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT} cd pkg && GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}
install_all:: install install_all:: install
dist:: build dist:: build
cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${VERSION}" ${PROJECT} cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}
# NOTE: the brew target intentionally avoids the dependency on `build`, as it does not require the language SDKs. # NOTE: the brew target intentionally avoids the dependency on `build`, as it does not require the language SDKs.
brew:: BREW_VERSION := $(shell scripts/get-version HEAD) brew:: BREW_VERSION := $(shell scripts/get-version HEAD)
brew:: brew::
cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v2/version.Version=${BREW_VERSION}" ${PROJECT} cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${BREW_VERSION}" ${PROJECT}
lint:: lint::
for DIR in "pkg" "sdk" "tests" ; do \ for DIR in "pkg" "sdk" "tests" ; do \

18
build.proj
View file

@ -65,7 +65,7 @@
</PropertyGroup> </PropertyGroup>
<Exec Command="dotnet build dotnet.sln /p:Version=$(Version)" <Exec Command="dotnet build dotnet.sln /p:Version=$(Version)"
WorkingDirectory="$(DotNetSdkDirectory)" /> WorkingDirectory="$(DotNetSdkDirectory)" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/dotnet/cmd/pulumi-language-dotnet"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
</Target> </Target>
@ -74,7 +74,7 @@
<Exec Command="pulumictl get version --language dotnet" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version --language dotnet" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/dotnet/cmd/pulumi-language-dotnet" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/dotnet/cmd/pulumi-language-dotnet"
EnvironmentVariables="GOBIN=$(PulumiBin)" EnvironmentVariables="GOBIN=$(PulumiBin)"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
@ -98,7 +98,7 @@
<Exec Command="pulumictl get version" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/go/pulumi-language-go"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
</Target> </Target>
@ -107,7 +107,7 @@
<Exec Command="pulumictl get version" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/go/pulumi-language-go" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/go/pulumi-language-go"
EnvironmentVariables="GOBIN=$(PulumiBin)" EnvironmentVariables="GOBIN=$(PulumiBin)"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
@ -143,7 +143,7 @@
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(NodeSdkTestDataFiles)" <Copy SourceFiles="@(NodeSdkTestDataFiles)"
DestinationFolder="$(NodeJSSdkDirectory)\bin\tests\runtime\langhost\cases" /> DestinationFolder="$(NodeJSSdkDirectory)\bin\tests\runtime\langhost\cases" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/nodejs/cmd/pulumi-language-nodejs" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/nodejs/cmd/pulumi-language-nodejs"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
</Target> </Target>
@ -157,7 +157,7 @@
<Exec Command="pulumictl get version --language javascript" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version --language javascript" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/nodejs/cmd/pulumi-language-nodejs" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/nodejs/cmd/pulumi-language-nodejs"
EnvironmentVariables="GOBIN=$(PulumiBin)" EnvironmentVariables="GOBIN=$(PulumiBin)"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
@ -217,7 +217,7 @@
DestinationFolder="$(PythonSdkDirectory)\env\src" /> DestinationFolder="$(PythonSdkDirectory)\env\src" />
<Exec Command="pipenv run python setup.py build bdist_wheel --universal" <Exec Command="pipenv run python setup.py build bdist_wheel --universal"
WorkingDirectory="$(PythonSdkDirectory)\env\src" /> WorkingDirectory="$(PythonSdkDirectory)\env\src" />
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/python/cmd/pulumi-language-python"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
</Target> </Target>
@ -236,7 +236,7 @@
<Exec Command="pulumictl get version" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v2/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v2/python/cmd/pulumi-language-python" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=$(Version)&quot; github.com/pulumi/pulumi/sdk/v3/python/cmd/pulumi-language-python"
EnvironmentVariables="GOBIN=$(PulumiBin)" EnvironmentVariables="GOBIN=$(PulumiBin)"
WorkingDirectory="$(SdkDirectory)"/> WorkingDirectory="$(SdkDirectory)"/>
@ -247,7 +247,7 @@
<Exec Command="pulumictl get version" ConsoleToMSBuild="true"> <Exec Command="pulumictl get version" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="Version" /> <Output TaskParameter="ConsoleOutput" PropertyName="Version" />
</Exec> </Exec>
<Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/v2/version.Version=v$(Version)&quot; github.com/pulumi/pulumi/pkg/v2/cmd/pulumi" <Exec Command="go install -ldflags &quot;-X github.com/pulumi/pulumi/pkg/v3/version.Version=v$(Version)&quot; github.com/pulumi/pulumi/pkg/v3/cmd/pulumi"
EnvironmentVariables="GOBIN=$(PulumiBin)" EnvironmentVariables="GOBIN=$(PulumiBin)"
WorkingDirectory="$(PkgDirectory)"/> WorkingDirectory="$(PkgDirectory)"/>

16
pkg/backend/apply.go
View file

@ -25,14 +25,14 @@ import (
survey "gopkg.in/AlecAivazis/survey.v1" survey "gopkg.in/AlecAivazis/survey.v1"
surveycore "gopkg.in/AlecAivazis/survey.v1/core" surveycore "gopkg.in/AlecAivazis/survey.v1/core"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// ApplierOptions is a bag of configuration settings for an Applier. // ApplierOptions is a bag of configuration settings for an Applier.

28
pkg/backend/backend.go
View file

@ -22,20 +22,20 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/util/cancel" "github.com/pulumi/pulumi/pkg/v3/util/cancel"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
var ( var (

6
pkg/backend/backend_test.go
View file

@ -20,9 +20,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
) )
func TestGetStackResourceOutputs(t *testing.T) { func TestGetStackResourceOutputs(t *testing.T) {

8
pkg/backend/display/detailedDiff.go
View file

@ -1,10 +1,10 @@
package display package display
import ( import (
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// getProperty fetches the child property with the indicated key from the given property value. If the key does not // getProperty fetches the child property with the indicated key from the given property value. If the key does not

6
pkg/backend/display/detailedDiff_test.go
View file

@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
) )
func TestTranslateDetailedDiff(t *testing.T) { func TestTranslateDetailedDiff(t *testing.T) {

16
pkg/backend/display/diff.go
View file

@ -25,14 +25,14 @@ import (
"github.com/dustin/go-humanize/english" "github.com/dustin/go-humanize/english"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// ShowDiffEvents displays the engine events with the diff view. // ShowDiffEvents displays the engine events with the diff view.

14
pkg/backend/display/display.go
View file

@ -21,13 +21,13 @@ import (
"os" "os"
"time" "time"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
) )
// ShowEvents reads events from the `events` channel until it is closed, displaying each event as // ShowEvents reads events from the `events` channel until it is closed, displaying each event as

12
pkg/backend/display/events.go
View file

@ -3,12 +3,12 @@ package display
import ( import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// ConvertEngineEvent converts a raw engine.Event into an apitype.EngineEvent used in the Pulumi // ConvertEngineEvent converts a raw engine.Event into an apitype.EngineEvent used in the Pulumi

20
pkg/backend/display/json.go
View file

@ -19,16 +19,16 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
) )
// massagePropertyValue takes a property value and strips out the secrets annotations from it. If showSecrets is // massagePropertyValue takes a property value and strips out the secrets annotations from it. If showSecrets is

2
pkg/backend/display/jsonmessage.go
View file

@ -24,7 +24,7 @@ import (
gotty "github.com/ijc/Gotty" gotty "github.com/ijc/Gotty"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
/* Satisfied by gotty.TermInfo as well as noTermInfo from below */ /* Satisfied by gotty.TermInfo as well as noTermInfo from below */

2
pkg/backend/display/options.go
View file

@ -17,7 +17,7 @@ package display
import ( import (
"io" "io"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
) )
// Type of output to display. // Type of output to display.

18
pkg/backend/display/progress.go
View file

@ -30,15 +30,15 @@ import (
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// Progress describes a message we want to show in the display. There are two types of messages, // Progress describes a message we want to show in the display. There are two types of messages,

8
pkg/backend/display/query.go
View file

@ -20,10 +20,10 @@ import (
"os" "os"
"time" "time"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// ShowQueryEvents displays query events on the CLI. // ShowQueryEvents displays query events on the CLI.

12
pkg/backend/display/rows.go
View file

@ -22,12 +22,12 @@ import (
"strings" "strings"
"github.com/dustin/go-humanize/english" "github.com/dustin/go-humanize/english"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
) )
type Row interface { type Row interface {

4
pkg/backend/display/tableutil.go
View file

@ -18,8 +18,8 @@ import (
"strings" "strings"
"unicode/utf8" "unicode/utf8"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
func columnHeader(msg string) string { func columnHeader(msg string) string {

6
pkg/backend/display/watch.go
View file

@ -22,9 +22,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// We use RFC 5424 timestamps with millisecond precision for displaying time stamps on watch // We use RFC 5424 timestamps with millisecond precision for displaying time stamps on watch

38
pkg/backend/filestate/backend.go
View file

@ -37,25 +37,25 @@ import (
_ "gocloud.dev/blob/s3blob" // driver for s3:// _ "gocloud.dev/blob/s3blob" // driver for s3://
"gocloud.dev/gcerrors" "gocloud.dev/gcerrors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/edit" "github.com/pulumi/pulumi/pkg/v3/resource/edit"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/util/validation" "github.com/pulumi/pulumi/pkg/v3/util/validation"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/encoding" "github.com/pulumi/pulumi/sdk/v3/go/common/encoding"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// Backend extends the base backend interface with specific information about local backends. // Backend extends the base backend interface with specific information about local backends.

6
pkg/backend/filestate/backend_test.go
View file

@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
user "github.com/tweekmonster/luser" user "github.com/tweekmonster/luser"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
) )
func TestMassageBlobPath(t *testing.T) { func TestMassageBlobPath(t *testing.T) {

2
pkg/backend/filestate/bucket.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"gocloud.dev/blob" "gocloud.dev/blob"
) )

12
pkg/backend/filestate/lock.go
View file

@ -25,12 +25,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/fsutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// PulumiFilestateLockingEnvVar is an env var that must be truthy to enable locking when using a filestate backend. // PulumiFilestateLockingEnvVar is an env var that must be truthy to enable locking when using a filestate backend.

6
pkg/backend/filestate/snapshot.go
View file

@ -15,9 +15,9 @@
package filestate package filestate
import ( import (
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
) )
// localSnapshotManager is a simple SnapshotManager implementation that persists snapshots // localSnapshotManager is a simple SnapshotManager implementation that persists snapshots

14
pkg/backend/filestate/stack.go
View file

@ -18,14 +18,14 @@ import (
"context" "context"
"time" "time"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// Stack is a local stack. This simply adds some local-specific properties atop the standard backend stack interface. // Stack is a local stack. This simply adds some local-specific properties atop the standard backend stack interface.

30
pkg/backend/filestate/state.go
View file

@ -24,27 +24,27 @@ import (
"strings" "strings"
"time" "time"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/retry" "github.com/pulumi/pulumi/sdk/v3/go/common/util/retry"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pkg/errors" "github.com/pkg/errors"
"gocloud.dev/blob" "gocloud.dev/blob"
"gocloud.dev/gcerrors" "gocloud.dev/gcerrors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/encoding" "github.com/pulumi/pulumi/sdk/v3/go/common/encoding"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/fsutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/fsutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
const DisableCheckpointBackupsEnvVar = "PULUMI_DISABLE_CHECKPOINT_BACKUPS" const DisableCheckpointBackupsEnvVar = "PULUMI_DISABLE_CHECKPOINT_BACKUPS"

40
pkg/backend/httpstate/backend.go
View file

@ -34,26 +34,26 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/skratchdot/open-golang/open" "github.com/skratchdot/open-golang/open"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/filestate" "github.com/pulumi/pulumi/pkg/v3/backend/filestate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/retry" "github.com/pulumi/pulumi/sdk/v3/go/common/util/retry"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
const ( const (

14
pkg/backend/httpstate/client/api.go
View file

@ -27,18 +27,18 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/google/go-querystring/query" "github.com/google/go-querystring/query"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/util/tracing" "github.com/pulumi/pulumi/pkg/v3/util/tracing"
"github.com/pulumi/pulumi/pkg/v2/version" "github.com/pulumi/pulumi/pkg/v3/version"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/httputil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
) )
const ( const (

20
pkg/backend/httpstate/client/client.go
View file

@ -25,20 +25,20 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/util/validation" "github.com/pulumi/pulumi/pkg/v3/util/validation"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// Client provides a slim wrapper around the Pulumi HTTP/REST API. // Client provides a slim wrapper around the Pulumi HTTP/REST API.

26
pkg/backend/httpstate/policypack.go
View file

@ -13,19 +13,19 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
resourceanalyzer "github.com/pulumi/pulumi/pkg/v2/resource/analyzer" resourceanalyzer "github.com/pulumi/pulumi/pkg/v3/resource/analyzer"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/archive" "github.com/pulumi/pulumi/sdk/v3/go/common/util/archive"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/pulumi/pulumi/sdk/v2/nodejs/npm" "github.com/pulumi/pulumi/sdk/v3/nodejs/npm"
"github.com/pulumi/pulumi/sdk/v2/python" "github.com/pulumi/pulumi/sdk/v3/python"
) )
type cloudRequiredPolicy struct { type cloudRequiredPolicy struct {

10
pkg/backend/httpstate/snapshot.go
View file

@ -18,11 +18,11 @@ import (
"context" "context"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
) )
// cloudSnapshotPersister persists snapshots to the Pulumi service. // cloudSnapshotPersister persists snapshots to the Pulumi service.

18
pkg/backend/httpstate/stack.go
View file

@ -19,15 +19,15 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// Stack is a cloud stack. This simply adds some cloud-specific properties atop the standard backend stack interface. // Stack is a cloud stack. This simply adds some cloud-specific properties atop the standard backend stack interface.

24
pkg/backend/httpstate/state.go
View file

@ -20,20 +20,20 @@ import (
"sync" "sync"
"time" "time"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
type tokenRequest chan<- tokenResponse type tokenRequest chan<- tokenResponse

16
pkg/backend/mock.go
View file

@ -17,14 +17,14 @@ package backend
import ( import (
"context" "context"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// //

6
pkg/backend/policypack.go
View file

@ -18,9 +18,9 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// PublishOperation publishes a PolicyPack to the backend. // PublishOperation publishes a PolicyPack to the backend.

6
pkg/backend/query.go
View file

@ -5,9 +5,9 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
type MakeQuery func(context.Context, QueryOperation) (engine.QueryInfo, error) type MakeQuery func(context.Context, QueryOperation) (engine.QueryInfo, error)

14
pkg/backend/snapshot.go
View file

@ -21,13 +21,13 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/version" "github.com/pulumi/pulumi/pkg/v3/version"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
) )
// SnapshotPersister is an interface implemented by our backends that implements snapshot // SnapshotPersister is an interface implemented by our backends that implements snapshot

18
pkg/backend/snapshot_test.go
View file

@ -20,15 +20,15 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/secrets/b64" "github.com/pulumi/pulumi/pkg/v3/secrets/b64"
"github.com/pulumi/pulumi/pkg/v2/version" "github.com/pulumi/pulumi/pkg/v3/version"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
) )
type MockRegisterResourceEvent struct { type MockRegisterResourceEvent struct {

20
pkg/backend/stack.go
View file

@ -21,16 +21,16 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/gitutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/gitutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// Stack is used to manage stacks of resources against a pluggable backend. // Stack is used to manage stacks of resources against a pluggable backend.

4
pkg/backend/state/stacks.go
View file

@ -17,8 +17,8 @@ package state
import ( import (
"context" "context"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// CurrentStack reads the current stack and returns an instance connected to its backend provider. // CurrentStack reads the current stack and returns an instance connected to its backend provider.

6
pkg/backend/updates.go
View file

@ -15,9 +15,9 @@
package backend package backend
import ( import (
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
) )
// UpdateMetadata describes optional metadata about an update. // UpdateMetadata describes optional metadata about an update.

12
pkg/backend/watch.go
View file

@ -24,12 +24,12 @@ import (
"github.com/rjeczalik/notify" "github.com/rjeczalik/notify"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// Watch watches the project's working directory for changes and automatically updates the active // Watch watches the project's working directory for changes and automatically updates the active

2
pkg/backend/watch_darwin_arm64.go
View file

@ -18,7 +18,7 @@ import (
"context" "context"
"errors" "errors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
func Watch(ctx context.Context, b Backend, stack Stack, op UpdateOperation, apply Applier) result.Result { func Watch(ctx context.Context, b Backend, stack Stack, op UpdateOperation, apply Applier) result.Result {

10
pkg/cmd/pulumi/cancel.go
View file

@ -17,14 +17,14 @@ package main
import ( import (
"fmt" "fmt"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newCancelCmd() *cobra.Command { func newCancelCmd() *cobra.Command {

14
pkg/cmd/pulumi/config.go
View file

@ -28,13 +28,13 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newConfigCmd() *cobra.Command { func newConfigCmd() *cobra.Command {

6
pkg/cmd/pulumi/config_test.go
View file

@ -19,9 +19,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func TestPrettyKeyForProject(t *testing.T) { func TestPrettyKeyForProject(t *testing.T) {

10
pkg/cmd/pulumi/console.go
View file

@ -20,11 +20,11 @@ import (
"github.com/skratchdot/open-golang/open" "github.com/skratchdot/open-golang/open"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newConsoleCmd() *cobra.Command { func newConsoleCmd() *cobra.Command {

14
pkg/cmd/pulumi/crypto.go
View file

@ -19,13 +19,13 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/filestate" "github.com/pulumi/pulumi/pkg/v3/backend/filestate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase" "github.com/pulumi/pulumi/pkg/v3/secrets/passphrase"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
) )
func getStackEncrypter(s backend.Stack) (config.Encrypter, error) { func getStackEncrypter(s backend.Stack) (config.Encrypter, error) {

10
pkg/cmd/pulumi/crypto_cloud.go
View file

@ -17,11 +17,11 @@ package main
import ( import (
"encoding/base64" "encoding/base64"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/secrets/cloud" "github.com/pulumi/pulumi/pkg/v3/secrets/cloud"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newCloudSecretsManager(stackName tokens.QName, configFile, secretsProvider string) (secrets.Manager, error) { func newCloudSecretsManager(stackName tokens.QName, configFile, secretsProvider string) (secrets.Manager, error) {

12
pkg/cmd/pulumi/crypto_http.go
View file

@ -15,12 +15,12 @@
package main package main
import ( import (
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/secrets/service" "github.com/pulumi/pulumi/pkg/v3/secrets/service"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newServiceSecretsManager(s httpstate.Stack, stackName tokens.QName, configFile string) (secrets.Manager, error) { func newServiceSecretsManager(s httpstate.Stack, stackName tokens.QName, configFile string) (secrets.Manager, error) {

4
pkg/cmd/pulumi/crypto_http_test.go
View file

@ -3,8 +3,8 @@ package main
import ( import (
"testing" "testing"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

16
pkg/cmd/pulumi/crypto_local.go
View file

@ -24,14 +24,14 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/secrets" "github.com/pulumi/pulumi/pkg/v3/secrets"
"github.com/pulumi/pulumi/pkg/v2/secrets/passphrase" "github.com/pulumi/pulumi/pkg/v3/secrets/passphrase"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func readPassphrase(prompt string) (phrase string, interactive bool, err error) { func readPassphrase(prompt string) (phrase string, interactive bool, err error) {

12
pkg/cmd/pulumi/destroy.go
View file

@ -21,12 +21,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
func newDestroyCmd() *cobra.Command { func newDestroyCmd() *cobra.Command {

12
pkg/cmd/pulumi/errors.go
View file

@ -6,12 +6,12 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// PrintEngineResult optionally provides a place for the CLI to provide human-friendly error // PrintEngineResult optionally provides a place for the CLI to provide human-friendly error

2
pkg/cmd/pulumi/gen_completion.go
View file

@ -22,7 +22,7 @@ import (
"io" "io"
"os" "os"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
// newCompletionCmd returns a new command that, when run, generates a bash or zsh completion script for the CLI. // newCompletionCmd returns a new command that, when run, generates a bash or zsh completion script for the CLI.

2
pkg/cmd/pulumi/gen_markdown.go
View file

@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/cobra/doc" "github.com/spf13/cobra/doc"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
// Used to replace the `## <command>` line in generated markdown files. // Used to replace the `## <command>` line in generated markdown files.

6
pkg/cmd/pulumi/history.go
View file

@ -18,9 +18,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
// TO-DO: Remove as part of Pulumi v3.0.0 // TO-DO: Remove as part of Pulumi v3.0.0

36
pkg/cmd/pulumi/import.go
View file

@ -28,24 +28,24 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/codegen/dotnet" "github.com/pulumi/pulumi/pkg/v3/codegen/dotnet"
gogen "github.com/pulumi/pulumi/pkg/v2/codegen/go" gogen "github.com/pulumi/pulumi/pkg/v3/codegen/go"
"github.com/pulumi/pulumi/pkg/v2/codegen/hcl2" "github.com/pulumi/pulumi/pkg/v3/codegen/hcl2"
"github.com/pulumi/pulumi/pkg/v2/codegen/importer" "github.com/pulumi/pulumi/pkg/v3/codegen/importer"
"github.com/pulumi/pulumi/pkg/v2/codegen/nodejs" "github.com/pulumi/pulumi/pkg/v3/codegen/nodejs"
"github.com/pulumi/pulumi/pkg/v2/codegen/python" "github.com/pulumi/pulumi/pkg/v3/codegen/python"
"github.com/pulumi/pulumi/pkg/v2/codegen/schema" "github.com/pulumi/pulumi/pkg/v3/codegen/schema"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
func parseResourceSpec(spec string) (string, resource.URN, error) { func parseResourceSpec(spec string) (string, resource.URN, error) {

12
pkg/cmd/pulumi/login.go
View file

@ -23,12 +23,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/filestate" "github.com/pulumi/pulumi/pkg/v3/backend/filestate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newLoginCmd() *cobra.Command { func newLoginCmd() *cobra.Command {

10
pkg/cmd/pulumi/logout.go
View file

@ -18,11 +18,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/filestate" "github.com/pulumi/pulumi/pkg/v3/backend/filestate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newLogoutCmd() *cobra.Command { func newLogoutCmd() *cobra.Command {

8
pkg/cmd/pulumi/logs.go
View file

@ -23,10 +23,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/operations" "github.com/pulumi/pulumi/pkg/v3/operations"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
// We use RFC 5424 timestamps with millisecond precision for displaying time stamps on log entries. Go does not // We use RFC 5424 timestamps with millisecond precision for displaying time stamps on log entries. Go does not

4
pkg/cmd/pulumi/main.go
View file

@ -20,8 +20,8 @@ import (
"runtime" "runtime"
"runtime/debug" "runtime/debug"
"github.com/pulumi/pulumi/pkg/v2/version" "github.com/pulumi/pulumi/pkg/v3/version"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
func panicHandler() { func panicHandler() {

34
pkg/cmd/pulumi/new.go
View file

@ -31,23 +31,23 @@ import (
survey "gopkg.in/AlecAivazis/survey.v1" survey "gopkg.in/AlecAivazis/survey.v1"
surveycore "gopkg.in/AlecAivazis/survey.v1/core" surveycore "gopkg.in/AlecAivazis/survey.v1/core"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/executable" "github.com/pulumi/pulumi/sdk/v3/go/common/util/executable"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/goversion" "github.com/pulumi/pulumi/sdk/v3/go/common/util/goversion"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/pulumi/pulumi/sdk/v2/nodejs/npm" "github.com/pulumi/pulumi/sdk/v3/nodejs/npm"
"github.com/pulumi/pulumi/sdk/v2/python" "github.com/pulumi/pulumi/sdk/v3/python"
) )
type promptForValueFunc func(yes bool, valueType string, defaultValue string, secret bool, type promptForValueFunc func(yes bool, valueType string, defaultValue string, secret bool,

8
pkg/cmd/pulumi/new_test.go
View file

@ -23,10 +23,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

10
pkg/cmd/pulumi/plugin.go
View file

@ -17,11 +17,11 @@ package main
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newPluginCmd() *cobra.Command { func newPluginCmd() *cobra.Command {

10
pkg/cmd/pulumi/plugin_install.go
View file

@ -19,16 +19,16 @@ import (
"io" "io"
"os" "os"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newPluginInstallCmd() *cobra.Command { func newPluginInstallCmd() *cobra.Command {

4
pkg/cmd/pulumi/plugin_ls.go
View file

@ -22,8 +22,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newPluginLsCmd() *cobra.Command { func newPluginLsCmd() *cobra.Command {

10
pkg/cmd/pulumi/plugin_rm.go
View file

@ -16,17 +16,17 @@ package main
import ( import (
"fmt" "fmt"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newPluginRmCmd() *cobra.Command { func newPluginRmCmd() *cobra.Command {

2
pkg/cmd/pulumi/policy.go
View file

@ -15,7 +15,7 @@
package main package main
import ( import (
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

4
pkg/cmd/pulumi/policy_disable.go
View file

@ -15,8 +15,8 @@
package main package main
import ( import (
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

8
pkg/cmd/pulumi/policy_enable.go
View file

@ -17,10 +17,10 @@ package main
import ( import (
"encoding/json" "encoding/json"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
resourceanalyzer "github.com/pulumi/pulumi/pkg/v2/resource/analyzer" resourceanalyzer "github.com/pulumi/pulumi/pkg/v3/resource/analyzer"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

6
pkg/cmd/pulumi/policy_group_ls.go
View file

@ -18,9 +18,9 @@ import (
"context" "context"
"strconv" "strconv"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

6
pkg/cmd/pulumi/policy_ls.go
View file

@ -19,9 +19,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

12
pkg/cmd/pulumi/policy_new.go
View file

@ -21,12 +21,12 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/pulumi/pulumi/sdk/v2/python" "github.com/pulumi/pulumi/sdk/v3/python"
"github.com/spf13/cobra" "github.com/spf13/cobra"
survey "gopkg.in/AlecAivazis/survey.v1" survey "gopkg.in/AlecAivazis/survey.v1"
surveycore "gopkg.in/AlecAivazis/survey.v1/core" surveycore "gopkg.in/AlecAivazis/survey.v1/core"

14
pkg/cmd/pulumi/policy_publish.go
View file

@ -19,13 +19,13 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

8
pkg/cmd/pulumi/policy_rm.go
View file

@ -16,10 +16,10 @@ package main
import ( import (
"fmt" "fmt"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

4
pkg/cmd/pulumi/policy_validate.go
View file

@ -18,8 +18,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

12
pkg/cmd/pulumi/preview.go
View file

@ -18,12 +18,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
func newPreviewCmd() *cobra.Command { func newPreviewCmd() *cobra.Command {

24
pkg/cmd/pulumi/pulumi.go
View file

@ -36,18 +36,18 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/filestate" "github.com/pulumi/pulumi/pkg/v3/backend/filestate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate/client"
"github.com/pulumi/pulumi/pkg/v2/version" "github.com/pulumi/pulumi/pkg/v3/version"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/httputil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/httputil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
// NewPulumiCmd creates a new Pulumi Cmd instance. // NewPulumiCmd creates a new Pulumi Cmd instance.

10
pkg/cmd/pulumi/query.go
View file

@ -19,11 +19,11 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
// intentionally disabling here for cleaner err declaration/assignment. // intentionally disabling here for cleaner err declaration/assignment.

12
pkg/cmd/pulumi/refresh.go
View file

@ -20,12 +20,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
) )
func newRefreshCmd() *cobra.Command { func newRefreshCmd() *cobra.Command {

10
pkg/cmd/pulumi/stack.go
View file

@ -23,11 +23,11 @@ import (
humanize "github.com/dustin/go-humanize" humanize "github.com/dustin/go-humanize"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackCmd() *cobra.Command { func newStackCmd() *cobra.Command {

12
pkg/cmd/pulumi/stack_change_secrets_provider.go
View file

@ -18,14 +18,14 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackChangeSecretsProviderCmd() *cobra.Command { func newStackChangeSecretsProviderCmd() *cobra.Command {

10
pkg/cmd/pulumi/stack_export.go
View file

@ -19,13 +19,13 @@ import (
"os" "os"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackExportCmd() *cobra.Command { func newStackExportCmd() *cobra.Command {

12
pkg/cmd/pulumi/stack_graph.go
View file

@ -19,12 +19,12 @@ import (
"os" "os"
"strings" "strings"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/graph" "github.com/pulumi/pulumi/pkg/v3/graph"
"github.com/pulumi/pulumi/pkg/v2/graph/dotconv" "github.com/pulumi/pulumi/pkg/v3/graph/dotconv"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

10
pkg/cmd/pulumi/stack_history.go
View file

@ -11,11 +11,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
const errorDecryptingValue = "ERROR_UNABLE_TO_DECRYPT" const errorDecryptingValue = "ERROR_UNABLE_TO_DECRYPT"

10
pkg/cmd/pulumi/stack_import.go
View file

@ -23,11 +23,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackImportCmd() *cobra.Command { func newStackImportCmd() *cobra.Command {

4
pkg/cmd/pulumi/stack_init.go
View file

@ -20,8 +20,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
const ( const (

12
pkg/cmd/pulumi/stack_ls.go
View file

@ -23,12 +23,12 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/httpstate" "github.com/pulumi/pulumi/pkg/v3/backend/httpstate"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newStackLsCmd() *cobra.Command { func newStackLsCmd() *cobra.Command {

10
pkg/cmd/pulumi/stack_output.go
View file

@ -20,11 +20,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackOutputCmd() *cobra.Command { func newStackOutputCmd() *cobra.Command {

10
pkg/cmd/pulumi/stack_rename.go
View file

@ -19,15 +19,15 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newStackRenameCmd() *cobra.Command { func newStackRenameCmd() *cobra.Command {

14
pkg/cmd/pulumi/stack_rm.go
View file

@ -18,16 +18,16 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
) )
func newStackRmCmd() *cobra.Command { func newStackRmCmd() *cobra.Command {

8
pkg/cmd/pulumi/stack_select.go
View file

@ -18,10 +18,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/backend/state" "github.com/pulumi/pulumi/pkg/v3/backend/state"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
) )
// newStackSelectCmd handles both the "local" and "cloud" scenarios in its implementation. // newStackSelectCmd handles both the "local" and "cloud" scenarios in its implementation.

8
pkg/cmd/pulumi/stack_tag.go
View file

@ -21,10 +21,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
) )
func newStackTagCmd() *cobra.Command { func newStackTagCmd() *cobra.Command {

20
pkg/cmd/pulumi/state.go
View file

@ -18,19 +18,19 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/edit" "github.com/pulumi/pulumi/pkg/v3/resource/edit"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/apitype" "github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
survey "gopkg.in/AlecAivazis/survey.v1" survey "gopkg.in/AlecAivazis/survey.v1"
surveycore "gopkg.in/AlecAivazis/survey.v1/core" surveycore "gopkg.in/AlecAivazis/survey.v1/core"

12
pkg/cmd/pulumi/state_delete.go
View file

@ -17,12 +17,12 @@ package main
import ( import (
"fmt" "fmt"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/edit" "github.com/pulumi/pulumi/pkg/v3/resource/edit"
"github.com/pulumi/pulumi/sdk/v2/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

14
pkg/cmd/pulumi/state_unprotect.go
View file

@ -17,13 +17,13 @@ package main
import ( import (
"fmt" "fmt"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/edit" "github.com/pulumi/pulumi/pkg/v3/resource/edit"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

24
pkg/cmd/pulumi/up.go
View file

@ -22,18 +22,18 @@ import (
"os" "os"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pulumi/pulumi/pkg/v2/backend" "github.com/pulumi/pulumi/pkg/v3/backend"
"github.com/pulumi/pulumi/pkg/v2/backend/display" "github.com/pulumi/pulumi/pkg/v3/backend/display"
"github.com/pulumi/pulumi/pkg/v2/engine" "github.com/pulumi/pulumi/pkg/v3/engine"
"github.com/pulumi/pulumi/pkg/v2/resource/deploy" "github.com/pulumi/pulumi/pkg/v3/resource/deploy"
"github.com/pulumi/pulumi/pkg/v2/resource/stack" "github.com/pulumi/pulumi/pkg/v3/resource/stack"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
"github.com/pulumi/pulumi/sdk/v2/go/common/resource/config" "github.com/pulumi/pulumi/sdk/v3/go/common/resource/config"
"github.com/pulumi/pulumi/sdk/v2/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/result" "github.com/pulumi/pulumi/sdk/v3/go/common/util/result"
"github.com/pulumi/pulumi/sdk/v2/go/common/workspace" "github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

Some files were not shown because too many files have changed in this diff Show more