Skip to content

Commit

Permalink
move schemaconvert
Browse files Browse the repository at this point in the history
  • Loading branch information
VenelinMartinov committed Jul 3, 2024
1 parent 9d05430 commit 0573b9b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
3 changes: 0 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ go 1.21

replace github.com/pulumi/pulumi-terraform-bridge/x/muxer => ./x/muxer

replace github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests => ./pkg/tests

require (
github.com/apparentlymart/go-cidr v1.1.0
github.com/blang/semver v3.5.1+incompatible
Expand Down Expand Up @@ -40,7 +38,6 @@ require (
github.com/pulumi/inflector v0.1.1
github.com/pulumi/providertest v0.0.13
github.com/pulumi/pulumi-java/pkg v0.11.0
github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests v0.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8
github.com/pulumi/pulumi-yaml v1.8.0
github.com/pulumi/schema-tools v0.1.2
Expand Down
2 changes: 1 addition & 1 deletion pf/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/hashicorp/terraform-plugin-go v0.22.0
github.com/hashicorp/terraform-plugin-log v0.9.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/pulumi/providertest v0.0.11
github.com/pulumi/providertest v0.0.13
github.com/pulumi/pulumi-terraform-bridge/v3 v3.86.0
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions pf/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1900,8 +1900,8 @@ github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs=
github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c=
github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+SobA=
github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
github.com/pulumi/providertest v0.0.11 h1:mg8MQ7Cq7+9XlHIkBD+aCqQO4mwAJEISngZgVdnQUe8=
github.com/pulumi/providertest v0.0.11/go.mod h1:HsxjVsytcMIuNj19w1lT2W0QXY0oReXl1+h6eD2JXP8=
github.com/pulumi/providertest v0.0.13 h1:9CAaoviOTuCVHDI15h3znXa5JsKYtXLYHIIdxOCzo3Y=
github.com/pulumi/providertest v0.0.13/go.mod h1:REAoaN+hGOtdWJGirfWYqcSjCejlbGfzyVTUuemJTuE=
github.com/pulumi/pulumi-java/pkg v0.11.0 h1:Jw9gBvyfmfOMq/EkYDm9+zGPxsDAA8jfeMpHmtZ+1oA=
github.com/pulumi/pulumi-java/pkg v0.11.0/go.mod h1:sXAk25P47AQVQL6ilAbFmRNgZykC7og/+87ihnqzFTc=
github.com/pulumi/pulumi-yaml v1.8.0 h1:bhmidiCMMuzsJao5FE0UR69iF3WVKPCFrRkzjotFNn4=
Expand Down
7 changes: 1 addition & 6 deletions pkg/tfbridge/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tests/schemaconvert"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/internal/schemaconvert"
shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
shimv1 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v1"
shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
Expand Down Expand Up @@ -1931,7 +1931,6 @@ func TestListNestedAddReplace(t *testing.T) {
},
"outp": {Type: v2Schema.TypeString, Computed: true},
},
// info
// inputs
map[string]interface{}{
"prop": []interface{}{map[string]interface{}{"nest": "foo"}},
Expand Down Expand Up @@ -1963,7 +1962,6 @@ func TestListNestedUpdate(t *testing.T) {
},
"outp": {Type: v2Schema.TypeString, Computed: true},
},
// info
// inputs
map[string]interface{}{
"prop": []interface{}{map[string]interface{}{"nest": "foo"}},
Expand Down Expand Up @@ -1995,7 +1993,6 @@ func TestListNestedDeleteReplace(t *testing.T) {
},
"outp": {Type: v2Schema.TypeString, Computed: true},
},
// info
// inputs
map[string]interface{}{},
// state
Expand Down Expand Up @@ -2025,7 +2022,6 @@ func TestSetNestedDeleteReplace(t *testing.T) {
},
"outp": {Type: v2Schema.TypeString, Computed: true},
},
// info
// inputs
map[string]interface{}{},
// state
Expand Down Expand Up @@ -2056,7 +2052,6 @@ func TestListNestedAddMaxItemsOne(t *testing.T) {
},
"outp": {Type: v2Schema.TypeString, Computed: true},
},
// info
// inputs
map[string]interface{}{
"prop": map[string]interface{}{"nest": "foo"},
Expand Down
File renamed without changes.

0 comments on commit 0573b9b

Please sign in to comment.