diff --git a/pkg/apitype/core.go b/pkg/apitype/core.go index 3c1967689..96eac063e 100644 --- a/pkg/apitype/core.go +++ b/pkg/apitype/core.go @@ -35,7 +35,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/tokens" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const ( diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go index 9370aff8f..e82b99ea8 100644 --- a/pkg/backend/backend.go +++ b/pkg/backend/backend.go @@ -35,7 +35,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/cancel" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) var ( diff --git a/pkg/backend/filestate/backend.go b/pkg/backend/filestate/backend.go index 37c8d88eb..b3e453a62 100644 --- a/pkg/backend/filestate/backend.go +++ b/pkg/backend/filestate/backend.go @@ -53,7 +53,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/validation" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Backend extends the base backend interface with specific information about local backends. diff --git a/pkg/backend/filestate/state.go b/pkg/backend/filestate/state.go index db3a83e30..37bee10e6 100644 --- a/pkg/backend/filestate/state.go +++ b/pkg/backend/filestate/state.go @@ -41,7 +41,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const DisableCheckpointBackupsEnvVar = "PULUMI_DISABLE_CHECKPOINT_BACKUPS" diff --git a/pkg/backend/httpstate/backend.go b/pkg/backend/httpstate/backend.go index 0c6429479..57074c715 100644 --- a/pkg/backend/httpstate/backend.go +++ b/pkg/backend/httpstate/backend.go @@ -53,7 +53,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/retry" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const ( diff --git a/pkg/backend/httpstate/client/client.go b/pkg/backend/httpstate/client/client.go index 3f3e98e3b..0a6a03c08 100644 --- a/pkg/backend/httpstate/client/client.go +++ b/pkg/backend/httpstate/client/client.go @@ -39,7 +39,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/validation" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Client provides a slim wrapper around the Pulumi HTTP/REST API. diff --git a/pkg/backend/httpstate/policypack.go b/pkg/backend/httpstate/policypack.go index d8c06e21c..700e0d70e 100644 --- a/pkg/backend/httpstate/policypack.go +++ b/pkg/backend/httpstate/policypack.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type cloudRequiredPolicy struct { diff --git a/pkg/backend/httpstate/state.go b/pkg/backend/httpstate/state.go index 6d4cb5349..c4b1e62db 100644 --- a/pkg/backend/httpstate/state.go +++ b/pkg/backend/httpstate/state.go @@ -33,7 +33,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/stack" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type tokenRequest chan<- tokenResponse diff --git a/pkg/backend/policypack.go b/pkg/backend/policypack.go index 13d74eed1..918899d8b 100644 --- a/pkg/backend/policypack.go +++ b/pkg/backend/policypack.go @@ -17,7 +17,7 @@ package backend import ( "context" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/backend/stack.go b/pkg/backend/stack.go index 8dc8f2b62..8170945cb 100644 --- a/pkg/backend/stack.go +++ b/pkg/backend/stack.go @@ -30,7 +30,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/gitutil" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Stack is a stack associated with a particular backend implementation. diff --git a/pkg/backend/state/stacks.go b/pkg/backend/state/stacks.go index 834fbb2c2..8ede43c0a 100644 --- a/pkg/backend/state/stacks.go +++ b/pkg/backend/state/stacks.go @@ -18,7 +18,7 @@ import ( "context" "github.com/pulumi/pulumi/pkg/backend" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // CurrentStack reads the current stack and returns an instance connected to its backend provider. diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 537638651..6b8d5326b 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -34,7 +34,7 @@ import ( "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newConfigCmd() *cobra.Command { diff --git a/pkg/cmd/config_test.go b/pkg/cmd/config_test.go index 8b36ef98c..d26d1e4b5 100644 --- a/pkg/cmd/config_test.go +++ b/pkg/cmd/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/tokens" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func TestPrettyKeyForProject(t *testing.T) { diff --git a/pkg/cmd/crypto_cloud.go b/pkg/cmd/crypto_cloud.go index f8d2e9ceb..5a9d6f326 100644 --- a/pkg/cmd/crypto_cloud.go +++ b/pkg/cmd/crypto_cloud.go @@ -21,7 +21,7 @@ import ( "github.com/pulumi/pulumi/pkg/secrets/cloud" "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newCloudSecretsManager(stackName tokens.QName, configFile, secretsProvider string) (secrets.Manager, error) { diff --git a/pkg/cmd/crypto_local.go b/pkg/cmd/crypto_local.go index fcf5eec6f..5a34c1049 100644 --- a/pkg/cmd/crypto_local.go +++ b/pkg/cmd/crypto_local.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func readPassphrase(prompt string) (string, error) { diff --git a/pkg/cmd/login.go b/pkg/cmd/login.go index e4bb40eac..6d8b66829 100644 --- a/pkg/cmd/login.go +++ b/pkg/cmd/login.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/filestate" "github.com/pulumi/pulumi/pkg/backend/httpstate" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newLoginCmd() *cobra.Command { diff --git a/pkg/cmd/logout.go b/pkg/cmd/logout.go index d1d174e6a..682805171 100644 --- a/pkg/cmd/logout.go +++ b/pkg/cmd/logout.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/filestate" "github.com/pulumi/pulumi/pkg/backend/httpstate" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newLogoutCmd() *cobra.Command { diff --git a/pkg/cmd/new.go b/pkg/cmd/new.go index 33c6b1fb2..c629c911a 100644 --- a/pkg/cmd/new.go +++ b/pkg/cmd/new.go @@ -43,7 +43,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type promptForValueFunc func(yes bool, valueType string, defaultValue string, secret bool, diff --git a/pkg/cmd/new_test.go b/pkg/cmd/new_test.go index 872c4b9a1..fff3e547a 100644 --- a/pkg/cmd/new_test.go +++ b/pkg/cmd/new_test.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend" "github.com/pulumi/pulumi/pkg/backend/display" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/plugin.go b/pkg/cmd/plugin.go index e33b24786..1a26b413d 100644 --- a/pkg/cmd/plugin.go +++ b/pkg/cmd/plugin.go @@ -21,7 +21,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newPluginCmd() *cobra.Command { diff --git a/pkg/cmd/plugin_install.go b/pkg/cmd/plugin_install.go index 28178b19e..c160f4b56 100644 --- a/pkg/cmd/plugin_install.go +++ b/pkg/cmd/plugin_install.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newPluginInstallCmd() *cobra.Command { diff --git a/pkg/cmd/plugin_ls.go b/pkg/cmd/plugin_ls.go index 4d8e391f4..02f73604b 100644 --- a/pkg/cmd/plugin_ls.go +++ b/pkg/cmd/plugin_ls.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newPluginLsCmd() *cobra.Command { diff --git a/pkg/cmd/plugin_rm.go b/pkg/cmd/plugin_rm.go index 214c1533f..14f5ec568 100644 --- a/pkg/cmd/plugin_rm.go +++ b/pkg/cmd/plugin_rm.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/display" "github.com/pulumi/pulumi/pkg/diag/colors" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newPluginRmCmd() *cobra.Command { diff --git a/pkg/cmd/policy_new.go b/pkg/cmd/policy_new.go index 6f287b088..4c8ddf120 100644 --- a/pkg/cmd/policy_new.go +++ b/pkg/cmd/policy_new.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag/colors" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/spf13/cobra" survey "gopkg.in/AlecAivazis/survey.v1" surveycore "gopkg.in/AlecAivazis/survey.v1/core" diff --git a/pkg/cmd/policy_publish.go b/pkg/cmd/policy_publish.go index b2b5b716e..0c6fa7753 100644 --- a/pkg/cmd/policy_publish.go +++ b/pkg/cmd/policy_publish.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/httpstate" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/pulumi.go b/pkg/cmd/pulumi.go index 7eef9018c..9751b698d 100644 --- a/pkg/cmd/pulumi.go +++ b/pkg/cmd/pulumi.go @@ -46,7 +46,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/httputil" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/version" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // NewPulumiCmd creates a new Pulumi Cmd instance. diff --git a/pkg/cmd/stack_ls.go b/pkg/cmd/stack_ls.go index 50e2dabfc..6ea1c8cde 100644 --- a/pkg/cmd/stack_ls.go +++ b/pkg/cmd/stack_ls.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/httpstate" "github.com/pulumi/pulumi/pkg/backend/state" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newStackLsCmd() *cobra.Command { diff --git a/pkg/cmd/stack_rename.go b/pkg/cmd/stack_rename.go index ab9621632..6dc70ede5 100644 --- a/pkg/cmd/stack_rename.go +++ b/pkg/cmd/stack_rename.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/display" "github.com/pulumi/pulumi/pkg/backend/state" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newStackRenameCmd() *cobra.Command { diff --git a/pkg/cmd/stack_rm.go b/pkg/cmd/stack_rm.go index 7f336f08d..06f5faf4a 100644 --- a/pkg/cmd/stack_rm.go +++ b/pkg/cmd/stack_rm.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag/colors" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func newStackRmCmd() *cobra.Command { diff --git a/pkg/cmd/up.go b/pkg/cmd/up.go index 3c08058b8..e2873bb22 100644 --- a/pkg/cmd/up.go +++ b/pkg/cmd/up.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/stack" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const ( diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go index 20d7573e0..8ca0b5d91 100644 --- a/pkg/cmd/util.go +++ b/pkg/cmd/util.go @@ -50,7 +50,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/gitutil" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/tracing" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func hasDebugCommands() bool { diff --git a/pkg/engine/destroy.go b/pkg/engine/destroy.go index c740828ae..b77dc23c9 100644 --- a/pkg/engine/destroy.go +++ b/pkg/engine/destroy.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func Destroy(u UpdateInfo, ctx *Context, opts UpdateOptions, dryRun bool) (ResourceChanges, result.Result) { diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 1499c47c1..b7d5e443b 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -19,7 +19,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/util/cancel" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // UpdateInfo abstracts away information about an apply, preview, or destroy. diff --git a/pkg/engine/lifecycle_test.go b/pkg/engine/lifecycle_test.go index bdafe63ba..3c40f31b7 100644 --- a/pkg/engine/lifecycle_test.go +++ b/pkg/engine/lifecycle_test.go @@ -45,7 +45,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/pulumi/pulumi/sdk/go/pulumi" combinations "github.com/mxschmitt/golang-combinations" diff --git a/pkg/engine/plan.go b/pkg/engine/plan.go index 6e836b028..0228e594e 100644 --- a/pkg/engine/plan.go +++ b/pkg/engine/plan.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // ProjectInfoContext returns information about the current project, including its pwd, main, and plugin context. diff --git a/pkg/engine/plugins.go b/pkg/engine/plugins.go index cc35f7034..b95b75c1e 100644 --- a/pkg/engine/plugins.go +++ b/pkg/engine/plugins.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const ( diff --git a/pkg/engine/plugins_test.go b/pkg/engine/plugins_test.go index 345fa9828..ea127445f 100644 --- a/pkg/engine/plugins_test.go +++ b/pkg/engine/plugins_test.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func mustMakeVersion(v string) *semver.Version { diff --git a/pkg/engine/project.go b/pkg/engine/project.go index 41f35da4c..e0c65592b 100644 --- a/pkg/engine/project.go +++ b/pkg/engine/project.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type Projinfo struct { diff --git a/pkg/engine/refresh.go b/pkg/engine/refresh.go index 50e07eafb..a11b23125 100644 --- a/pkg/engine/refresh.go +++ b/pkg/engine/refresh.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) func Refresh(u UpdateInfo, ctx *Context, opts UpdateOptions, dryRun bool) (ResourceChanges, result.Result) { diff --git a/pkg/engine/update.go b/pkg/engine/update.go index 7131009c6..a5deb560d 100644 --- a/pkg/engine/update.go +++ b/pkg/engine/update.go @@ -35,7 +35,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // RequiredPolicy represents a set of policies to apply during an update. diff --git a/pkg/resource/deploy/builtins.go b/pkg/resource/deploy/builtins.go index a7d044bef..a469882ec 100644 --- a/pkg/resource/deploy/builtins.go +++ b/pkg/resource/deploy/builtins.go @@ -11,7 +11,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type builtinProvider struct { diff --git a/pkg/resource/deploy/deploytest/languageruntime.go b/pkg/resource/deploy/deploytest/languageruntime.go index 0e2faf452..92c836f51 100644 --- a/pkg/resource/deploy/deploytest/languageruntime.go +++ b/pkg/resource/deploy/deploytest/languageruntime.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/resource/deploy/deploytest/pluginhost.go b/pkg/resource/deploy/deploytest/pluginhost.go index 81a49b48f..0169f1e48 100644 --- a/pkg/resource/deploy/deploytest/pluginhost.go +++ b/pkg/resource/deploy/deploytest/pluginhost.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/tokens" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type LoadProviderFunc func() (plugin.Provider, error) diff --git a/pkg/resource/deploy/deploytest/provider.go b/pkg/resource/deploy/deploytest/provider.go index 833a65a01..55b31361d 100644 --- a/pkg/resource/deploy/deploytest/provider.go +++ b/pkg/resource/deploy/deploytest/provider.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type Provider struct { diff --git a/pkg/resource/deploy/providers/registry.go b/pkg/resource/deploy/providers/registry.go index b83dc34cb..f36a9ad0b 100644 --- a/pkg/resource/deploy/providers/registry.go +++ b/pkg/resource/deploy/providers/registry.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // GetProviderVersion fetches and parses a provider version from the given property map. If the version property is not diff --git a/pkg/resource/deploy/providers/registry_test.go b/pkg/resource/deploy/providers/registry_test.go index 70c133404..d31efe891 100644 --- a/pkg/resource/deploy/providers/registry_test.go +++ b/pkg/resource/deploy/providers/registry_test.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/tokens" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type testPluginHost struct { diff --git a/pkg/resource/deploy/snapshot.go b/pkg/resource/deploy/snapshot.go index 8c33edcc4..2bc10a540 100644 --- a/pkg/resource/deploy/snapshot.go +++ b/pkg/resource/deploy/snapshot.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Snapshot is a view of a collection of resources in an stack at a point in time. It describes resources; their diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go index b17080bfd..1c54cf95d 100644 --- a/pkg/resource/deploy/source_eval.go +++ b/pkg/resource/deploy/source_eval.go @@ -35,7 +35,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/resource/deploy/source_eval_test.go b/pkg/resource/deploy/source_eval_test.go index 93768eddf..48f3abf51 100644 --- a/pkg/resource/deploy/source_eval_test.go +++ b/pkg/resource/deploy/source_eval_test.go @@ -29,7 +29,7 @@ import ( "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) type testRegEvent struct { diff --git a/pkg/resource/stack/deployment.go b/pkg/resource/stack/deployment.go index 6cace5634..5186f682c 100644 --- a/pkg/resource/stack/deployment.go +++ b/pkg/resource/stack/deployment.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const ( diff --git a/pkg/secrets/service/manager.go b/pkg/secrets/service/manager.go index a3153434b..a348234f1 100644 --- a/pkg/secrets/service/manager.go +++ b/pkg/secrets/service/manager.go @@ -8,7 +8,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/backend/httpstate/client" diff --git a/pkg/testing/integration/program.go b/pkg/testing/integration/program.go index e7aedc52e..2fb735ba6 100644 --- a/pkg/testing/integration/program.go +++ b/pkg/testing/integration/program.go @@ -52,7 +52,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" "github.com/pulumi/pulumi/pkg/util/retry" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const PythonRuntime = "python" diff --git a/pkg/testing/integration/pulumi.go b/pkg/testing/integration/pulumi.go index fabff09ce..b7a1b3e12 100644 --- a/pkg/testing/integration/pulumi.go +++ b/pkg/testing/integration/pulumi.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/pulumi/pulumi/pkg/testing" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/stretchr/testify/assert" ) diff --git a/sdk/go/common/resource/plugin/analyzer.go b/sdk/go/common/resource/plugin/analyzer.go index 882ea13c5..52d1a8ac8 100644 --- a/sdk/go/common/resource/plugin/analyzer.go +++ b/sdk/go/common/resource/plugin/analyzer.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/pkg/apitype" "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/tokens" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Analyzer provides a pluggable interface for performing arbitrary analysis of entire projects/stacks/snapshots, and/or diff --git a/sdk/go/common/resource/plugin/analyzer_plugin.go b/sdk/go/common/resource/plugin/analyzer_plugin.go index ac20880ce..683f4ebdf 100644 --- a/sdk/go/common/resource/plugin/analyzer_plugin.go +++ b/sdk/go/common/resource/plugin/analyzer_plugin.go @@ -34,7 +34,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/sdk/go/common/resource/plugin/host.go b/sdk/go/common/resource/plugin/host.go index 75c61299c..0e85a827d 100644 --- a/sdk/go/common/resource/plugin/host.go +++ b/sdk/go/common/resource/plugin/host.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // A Host hosts provider plugins and makes them easily accessible by package name. diff --git a/sdk/go/common/resource/plugin/langruntime.go b/sdk/go/common/resource/plugin/langruntime.go index 3e3612b96..841bdbb9e 100644 --- a/sdk/go/common/resource/plugin/langruntime.go +++ b/sdk/go/common/resource/plugin/langruntime.go @@ -18,7 +18,7 @@ import ( "io" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // LanguageRuntime is a convenient interface for interacting with language runtime plugins. These tend to be diff --git a/sdk/go/common/resource/plugin/langruntime_plugin.go b/sdk/go/common/resource/plugin/langruntime_plugin.go index c4768332a..1982b8a79 100644 --- a/sdk/go/common/resource/plugin/langruntime_plugin.go +++ b/sdk/go/common/resource/plugin/langruntime_plugin.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/sdk/go/common/resource/plugin/provider.go b/sdk/go/common/resource/plugin/provider.go index e3a9dece8..a6d1a29af 100644 --- a/sdk/go/common/resource/plugin/provider.go +++ b/sdk/go/common/resource/plugin/provider.go @@ -20,7 +20,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/tokens" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) // Provider presents a simple interface for orchestrating resource create, read, update, and delete operations. Each diff --git a/sdk/go/common/resource/plugin/provider_plugin.go b/sdk/go/common/resource/plugin/provider_plugin.go index 3e6fd90fd..a21e9b78b 100644 --- a/sdk/go/common/resource/plugin/provider_plugin.go +++ b/sdk/go/common/resource/plugin/provider_plugin.go @@ -32,7 +32,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/workspace/creds.go b/sdk/go/common/workspace/creds.go similarity index 100% rename from pkg/workspace/creds.go rename to sdk/go/common/workspace/creds.go diff --git a/pkg/workspace/paths.go b/sdk/go/common/workspace/paths.go similarity index 100% rename from pkg/workspace/paths.go rename to sdk/go/common/workspace/paths.go diff --git a/pkg/workspace/plugins.go b/sdk/go/common/workspace/plugins.go similarity index 100% rename from pkg/workspace/plugins.go rename to sdk/go/common/workspace/plugins.go diff --git a/pkg/workspace/plugins_test.go b/sdk/go/common/workspace/plugins_test.go similarity index 100% rename from pkg/workspace/plugins_test.go rename to sdk/go/common/workspace/plugins_test.go diff --git a/pkg/workspace/project.go b/sdk/go/common/workspace/project.go similarity index 100% rename from pkg/workspace/project.go rename to sdk/go/common/workspace/project.go diff --git a/pkg/workspace/project_test.go b/sdk/go/common/workspace/project_test.go similarity index 100% rename from pkg/workspace/project_test.go rename to sdk/go/common/workspace/project_test.go diff --git a/pkg/workspace/settings.go b/sdk/go/common/workspace/settings.go similarity index 100% rename from pkg/workspace/settings.go rename to sdk/go/common/workspace/settings.go diff --git a/pkg/workspace/templates.go b/sdk/go/common/workspace/templates.go similarity index 100% rename from pkg/workspace/templates.go rename to sdk/go/common/workspace/templates.go diff --git a/pkg/workspace/templates_test.go b/sdk/go/common/workspace/templates_test.go similarity index 100% rename from pkg/workspace/templates_test.go rename to sdk/go/common/workspace/templates_test.go diff --git a/pkg/workspace/workspace.go b/sdk/go/common/workspace/workspace.go similarity index 100% rename from pkg/workspace/workspace.go rename to sdk/go/common/workspace/workspace.go diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 5a3a65df6..83ac2a2fc 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/pkg/secrets/cloud" ptesting "github.com/pulumi/pulumi/pkg/testing" "github.com/pulumi/pulumi/pkg/testing/integration" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" ) const WindowsOS = "windows" diff --git a/tests/stack_test.go b/tests/stack_test.go index 3ea12ff0a..e6fc6268a 100644 --- a/tests/stack_test.go +++ b/tests/stack_test.go @@ -34,7 +34,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/stack" "github.com/pulumi/pulumi/pkg/testing/integration" "github.com/pulumi/pulumi/pkg/util/contract" - "github.com/pulumi/pulumi/pkg/workspace" + "github.com/pulumi/pulumi/sdk/go/common/workspace" "github.com/stretchr/testify/assert" ptesting "github.com/pulumi/pulumi/pkg/testing"