diff --git a/pkg/apitype/core.go b/pkg/apitype/core.go index 96eac063e..15cd35e28 100644 --- a/pkg/apitype/core.go +++ b/pkg/apitype/core.go @@ -34,7 +34,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/apitype/migrate/checkpoint_test.go b/pkg/apitype/migrate/checkpoint_test.go index 37bccc49a..fe8a04ea7 100644 --- a/pkg/apitype/migrate/checkpoint_test.go +++ b/pkg/apitype/migrate/checkpoint_test.go @@ -19,7 +19,7 @@ import ( "github.com/pulumi/pulumi/pkg/apitype" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/stretchr/testify/assert" ) diff --git a/pkg/apitype/migrate/resource_test.go b/pkg/apitype/migrate/resource_test.go index ac5de0d64..29ad127d0 100644 --- a/pkg/apitype/migrate/resource_test.go +++ b/pkg/apitype/migrate/resource_test.go @@ -19,7 +19,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/sdk/go/common/tokens" "github.com/stretchr/testify/assert" ) diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go index e82b99ea8..2818fd56d 100644 --- a/pkg/backend/backend.go +++ b/pkg/backend/backend.go @@ -32,7 +32,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/stack" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cancel" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/backend/backend_test.go b/pkg/backend/backend_test.go index 28ddca703..1fd39b37c 100644 --- a/pkg/backend/backend_test.go +++ b/pkg/backend/backend_test.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) func TestGetStackResourceOutputs(t *testing.T) { diff --git a/pkg/backend/display/display.go b/pkg/backend/display/display.go index c1f1ef82a..ad321d9a2 100644 --- a/pkg/backend/display/display.go +++ b/pkg/backend/display/display.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/engine" "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/backend/display/progress.go b/pkg/backend/display/progress.go index 92f61414b..da86e6415 100644 --- a/pkg/backend/display/progress.go +++ b/pkg/backend/display/progress.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/pkg/engine" "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/backend/filestate/backend.go b/pkg/backend/filestate/backend.go index 5540bd7d4..02b31dc30 100644 --- a/pkg/backend/filestate/backend.go +++ b/pkg/backend/filestate/backend.go @@ -47,7 +47,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/edit" "github.com/pulumi/pulumi/pkg/resource/stack" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/pkg/backend/filestate/snapshot.go b/pkg/backend/filestate/snapshot.go index e8e3a27a4..6eed16048 100644 --- a/pkg/backend/filestate/snapshot.go +++ b/pkg/backend/filestate/snapshot.go @@ -17,7 +17,7 @@ package filestate import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // localSnapshotManager is a simple SnapshotManager implementation that persists snapshots diff --git a/pkg/backend/filestate/stack.go b/pkg/backend/filestate/stack.go index 3d563187b..a5c5d5a2d 100644 --- a/pkg/backend/filestate/stack.go +++ b/pkg/backend/filestate/stack.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/apitype" "github.com/pulumi/pulumi/pkg/backend" diff --git a/pkg/backend/filestate/state.go b/pkg/backend/filestate/state.go index 9e279fc06..6be4e689d 100644 --- a/pkg/backend/filestate/state.go +++ b/pkg/backend/filestate/state.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/stack" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" diff --git a/pkg/backend/httpstate/backend.go b/pkg/backend/httpstate/backend.go index fb8c93a42..0647df289 100644 --- a/pkg/backend/httpstate/backend.go +++ b/pkg/backend/httpstate/backend.go @@ -47,7 +47,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/pkg/backend/httpstate/client/client.go b/pkg/backend/httpstate/client/client.go index 912d92b30..faab21472 100644 --- a/pkg/backend/httpstate/client/client.go +++ b/pkg/backend/httpstate/client/client.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag/colors" "github.com/pulumi/pulumi/pkg/engine" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/validation" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/backend/httpstate/policypack.go b/pkg/backend/httpstate/policypack.go index e8f239bed..8569cbba6 100644 --- a/pkg/backend/httpstate/policypack.go +++ b/pkg/backend/httpstate/policypack.go @@ -21,7 +21,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend" "github.com/pulumi/pulumi/pkg/backend/httpstate/client" "github.com/pulumi/pulumi/pkg/engine" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/backend/httpstate/stack.go b/pkg/backend/httpstate/stack.go index 9266b64ae..9c77a11e9 100644 --- a/pkg/backend/httpstate/stack.go +++ b/pkg/backend/httpstate/stack.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/engine" "github.com/pulumi/pulumi/pkg/operations" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/backend/mock.go b/pkg/backend/mock.go index 26f738d0f..306ef8fc2 100644 --- a/pkg/backend/mock.go +++ b/pkg/backend/mock.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/pkg/operations" "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/backend/snapshot_test.go b/pkg/backend/snapshot_test.go index 63aa40cf7..4760695ce 100644 --- a/pkg/backend/snapshot_test.go +++ b/pkg/backend/snapshot_test.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/secrets/b64" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/version" ) diff --git a/pkg/backend/stack.go b/pkg/backend/stack.go index 4359ec6dc..a754fd681 100644 --- a/pkg/backend/stack.go +++ b/pkg/backend/stack.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/pkg/operations" "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/gitutil" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 6b8d5326b..3aba853ee 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -32,7 +32,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/display" "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/cmd/config_test.go b/pkg/cmd/config_test.go index d26d1e4b5..edad41ab7 100644 --- a/pkg/cmd/config_test.go +++ b/pkg/cmd/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/cmd/crypto_cloud.go b/pkg/cmd/crypto_cloud.go index 45d64c0c7..dd60cc903 100644 --- a/pkg/cmd/crypto_cloud.go +++ b/pkg/cmd/crypto_cloud.go @@ -19,7 +19,7 @@ import ( "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/secrets/cloud" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/cmd/crypto_local.go b/pkg/cmd/crypto_local.go index 444950469..bcbf0e215 100644 --- a/pkg/cmd/crypto_local.go +++ b/pkg/cmd/crypto_local.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/pkg/secrets/passphrase" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/cmd/new.go b/pkg/cmd/new.go index ca3709a4c..af5459aea 100644 --- a/pkg/cmd/new.go +++ b/pkg/cmd/new.go @@ -39,7 +39,7 @@ import ( "github.com/pulumi/pulumi/pkg/engine" "github.com/pulumi/pulumi/pkg/npm" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/pkg/cmd/stack_rename.go b/pkg/cmd/stack_rename.go index 6dc70ede5..748fdf4ff 100644 --- a/pkg/cmd/stack_rename.go +++ b/pkg/cmd/stack_rename.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/pkg/cmd/up.go b/pkg/cmd/up.go index 87b8f694b..4c30b0c83 100644 --- a/pkg/cmd/up.go +++ b/pkg/cmd/up.go @@ -21,7 +21,7 @@ import ( "math" "os" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pkg/errors" diff --git a/pkg/engine/events.go b/pkg/engine/events.go index 3c3c72381..a0c2d60ec 100644 --- a/pkg/engine/events.go +++ b/pkg/engine/events.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/engine/lifecycle_test.go b/pkg/engine/lifecycle_test.go index 31c5ac184..ea72d2295 100644 --- a/pkg/engine/lifecycle_test.go +++ b/pkg/engine/lifecycle_test.go @@ -39,7 +39,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cancel" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/pkg/engine/plugins.go b/pkg/engine/plugins.go index d4118542e..78064940e 100644 --- a/pkg/engine/plugins.go +++ b/pkg/engine/plugins.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/pkg/engine/plugins_test.go b/pkg/engine/plugins_test.go index ea127445f..f15b2e19e 100644 --- a/pkg/engine/plugins_test.go +++ b/pkg/engine/plugins_test.go @@ -20,7 +20,7 @@ import ( "github.com/blang/semver" "github.com/stretchr/testify/assert" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/update.go b/pkg/engine/update.go index 6ff6ce1c4..eaeb6e8a6 100644 --- a/pkg/engine/update.go +++ b/pkg/engine/update.go @@ -31,7 +31,7 @@ import ( resourceanalyzer "github.com/pulumi/pulumi/pkg/resource/analyzer" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/operations/operations_aws.go b/pkg/operations/operations_aws.go index 155c13c28..d4ecc86d7 100644 --- a/pkg/operations/operations_aws.go +++ b/pkg/operations/operations_aws.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/operations/operations_cloud_aws.go b/pkg/operations/operations_cloud_aws.go index 34155b1b9..825e4271b 100644 --- a/pkg/operations/operations_cloud_aws.go +++ b/pkg/operations/operations_cloud_aws.go @@ -20,7 +20,7 @@ import ( "time" "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/operations/operations_gcp.go b/pkg/operations/operations_gcp.go index 044788627..e23b1e529 100644 --- a/pkg/operations/operations_gcp.go +++ b/pkg/operations/operations_gcp.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" "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/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/operations/resources.go b/pkg/operations/resources.go index 4cfc058dc..49f6333c2 100644 --- a/pkg/operations/resources.go +++ b/pkg/operations/resources.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/go-multierror" "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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/config/key.go b/pkg/resource/config/key.go index 810206ef4..ea3cd30e1 100644 --- a/pkg/resource/config/key.go +++ b/pkg/resource/config/key.go @@ -20,7 +20,7 @@ import ( "github.com/pkg/errors" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/deploy/builtins.go b/pkg/resource/deploy/builtins.go index 9e6c4cbb2..5b1560be0 100644 --- a/pkg/resource/deploy/builtins.go +++ b/pkg/resource/deploy/builtins.go @@ -9,7 +9,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/resource/deploy/deploytest/pluginhost.go b/pkg/resource/deploy/deploytest/pluginhost.go index 0169f1e48..0e2e34f80 100644 --- a/pkg/resource/deploy/deploytest/pluginhost.go +++ b/pkg/resource/deploy/deploytest/pluginhost.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag" "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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/resource/deploy/deploytest/provider.go b/pkg/resource/deploy/deploytest/provider.go index 34fad0093..2f794571d 100644 --- a/pkg/resource/deploy/deploytest/provider.go +++ b/pkg/resource/deploy/deploytest/provider.go @@ -22,7 +22,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/resource/deploy/deploytest/resourcemonitor.go b/pkg/resource/deploy/deploytest/resourcemonitor.go index cf1437aaf..29f12e512 100644 --- a/pkg/resource/deploy/deploytest/resourcemonitor.go +++ b/pkg/resource/deploy/deploytest/resourcemonitor.go @@ -20,7 +20,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/sdk/go/common/tokens" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/resource/deploy/plan.go b/pkg/resource/deploy/plan.go index 00a9360af..6d571af31 100644 --- a/pkg/resource/deploy/plan.go +++ b/pkg/resource/deploy/plan.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/pkg/resource/graph" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/deploy/plan_test.go b/pkg/resource/deploy/plan_test.go index 1fee65334..554f0e48c 100644 --- a/pkg/resource/deploy/plan_test.go +++ b/pkg/resource/deploy/plan_test.go @@ -8,7 +8,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/version" "github.com/stretchr/testify/assert" ) diff --git a/pkg/resource/deploy/providers/provider.go b/pkg/resource/deploy/providers/provider.go index 741a89b58..a80a64ba9 100644 --- a/pkg/resource/deploy/providers/provider.go +++ b/pkg/resource/deploy/providers/provider.go @@ -19,7 +19,7 @@ import ( "github.com/blang/semver" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/deploy/providers/provider_test.go b/pkg/resource/deploy/providers/provider_test.go index 2b578918f..8eea7b1c8 100644 --- a/pkg/resource/deploy/providers/provider_test.go +++ b/pkg/resource/deploy/providers/provider_test.go @@ -6,7 +6,7 @@ import ( "github.com/blang/semver" "github.com/stretchr/testify/assert" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) func TestProviderRequestNameNil(t *testing.T) { diff --git a/pkg/resource/deploy/providers/reference.go b/pkg/resource/deploy/providers/reference.go index 885d2f264..b20eb6390 100644 --- a/pkg/resource/deploy/providers/reference.go +++ b/pkg/resource/deploy/providers/reference.go @@ -21,7 +21,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/deploy/providers/reference_test.go b/pkg/resource/deploy/providers/reference_test.go index 501cf5445..062ed5b1f 100644 --- a/pkg/resource/deploy/providers/reference_test.go +++ b/pkg/resource/deploy/providers/reference_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/pulumi/pulumi/sdk/go/common/resource" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) func TestRoundTripProviderType(t *testing.T) { diff --git a/pkg/resource/deploy/providers/registry.go b/pkg/resource/deploy/providers/registry.go index dafbb32c6..3693f2b71 100644 --- a/pkg/resource/deploy/providers/registry.go +++ b/pkg/resource/deploy/providers/registry.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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/resource/deploy/providers/registry_test.go b/pkg/resource/deploy/providers/registry_test.go index d31efe891..1ea0d8cc4 100644 --- a/pkg/resource/deploy/providers/registry_test.go +++ b/pkg/resource/deploy/providers/registry_test.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag" "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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/resource/deploy/source.go b/pkg/resource/deploy/source.go index 0da55d68f..a1d0556d0 100644 --- a/pkg/resource/deploy/source.go +++ b/pkg/resource/deploy/source.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/result" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/resource/deploy/source_error.go b/pkg/resource/deploy/source_error.go index ab53a760f..c7456eb03 100644 --- a/pkg/resource/deploy/source_error.go +++ b/pkg/resource/deploy/source_error.go @@ -17,7 +17,7 @@ package deploy import ( "context" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go index 75e51c02f..8d61d1ef7 100644 --- a/pkg/resource/deploy/source_eval.go +++ b/pkg/resource/deploy/source_eval.go @@ -29,7 +29,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/resource/deploy/source_eval_test.go b/pkg/resource/deploy/source_eval_test.go index 466fe1563..b98e5d122 100644 --- a/pkg/resource/deploy/source_eval_test.go +++ b/pkg/resource/deploy/source_eval_test.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/deploytest" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/resource/deploy/source_fixed.go b/pkg/resource/deploy/source_fixed.go index ff8db56ca..859317f21 100644 --- a/pkg/resource/deploy/source_fixed.go +++ b/pkg/resource/deploy/source_fixed.go @@ -17,7 +17,7 @@ package deploy import ( "context" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/deploy/source_null.go b/pkg/resource/deploy/source_null.go index b74ad3857..0e05b2395 100644 --- a/pkg/resource/deploy/source_null.go +++ b/pkg/resource/deploy/source_null.go @@ -17,7 +17,7 @@ package deploy import ( "context" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/deploy/source_query.go b/pkg/resource/deploy/source_query.go index d66b11f6f..e8efc26fe 100644 --- a/pkg/resource/deploy/source_query.go +++ b/pkg/resource/deploy/source_query.go @@ -29,7 +29,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/resource/deploy/step.go b/pkg/resource/deploy/step.go index 583722d78..6e51ca491 100644 --- a/pkg/resource/deploy/step.go +++ b/pkg/resource/deploy/step.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" ) diff --git a/pkg/resource/deploy/step_generator.go b/pkg/resource/deploy/step_generator.go index 073a180c5..008e0f739 100644 --- a/pkg/resource/deploy/step_generator.go +++ b/pkg/resource/deploy/step_generator.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/pkg/resource/graph" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/result" diff --git a/pkg/resource/deploy/target.go b/pkg/resource/deploy/target.go index 484b4f62a..46352661d 100644 --- a/pkg/resource/deploy/target.go +++ b/pkg/resource/deploy/target.go @@ -16,7 +16,7 @@ package deploy import ( "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // Target represents information about a deployment target. diff --git a/pkg/resource/edit/operations.go b/pkg/resource/edit/operations.go index f4033abfc..f77f739cd 100644 --- a/pkg/resource/edit/operations.go +++ b/pkg/resource/edit/operations.go @@ -21,7 +21,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/pkg/resource/graph" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/edit/operations_test.go b/pkg/resource/edit/operations_test.go index d297d7fed..55baf1f13 100644 --- a/pkg/resource/edit/operations_test.go +++ b/pkg/resource/edit/operations_test.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/version" "github.com/stretchr/testify/assert" diff --git a/pkg/resource/graph/dependency_graph_test.go b/pkg/resource/graph/dependency_graph_test.go index 0a52dde62..68eb726aa 100644 --- a/pkg/resource/graph/dependency_graph_test.go +++ b/pkg/resource/graph/dependency_graph_test.go @@ -7,7 +7,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy/providers" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/stretchr/testify/assert" ) diff --git a/pkg/resource/stack/checkpoint.go b/pkg/resource/stack/checkpoint.go index 0c057e0ba..2e700659f 100644 --- a/pkg/resource/stack/checkpoint.go +++ b/pkg/resource/stack/checkpoint.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/pkg/resource/stack/deployment_test.go b/pkg/resource/stack/deployment_test.go index a38cf2172..4be0c55e9 100644 --- a/pkg/resource/stack/deployment_test.go +++ b/pkg/resource/stack/deployment_test.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/apitype" "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/sdk/go/common/tokens" ) // TestDeploymentSerialization creates a basic snapshot of a given resource state. diff --git a/pkg/testing/integration/program.go b/pkg/testing/integration/program.go index dc83139a0..9d7905e9e 100644 --- a/pkg/testing/integration/program.go +++ b/pkg/testing/integration/program.go @@ -46,7 +46,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/config" "github.com/pulumi/pulumi/pkg/resource/stack" pulumi_testing "github.com/pulumi/pulumi/pkg/testing" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/tools" "github.com/pulumi/pulumi/pkg/util/ciutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" diff --git a/pkg/util/fsutil/qname.go b/pkg/util/fsutil/qname.go index 60a7190a4..3710e0929 100644 --- a/pkg/util/fsutil/qname.go +++ b/pkg/util/fsutil/qname.go @@ -18,7 +18,7 @@ import ( "os" "strings" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // QnamePath just cleans a name and makes sure it's appropriate to use as a path. diff --git a/sdk/go/common/resource/plugin/analyzer.go b/sdk/go/common/resource/plugin/analyzer.go index 52d1a8ac8..1f1eb9eb6 100644 --- a/sdk/go/common/resource/plugin/analyzer.go +++ b/sdk/go/common/resource/plugin/analyzer.go @@ -19,7 +19,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/sdk/go/common/resource/plugin/analyzer_plugin.go b/sdk/go/common/resource/plugin/analyzer_plugin.go index eabf0f534..32d5d6e24 100644 --- a/sdk/go/common/resource/plugin/analyzer_plugin.go +++ b/sdk/go/common/resource/plugin/analyzer_plugin.go @@ -30,7 +30,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/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" diff --git a/sdk/go/common/resource/plugin/config_source.go b/sdk/go/common/resource/plugin/config_source.go index 3be397c5f..5480e0ac2 100644 --- a/sdk/go/common/resource/plugin/config_source.go +++ b/sdk/go/common/resource/plugin/config_source.go @@ -16,7 +16,7 @@ package plugin import ( "github.com/pulumi/pulumi/pkg/resource/config" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // ConfigSource is an interface that allows a plugin context to fetch configuration data for a plugin named by diff --git a/sdk/go/common/resource/plugin/host.go b/sdk/go/common/resource/plugin/host.go index 4ffdc17c4..00a26a461 100644 --- a/sdk/go/common/resource/plugin/host.go +++ b/sdk/go/common/resource/plugin/host.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/diag" "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/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" diff --git a/sdk/go/common/resource/plugin/langruntime_plugin.go b/sdk/go/common/resource/plugin/langruntime_plugin.go index 473f67216..e1d0747da 100644 --- a/sdk/go/common/resource/plugin/langruntime_plugin.go +++ b/sdk/go/common/resource/plugin/langruntime_plugin.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc/codes" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" diff --git a/sdk/go/common/resource/plugin/provider.go b/sdk/go/common/resource/plugin/provider.go index 3894c57f4..2dacaee53 100644 --- a/sdk/go/common/resource/plugin/provider.go +++ b/sdk/go/common/resource/plugin/provider.go @@ -18,7 +18,7 @@ import ( "io" "github.com/pulumi/pulumi/sdk/go/common/resource" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/sdk/go/common/resource/plugin/provider_plugin.go b/sdk/go/common/resource/plugin/provider_plugin.go index f2ad163e0..1692fb6ac 100644 --- a/sdk/go/common/resource/plugin/provider_plugin.go +++ b/sdk/go/common/resource/plugin/provider_plugin.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc/codes" "github.com/pulumi/pulumi/sdk/go/common/resource" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" diff --git a/sdk/go/common/resource/properties.go b/sdk/go/common/resource/properties.go index 277fa2369..beb43d7a9 100644 --- a/sdk/go/common/resource/properties.go +++ b/sdk/go/common/resource/properties.go @@ -19,7 +19,7 @@ import ( "reflect" "sort" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/util/mapper" ) diff --git a/sdk/go/common/resource/resource_goal.go b/sdk/go/common/resource/resource_goal.go index fafc94a52..ead624542 100644 --- a/sdk/go/common/resource/resource_goal.go +++ b/sdk/go/common/resource/resource_goal.go @@ -15,7 +15,7 @@ package resource import ( - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // Goal is a desired state for a resource object. Normally it represents a subset of the resource's state expressed by diff --git a/sdk/go/common/resource/resource_state.go b/sdk/go/common/resource/resource_state.go index 7264215b9..d38f2a457 100644 --- a/sdk/go/common/resource/resource_state.go +++ b/sdk/go/common/resource/resource_state.go @@ -15,7 +15,7 @@ package resource import ( - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/sdk/go/common/resource/stack.go b/sdk/go/common/resource/stack.go index 97dde78b0..48a68eaa5 100644 --- a/sdk/go/common/resource/stack.go +++ b/sdk/go/common/resource/stack.go @@ -15,7 +15,7 @@ package resource import ( - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // RootStackType is the type name that will be used for the root component in the Pulumi resource tree. diff --git a/sdk/go/common/resource/urn.go b/sdk/go/common/resource/urn.go index e79458722..089d6ec85 100644 --- a/sdk/go/common/resource/urn.go +++ b/sdk/go/common/resource/urn.go @@ -17,7 +17,7 @@ package resource import ( "strings" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/sdk/go/common/resource/urn_test.go b/sdk/go/common/resource/urn_test.go index 70f9675d5..9acae2f28 100644 --- a/sdk/go/common/resource/urn_test.go +++ b/sdk/go/common/resource/urn_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) func TestURNRoundTripping(t *testing.T) { diff --git a/pkg/tokens/names.go b/sdk/go/common/tokens/names.go similarity index 100% rename from pkg/tokens/names.go rename to sdk/go/common/tokens/names.go diff --git a/pkg/tokens/names_test.go b/sdk/go/common/tokens/names_test.go similarity index 100% rename from pkg/tokens/names_test.go rename to sdk/go/common/tokens/names_test.go diff --git a/pkg/tokens/tokens.go b/sdk/go/common/tokens/tokens.go similarity index 100% rename from pkg/tokens/tokens.go rename to sdk/go/common/tokens/tokens.go diff --git a/pkg/tokens/tokens_test.go b/sdk/go/common/tokens/tokens_test.go similarity index 100% rename from pkg/tokens/tokens_test.go rename to sdk/go/common/tokens/tokens_test.go diff --git a/sdk/go/common/workspace/paths.go b/sdk/go/common/workspace/paths.go index 06f232c21..40b866b81 100644 --- a/sdk/go/common/workspace/paths.go +++ b/sdk/go/common/workspace/paths.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/encoding" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/pkg/util/fsutil" ) diff --git a/sdk/go/common/workspace/project.go b/sdk/go/common/workspace/project.go index d26a8f944..216b68b26 100644 --- a/sdk/go/common/workspace/project.go +++ b/sdk/go/common/workspace/project.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/encoding" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) // Analyzers is a list of analyzers to run on this project. diff --git a/sdk/go/common/workspace/workspace.go b/sdk/go/common/workspace/workspace.go index 8e4e0d144..e5c8d01c9 100644 --- a/sdk/go/common/workspace/workspace.go +++ b/sdk/go/common/workspace/workspace.go @@ -26,7 +26,7 @@ import ( "sync" "github.com/pkg/errors" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" ) diff --git a/sdk/go/pulumi/mocks.go b/sdk/go/pulumi/mocks.go index fae3048b7..02e1826ec 100644 --- a/sdk/go/pulumi/mocks.go +++ b/sdk/go/pulumi/mocks.go @@ -4,7 +4,7 @@ import ( "log" "github.com/golang/protobuf/ptypes/empty" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "golang.org/x/net/context" diff --git a/tests/integration/transformations/transformations_test.go b/tests/integration/transformations/transformations_test.go index 515a9290b..3ede124a7 100644 --- a/tests/integration/transformations/transformations_test.go +++ b/tests/integration/transformations/transformations_test.go @@ -10,7 +10,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/pkg/testing/integration" - "github.com/pulumi/pulumi/pkg/tokens" + "github.com/pulumi/pulumi/sdk/go/common/tokens" ) var dirs = []string{