From e6a0f383fc7daf1597d0bad17794093d6be92066 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 11 Oct 2024 10:53:10 -0700 Subject: [PATCH] Mark old modules as deprecated This should only be merged well after our automated upgrades have pointed downstream providers at the new import paths. --- pf/proto/empty.go | 2 +- pf/proto/protov6.go | 4 ++-- pf/provider.go | 2 +- pf/tfbridge/extend.go | 6 +++--- pf/tfbridge/main.go | 6 +++--- pf/tfbridge/metadata.go | 2 +- pf/tfbridge/provider.go | 10 +++++----- pf/tfgen/gen.go | 7 ++++--- pf/tfgen/main.go | 4 ++-- testing/x/json_match.go | 6 +++--- testing/x/replay.go | 6 +++--- x/muxer/main.go | 4 ++-- x/muxer/mapping.go | 4 ++-- x/muxer/muxer.go | 8 ++++---- 14 files changed, 36 insertions(+), 35 deletions(-) diff --git a/pf/proto/empty.go b/pf/proto/empty.go index f093e1cc0..eb07b6312 100644 --- a/pf/proto/empty.go +++ b/pf/proto/empty.go @@ -18,5 +18,5 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.Empty instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.Empty instead. var Empty = pkgpf.Empty diff --git a/pf/proto/protov6.go b/pf/proto/protov6.go index e6692cf80..efd6384ed 100644 --- a/pf/proto/protov6.go +++ b/pf/proto/protov6.go @@ -24,8 +24,8 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.New instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.New instead. var New = pkgpf.New -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.Provider instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto.Provider instead. type Provider = pkgpf.Provider diff --git a/pf/provider.go b/pf/provider.go index a25c82a64..316e315d7 100644 --- a/pf/provider.go +++ b/pf/provider.go @@ -18,5 +18,5 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf.ShimProvider instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf.ShimProvider instead. type ShimProvider = pkgpf.ShimProvider diff --git a/pf/tfbridge/extend.go b/pf/tfbridge/extend.go index f4271279d..ce1562049 100644 --- a/pf/tfbridge/extend.go +++ b/pf/tfbridge/extend.go @@ -18,11 +18,11 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProviderWithContext instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProviderWithContext instead. var SchemaOnlyPluginFrameworkProvider = pkgpf.SchemaOnlyPluginFrameworkProvider -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MuxShimWithPF instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MuxShimWithPF instead. var MuxShimWithPF = pkgpf.MuxShimWithPF -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MuxShimWithDisjointgPF instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MuxShimWithDisjointgPF instead. var MuxShimWithDisjointgPF = pkgpf.MuxShimWithDisjointgPF diff --git a/pf/tfbridge/main.go b/pf/tfbridge/main.go index e95a73639..2fc63d20a 100644 --- a/pf/tfbridge/main.go +++ b/pf/tfbridge/main.go @@ -18,11 +18,11 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.Main instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.Main instead. var Main = pkgpf.Main -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MainWithMuxer instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MainWithMuxer instead. var MainWithMuxer = pkgpf.MainWithMuxer -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MakeMuxedServer instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.MakeMuxedServer instead. var MakeMuxedServer = pkgpf.MakeMuxedServer diff --git a/pf/tfbridge/metadata.go b/pf/tfbridge/metadata.go index 6ced28f9b..ea4f23944 100644 --- a/pf/tfbridge/metadata.go +++ b/pf/tfbridge/metadata.go @@ -18,5 +18,5 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ProviderMetadata instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ProviderMetadata instead. type ProviderMetadata = pkgpf.ProviderMetadata diff --git a/pf/tfbridge/provider.go b/pf/tfbridge/provider.go index 9e641ebb8..5dd766f16 100644 --- a/pf/tfbridge/provider.go +++ b/pf/tfbridge/provider.go @@ -18,18 +18,18 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.NewProvider instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.NewProvider instead. var NewProvider = pkgpf.NewProvider -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProvider instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProvider instead. var ShimProvider = pkgpf.ShimProvider -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProviderWithContext instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.ShimProviderWithContext instead. var ShimProviderWithContext = pkgpf.ShimProviderWithContext -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.NewProviderServer instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.NewProviderServer instead. var NewProviderServer = pkgpf.NewProviderServer -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.XParameterizeResetProvider instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge.XParameterizeResetProvider instead. var XParameterizeResetProvider = pkgpf.XParameterizeResetProvider diff --git a/pf/tfgen/gen.go b/pf/tfgen/gen.go index c55654f22..f6e615a20 100644 --- a/pf/tfgen/gen.go +++ b/pf/tfgen/gen.go @@ -18,11 +18,12 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchemaOptions instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchemaOptions instead. type GenerateSchemaOptions = pkgpf.GenerateSchemaOptions -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchemaResult instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchemaResult instead. type GenerateSchemaResult = pkgpf.GenerateSchemaResult -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchema instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.GenerateSchema instead. var GenerateSchema = pkgpf.GenerateSchema + diff --git a/pf/tfgen/main.go b/pf/tfgen/main.go index 4794581c3..16b43d52a 100644 --- a/pf/tfgen/main.go +++ b/pf/tfgen/main.go @@ -18,8 +18,8 @@ import ( pkgpf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.Main instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.Main instead. var Main = pkgpf.Main -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.MainWithMuxer instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen.MainWithMuxer instead. var MainWithMuxer = pkgpf.MainWithMuxer diff --git a/testing/x/json_match.go b/testing/x/json_match.go index bbeb9ba17..b327c6ec2 100644 --- a/testing/x/json_match.go +++ b/testing/x/json_match.go @@ -18,11 +18,11 @@ import ( pkgtesting "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.JSONMatchOption instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.JSONMatchOption instead. type JSONMatchOption = pkgtesting.JSONMatchOption -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.WithUnorderedArrayPaths instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.WithUnorderedArrayPaths instead. var WithUnorderedArrayPaths = pkgtesting.WithUnorderedArrayPaths -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.AssertJSONMatchesPattern instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.AssertJSONMatchesPattern instead. var AssertJSONMatchesPattern = pkgtesting.AssertJSONMatchesPattern diff --git a/testing/x/replay.go b/testing/x/replay.go index dca5955d2..923b37e19 100644 --- a/testing/x/replay.go +++ b/testing/x/replay.go @@ -16,11 +16,11 @@ package testing import pkgtesting "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing" -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.Replay instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.Replay instead. var Replay = pkgtesting.Replay -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.ReplaySequence instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.ReplaySequence instead. var ReplaySequence = pkgtesting.ReplaySequence -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.ReplayFile instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/testing.ReplayFile instead. var ReplayFile = pkgtesting.ReplayFile diff --git a/x/muxer/main.go b/x/muxer/main.go index 7978f6b87..b611ac0a1 100644 --- a/x/muxer/main.go +++ b/x/muxer/main.go @@ -18,8 +18,8 @@ import ( pkgx "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.Main instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.Main instead. type Main = pkgx.Main -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.Endpoint instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.Endpoint instead. type Endpoint = pkgx.Endpoint diff --git a/x/muxer/mapping.go b/x/muxer/mapping.go index 885dd5d11..bb07daecf 100644 --- a/x/muxer/mapping.go +++ b/x/muxer/mapping.go @@ -18,8 +18,8 @@ import ( pkgx "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" ) -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.DispatchTable instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.DispatchTable instead. type DispatchTable = pkgx.DispatchTable -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer instead. var MergeSchemasAndComputeDispatchTable = pkgx.MergeSchemasAndComputeDispatchTable diff --git a/x/muxer/muxer.go b/x/muxer/muxer.go index 2045d5ae1..472df1ceb 100644 --- a/x/muxer/muxer.go +++ b/x/muxer/muxer.go @@ -16,14 +16,14 @@ package muxer import pkgx "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer" -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.SchemaVersion instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.SchemaVersion instead. const SchemaVersion = pkgx.SchemaVersion -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.GetMappingArgs instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.GetMappingArgs instead. type GetMappingArgs = pkgx.GetMappingArgs -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.GetMappingResponse instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.GetMappingResponse instead. type GetMappingResponse = pkgx.GetMappingResponse -// TODO(Deprecated): Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.MultiMappingHandler instead. +// Deprecated: Use github.com/pulumi/pulumi-terraform-bridge/v3/pkg/x/muxer.MultiMappingHandler instead. type MultiMappingHandler = pkgx.MultiMappingHandler