diff --git a/pkg/backend/display/display.go b/pkg/backend/display/display.go index 600ea314d..8ab012007 100644 --- a/pkg/backend/display/display.go +++ b/pkg/backend/display/display.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "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/util/logging" ) // ShowEvents reads events from the `events` channel until it is closed, displaying each event as diff --git a/pkg/backend/display/json.go b/pkg/backend/display/json.go index df2b1a055..a30ab3128 100644 --- a/pkg/backend/display/json.go +++ b/pkg/backend/display/json.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/resource/stack" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // massagePropertyValue takes a property value and strips out the secrets annotations from it. If showSecrets is diff --git a/pkg/backend/filestate/backend.go b/pkg/backend/filestate/backend.go index 89eb5b7da..b273fda9c 100644 --- a/pkg/backend/filestate/backend.go +++ b/pkg/backend/filestate/backend.go @@ -50,7 +50,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/validation" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/backend/filestate/bucket.go b/pkg/backend/filestate/bucket.go index fba8c0175..25515d420 100644 --- a/pkg/backend/filestate/bucket.go +++ b/pkg/backend/filestate/bucket.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "gocloud.dev/blob" ) diff --git a/pkg/backend/filestate/state.go b/pkg/backend/filestate/state.go index 03c80c6d0..f8c5b3c13 100644 --- a/pkg/backend/filestate/state.go +++ b/pkg/backend/filestate/state.go @@ -40,7 +40,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/backend/httpstate/backend.go b/pkg/backend/httpstate/backend.go index 9eb93c92c..732acb8d0 100644 --- a/pkg/backend/httpstate/backend.go +++ b/pkg/backend/httpstate/backend.go @@ -50,7 +50,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/retry" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/backend/httpstate/client/api.go b/pkg/backend/httpstate/client/api.go index 45f8c6b58..38455964f 100644 --- a/pkg/backend/httpstate/client/api.go +++ b/pkg/backend/httpstate/client/api.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/apitype" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/util/httputil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/tracing" "github.com/pulumi/pulumi/sdk/go/common/version" ) diff --git a/pkg/backend/httpstate/state.go b/pkg/backend/httpstate/state.go index 2435d73a8..3bce9a73e 100644 --- a/pkg/backend/httpstate/state.go +++ b/pkg/backend/httpstate/state.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pkg/errors" "github.com/pulumi/pulumi/sdk/go/common/apitype" diff --git a/pkg/backend/snapshot.go b/pkg/backend/snapshot.go index 1ce5ce509..6dba603b8 100644 --- a/pkg/backend/snapshot.go +++ b/pkg/backend/snapshot.go @@ -25,7 +25,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/pkg/secrets" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/version" ) diff --git a/pkg/backend/watch.go b/pkg/backend/watch.go index 5e6ea7cc6..45d045627 100644 --- a/pkg/backend/watch.go +++ b/pkg/backend/watch.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/pkg/backend/display" "github.com/pulumi/pulumi/sdk/go/common/diag/colors" "github.com/pulumi/pulumi/pkg/operations" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/cmd/new.go b/pkg/cmd/new.go index 8522a685b..5d2ee3619 100644 --- a/pkg/cmd/new.go +++ b/pkg/cmd/new.go @@ -42,7 +42,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/cmd/pulumi-language-dotnet/main.go b/pkg/cmd/pulumi-language-dotnet/main.go index 607e3a3e7..60478c676 100644 --- a/pkg/cmd/pulumi-language-dotnet/main.go +++ b/pkg/cmd/pulumi-language-dotnet/main.go @@ -28,7 +28,7 @@ import ( pbempty "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/sdk/go/common/version" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/pkg/cmd/pulumi-language-go/main.go b/pkg/cmd/pulumi-language-go/main.go index 84c0a0d08..b946c5f55 100644 --- a/pkg/cmd/pulumi-language-go/main.go +++ b/pkg/cmd/pulumi-language-go/main.go @@ -30,7 +30,7 @@ import ( "google.golang.org/grpc" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/sdk/go/common/version" "github.com/pulumi/pulumi/sdk/go/pulumi" diff --git a/pkg/cmd/pulumi-language-nodejs/main.go b/pkg/cmd/pulumi-language-nodejs/main.go index 496ddb264..9bbffd076 100644 --- a/pkg/cmd/pulumi-language-nodejs/main.go +++ b/pkg/cmd/pulumi-language-nodejs/main.go @@ -48,7 +48,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/config" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/sdk/go/common/version" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/pkg/cmd/pulumi-language-nodejs/proxy.go b/pkg/cmd/pulumi-language-nodejs/proxy.go index 6aa2330f3..ab78b0db3 100644 --- a/pkg/cmd/pulumi-language-nodejs/proxy.go +++ b/pkg/cmd/pulumi-language-nodejs/proxy.go @@ -24,7 +24,7 @@ import ( "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/proto" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/cmd/pulumi-language-nodejs/proxy_unix.go b/pkg/cmd/pulumi-language-nodejs/proxy_unix.go index 68cd9872a..16b9a60e2 100644 --- a/pkg/cmd/pulumi-language-nodejs/proxy_unix.go +++ b/pkg/cmd/pulumi-language-nodejs/proxy_unix.go @@ -24,7 +24,7 @@ import ( "syscall" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Unix specific pipe implementation. Fairly simple as it sits on top of a pair of standard fifo diff --git a/pkg/cmd/pulumi-language-nodejs/proxy_windows.go b/pkg/cmd/pulumi-language-nodejs/proxy_windows.go index 45b638a6f..eb1d090dc 100644 --- a/pkg/cmd/pulumi-language-nodejs/proxy_windows.go +++ b/pkg/cmd/pulumi-language-nodejs/proxy_windows.go @@ -25,7 +25,7 @@ import ( winio "github.com/Microsoft/go-winio" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Windows specific pipe implementation. Slightly complex as it sits on top of a pair of named pipes diff --git a/pkg/cmd/pulumi-language-python/main.go b/pkg/cmd/pulumi-language-python/main.go index 4cfb5b36b..7c4e25f10 100644 --- a/pkg/cmd/pulumi-language-python/main.go +++ b/pkg/cmd/pulumi-language-python/main.go @@ -38,7 +38,7 @@ import ( "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/sdk/go/common/version" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/pkg/cmd/pulumi.go b/pkg/cmd/pulumi.go index a8500863c..0301156f4 100644 --- a/pkg/cmd/pulumi.go +++ b/pkg/cmd/pulumi.go @@ -44,7 +44,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/util/httputil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/version" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go index fe15d2b04..6d9bb0eca 100644 --- a/pkg/cmd/util.go +++ b/pkg/cmd/util.go @@ -48,7 +48,7 @@ import ( "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/gitutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/tracing" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/destroy.go b/pkg/engine/destroy.go index 7f0bdf26d..55074bd6f 100644 --- a/pkg/engine/destroy.go +++ b/pkg/engine/destroy.go @@ -18,7 +18,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/events.go b/pkg/engine/events.go index bac97467b..e680b405a 100644 --- a/pkg/engine/events.go +++ b/pkg/engine/events.go @@ -28,7 +28,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Event represents an event generated by the engine during an operation. The underlying diff --git a/pkg/engine/eventsink.go b/pkg/engine/eventsink.go index f105552e3..5fcc28d6f 100644 --- a/pkg/engine/eventsink.go +++ b/pkg/engine/eventsink.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) func newEventSink(events eventEmitter, statusSink bool) diag.Sink { diff --git a/pkg/engine/lifecycle_test.go b/pkg/engine/lifecycle_test.go index 9c424b8b6..dfe114cde 100644 --- a/pkg/engine/lifecycle_test.go +++ b/pkg/engine/lifecycle_test.go @@ -42,7 +42,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" "github.com/pulumi/pulumi/sdk/go/common/workspace" diff --git a/pkg/engine/plugins.go b/pkg/engine/plugins.go index 78064940e..dbf37e29a 100644 --- a/pkg/engine/plugins.go +++ b/pkg/engine/plugins.go @@ -27,7 +27,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/plugins_test.go b/pkg/engine/plugins_test.go index f15b2e19e..9c34deadd 100644 --- a/pkg/engine/plugins_test.go +++ b/pkg/engine/plugins_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/pulumi/pulumi/sdk/go/common/tokens" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/query.go b/pkg/engine/query.go index ad0eb1eff..d73cbcb58 100644 --- a/pkg/engine/query.go +++ b/pkg/engine/query.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/pkg/util/fsutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/engine/refresh.go b/pkg/engine/refresh.go index c4161556d..cab15a29d 100644 --- a/pkg/engine/refresh.go +++ b/pkg/engine/refresh.go @@ -18,7 +18,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/engine/update.go b/pkg/engine/update.go index e97855cbe..6bbfba6cb 100644 --- a/pkg/engine/update.go +++ b/pkg/engine/update.go @@ -33,7 +33,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/npm/npm.go b/pkg/npm/npm.go index 916455e1f..4ff1adb8d 100644 --- a/pkg/npm/npm.go +++ b/pkg/npm/npm.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Pack runs `npm pack` in the given directory, packaging the Node.js app located there into a diff --git a/pkg/operations/operations_aws.go b/pkg/operations/operations_aws.go index 1ad6e6186..554dd5b25 100644 --- a/pkg/operations/operations_aws.go +++ b/pkg/operations/operations_aws.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/config" "github.com/pulumi/pulumi/sdk/go/common/tokens" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the diff --git a/pkg/operations/operations_cloud_aws.go b/pkg/operations/operations_cloud_aws.go index a478faad2..ce3a31d22 100644 --- a/pkg/operations/operations_cloud_aws.go +++ b/pkg/operations/operations_cloud_aws.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/config" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the diff --git a/pkg/operations/operations_gcp.go b/pkg/operations/operations_gcp.go index 9d2a71427..d7b1e947d 100644 --- a/pkg/operations/operations_gcp.go +++ b/pkg/operations/operations_gcp.go @@ -31,7 +31,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/resource/config" "github.com/pulumi/pulumi/sdk/go/common/tokens" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // TODO[pulumi/pulumi#54] This should be factored out behind an OperationsProvider RPC interface and versioned with the diff --git a/pkg/resource/deploy/plan_executor.go b/pkg/resource/deploy/plan_executor.go index bedf6c620..e8d572109 100644 --- a/pkg/resource/deploy/plan_executor.go +++ b/pkg/resource/deploy/plan_executor.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/pkg/resource/deploy/providers" "github.com/pulumi/pulumi/pkg/resource/graph" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/deploy/providers/registry.go b/pkg/resource/deploy/providers/registry.go index 3693f2b71..0608c6a0a 100644 --- a/pkg/resource/deploy/providers/registry.go +++ b/pkg/resource/deploy/providers/registry.go @@ -26,7 +26,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go index 8d61d1ef7..2dd630e33 100644 --- a/pkg/resource/deploy/source_eval.go +++ b/pkg/resource/deploy/source_eval.go @@ -31,7 +31,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/rpcutil" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" diff --git a/pkg/resource/deploy/source_query.go b/pkg/resource/deploy/source_query.go index a79906b22..2edcddeeb 100644 --- a/pkg/resource/deploy/source_query.go +++ b/pkg/resource/deploy/source_query.go @@ -31,7 +31,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" "github.com/pulumi/pulumi/pkg/util/rpcutil" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/pkg/resource/deploy/step.go b/pkg/resource/deploy/step.go index f02ed3767..04a8c3228 100644 --- a/pkg/resource/deploy/step.go +++ b/pkg/resource/deploy/step.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // StepCompleteFunc is the type of functions returned from Step.Apply. These functions are to be called diff --git a/pkg/resource/deploy/step_executor.go b/pkg/resource/deploy/step_executor.go index 212e1c1d6..23ab1202b 100644 --- a/pkg/resource/deploy/step_executor.go +++ b/pkg/resource/deploy/step_executor.go @@ -24,7 +24,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag" "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) const ( diff --git a/pkg/resource/deploy/step_generator.go b/pkg/resource/deploy/step_generator.go index 3863afb8b..0b0341f90 100644 --- a/pkg/resource/deploy/step_generator.go +++ b/pkg/resource/deploy/step_generator.go @@ -27,7 +27,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/pkg/resource/provider/main.go b/pkg/resource/provider/main.go index 803e6913a..8a8b7f1dc 100644 --- a/pkg/resource/provider/main.go +++ b/pkg/resource/provider/main.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc" "github.com/pulumi/pulumi/pkg/util/cmdutil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" ) diff --git a/pkg/util/cmdutil/exit.go b/pkg/util/cmdutil/exit.go index 1462e09d1..55eb12728 100644 --- a/pkg/util/cmdutil/exit.go +++ b/pkg/util/cmdutil/exit.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/pulumi/pulumi/sdk/go/common/diag" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/result" ) diff --git a/sdk/go/common/diag/sink.go b/sdk/go/common/diag/sink.go index ce0379c9f..15573c0d5 100644 --- a/sdk/go/common/diag/sink.go +++ b/sdk/go/common/diag/sink.go @@ -22,7 +22,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Sink facilitates pluggable diagnostics messages. diff --git a/sdk/go/common/resource/plugin/analyzer_plugin.go b/sdk/go/common/resource/plugin/analyzer_plugin.go index 3e3dde8dc..f1ee75666 100644 --- a/sdk/go/common/resource/plugin/analyzer_plugin.go +++ b/sdk/go/common/resource/plugin/analyzer_plugin.go @@ -32,7 +32,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" "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 ba549c361..35f0119b5 100644 --- a/sdk/go/common/resource/plugin/host.go +++ b/sdk/go/common/resource/plugin/host.go @@ -27,7 +27,7 @@ import ( "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" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/workspace" ) diff --git a/sdk/go/common/resource/plugin/langruntime_plugin.go b/sdk/go/common/resource/plugin/langruntime_plugin.go index e1d0747da..56bfd07c8 100644 --- a/sdk/go/common/resource/plugin/langruntime_plugin.go +++ b/sdk/go/common/resource/plugin/langruntime_plugin.go @@ -25,7 +25,7 @@ import ( "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/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/sdk/go/common/resource/plugin/plugin.go b/sdk/go/common/resource/plugin/plugin.go index 9b4989868..4e5a6b5e0 100644 --- a/sdk/go/common/resource/plugin/plugin.go +++ b/sdk/go/common/resource/plugin/plugin.go @@ -36,7 +36,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag" "github.com/pulumi/pulumi/pkg/util/cmdutil" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil" ) diff --git a/sdk/go/common/resource/plugin/provider_plugin.go b/sdk/go/common/resource/plugin/provider_plugin.go index 1692fb6ac..94b3e80dc 100644 --- a/sdk/go/common/resource/plugin/provider_plugin.go +++ b/sdk/go/common/resource/plugin/provider_plugin.go @@ -30,7 +30,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/tokens" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/pkg/util/rpcutil/rpcerror" "github.com/pulumi/pulumi/sdk/go/common/workspace" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" diff --git a/sdk/go/common/resource/plugin/rpc.go b/sdk/go/common/resource/plugin/rpc.go index de0ff76e0..d7a14da05 100644 --- a/sdk/go/common/resource/plugin/rpc.go +++ b/sdk/go/common/resource/plugin/rpc.go @@ -23,7 +23,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // MarshalOptions controls the marshaling of RPC structures. diff --git a/sdk/go/common/util/contract/ignore.go b/sdk/go/common/util/contract/ignore.go index c9fb0ece4..ba5eb8ea0 100644 --- a/sdk/go/common/util/contract/ignore.go +++ b/sdk/go/common/util/contract/ignore.go @@ -17,7 +17,7 @@ package contract import ( "io" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // Ignore explicitly ignores a value. This is similar to `_ = x`, but tells linters ignoring is intentional. diff --git a/pkg/util/logging/log.go b/sdk/go/common/util/logging/log.go similarity index 100% rename from pkg/util/logging/log.go rename to sdk/go/common/util/logging/log.go diff --git a/pkg/util/logging/log_test.go b/sdk/go/common/util/logging/log_test.go similarity index 100% rename from pkg/util/logging/log_test.go rename to sdk/go/common/util/logging/log_test.go diff --git a/sdk/go/common/workspace/creds.go b/sdk/go/common/workspace/creds.go index 3cc8e2890..539300999 100644 --- a/sdk/go/common/workspace/creds.go +++ b/sdk/go/common/workspace/creds.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" ) // PulumiCredentialsPathEnvVar is a path to the folder where credentials are stored. diff --git a/sdk/go/common/workspace/plugins.go b/sdk/go/common/workspace/plugins.go index 49b49f2ae..f8f2ee710 100644 --- a/sdk/go/common/workspace/plugins.go +++ b/sdk/go/common/workspace/plugins.go @@ -38,7 +38,7 @@ import ( "github.com/pulumi/pulumi/sdk/go/common/diag/colors" "github.com/pulumi/pulumi/sdk/go/common/util/contract" "github.com/pulumi/pulumi/sdk/go/common/util/httputil" - "github.com/pulumi/pulumi/pkg/util/logging" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" "github.com/pulumi/pulumi/sdk/go/common/version" ) diff --git a/sdk/go/pulumi/context.go b/sdk/go/pulumi/context.go index 743bf1be2..d64796421 100644 --- a/sdk/go/pulumi/context.go +++ b/sdk/go/pulumi/context.go @@ -29,10 +29,10 @@ import ( multierror "github.com/hashicorp/go-multierror" "google.golang.org/grpc" + "github.com/pulumi/pulumi/sdk/go/common/resource" "github.com/pulumi/pulumi/sdk/go/common/resource/plugin" "github.com/pulumi/pulumi/sdk/go/common/util/contract" - "github.com/pulumi/pulumi/pkg/util/logging" - "github.com/pulumi/pulumi/sdk/go/common/resource" + "github.com/pulumi/pulumi/sdk/go/common/util/logging" pulumirpc "github.com/pulumi/pulumi/sdk/proto/go" )