Skip to content

Commit

Permalink
Mark old modules as deprecated
Browse files Browse the repository at this point in the history
This should only be merged well after our automated upgrades have
pointed downstream providers at the new import paths.
  • Loading branch information
blampe committed Oct 11, 2024
1 parent 95a1f1d commit e6a0f38
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 35 deletions.
2 changes: 1 addition & 1 deletion pf/proto/empty.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions pf/proto/protov6.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pf/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions pf/tfbridge/extend.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions pf/tfbridge/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pf/tfbridge/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions pf/tfbridge/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions pf/tfgen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions pf/tfgen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions testing/x/json_match.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions testing/x/replay.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions x/muxer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions x/muxer/mapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions x/muxer/muxer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e6a0f38

Please sign in to comment.