Skip to content

Commit

Permalink
Lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@t0yv0
t0yv0 committed Dec 11, 2024
1 parent 0df0b48 commit a72637c
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dynamic/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"path"
"strings"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/fixup"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto"
Expand Down
2 changes: 1 addition & 1 deletion dynamic/info_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (

"github.com/hashicorp/terraform-plugin-go/tfprotov6"
"github.com/hashicorp/terraform-plugin-go/tftypes"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
)
Expand Down
3 changes: 2 additions & 1 deletion dynamic/internal/shim/grpcutil/replay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ import (
"encoding/json"
"strings"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"google.golang.org/grpc"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/reflect/protoreflect"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
)

// LogReplayProvider is a provider that replays logs from a previous run.
Expand Down
1 change: 1 addition & 0 deletions dynamic/internal/shim/protov5/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"context"

"github.com/hashicorp/terraform-plugin-go/tfprotov5"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/grpcutil"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov5/translate"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin5"
Expand Down
3 changes: 2 additions & 1 deletion dynamic/internal/shim/protov5/translate/tfplugin5.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ package translate
import (
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
"github.com/hashicorp/terraform-plugin-go/tftypes"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin5"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin5"
)

func GetMetadataRequest(i *tfprotov5.GetMetadataRequest) *tfplugin5.GetMetadata_Request {
Expand Down
1 change: 1 addition & 0 deletions dynamic/internal/shim/protov6/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"context"

"github.com/hashicorp/terraform-plugin-go/tfprotov6"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/grpcutil"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov6/translate"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
Expand Down
3 changes: 2 additions & 1 deletion dynamic/internal/shim/protov6/translate/tfplugin6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ package translate
import (
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
"github.com/hashicorp/terraform-plugin-go/tftypes"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
)

func GetMetadataRequest(i *tfprotov6.GetMetadataRequest) *tfplugin6.GetMetadata_Request {
Expand Down
11 changes: 6 additions & 5 deletions dynamic/internal/shim/run/loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ import (
"github.com/hashicorp/terraform-plugin-mux/tf5to6server"
disco "github.com/hashicorp/terraform-svchost/disco"
tfaddr "github.com/opentofu/registry-address"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

v5shim "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov5"
v6shim "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov6"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
Expand All @@ -39,11 +45,6 @@ import (
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/opentofu/providercache"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin5"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/vendored/tfplugin6"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
"github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

// envPluginCache allows users to override where we cache TF providers used by
Expand Down
4 changes: 2 additions & 2 deletions dynamic/log_replay_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/hashicorp/terraform-plugin-go/tftypes"
"github.com/pulumi/providertest/pulumitest/optnewstack"
"github.com/pulumi/providertest/pulumitest/opttest"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/grpcutil"
v6shim "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov6"
"github.com/stretchr/testify/require"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/grpcutil"
v6shim "github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/protov6"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tests/pulcheck"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
Expand Down
2 changes: 1 addition & 1 deletion dynamic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"os"

"github.com/blang/semver"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
"github.com/pulumi/pulumi/sdk/v3/go/common/diag/colors"
"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"

"github.com/pulumi/pulumi-terraform-bridge/dynamic/internal/shim/run"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/parameterize"
"github.com/pulumi/pulumi-terraform-bridge/dynamic/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/proto"
Expand Down

0 comments on commit a72637c

Please sign in to comment.