Skip to content

Commit

Permalink
Remove QuickSight hack in favor of bridge change (#3067)
Browse files Browse the repository at this point in the history 
Taking advantage of pulumi/pulumi-terraform-bridge#1548, this PR removes
the quicksight schema customizations since `Omit` now does the right
thing on its own.

This has the advantage of removing these unusable mappings from
`bridge-metadata.json`.
  • Loading branch information
@iwahbe
iwahbe committed Nov 30, 2023
1 parent 13df4eb commit 08345fd
Show file tree
Hide file tree
Showing 9 changed files with 209 additions and 88,856 deletions.
6 changes: 3 additions & 3 deletions examples/go.mod
View file
Expand Up @@ -5,7 +5,7 @@ go 1.21.0
require (
github.com/aws/aws-sdk-go v1.48.7
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3
github.com/pulumi/pulumi/pkg/v3 v3.94.2
github.com/stretchr/testify v1.8.4
Expand Down Expand Up @@ -276,8 +276,8 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/esc v0.6.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.94.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
Expand Down
12 changes: 6 additions & 6 deletions examples/go.sum
View file
Expand Up @@ -2374,14 +2374,14 @@ github.com/pulumi/esc v0.6.0 h1:m8jWgBektlj26RvrN3/sM0r1lYiwTMmqVPvLxCxahGE=
github.com/pulumi/esc v0.6.0/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g=
github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZrF99s=
github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5 h1:c9GgvZd6qKwE4Tc9NNM3mMYju/XBcVMyFxXVeEUT1KA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4 h1:ddTvIIXXocPS2eiQO9oZxuUi0KDZ7v84NOPTNwetWmE=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3 h1:bBWWeAtSPPYpKYlPZr2h0BiYgWQpHRIk0HO/MQmB+jc=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3/go.mod h1:vAQ7DeddebQ7FHdRaSG6ijuS28FS9PC4j8Y9wUuue0c=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 h1:yfRy8v1faXi3uugjdPD8NC99a2f6wdu64hOqf8K6vBE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4 h1:WITOhFF9PhccW58gk1KdC2OQwe4I0ckVCKxES8K/jBc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4 h1:8lK+vlRrnAxB6K3J2YIPAq50ETpvvWZ92vi66Hko/4o=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4/go.mod h1:F/fzVS4Ksc4SPPLtMjGFRM9M76QtM1Rc0CYGnHCHEwU=
github.com/pulumi/pulumi/pkg/v3 v3.94.2 h1:b+gQ+EJZMYfSIu/sb/+p36VmfZ2ZJWbEWMsptt2f6Kk=
github.com/pulumi/pulumi/pkg/v3 v3.94.2/go.mod h1:aCeDMlncyDwX3RG6+vYUjWsy6bOEtoHUY0twCcn5qqE=
github.com/pulumi/pulumi/sdk/v3 v3.94.2 h1:B8W3CCzA2fX/0730o/7KQXdmqrY5KdgGtiAA6rDMVlk=
Expand Down
88,914 changes: 188 additions & 88,726 deletions provider/cmd/pulumi-resource-aws/bridge-metadata.json
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion provider/cmd/pulumi-tfgen-aws/main.go
View file
Expand Up @@ -25,7 +25,6 @@ func main() {

info.SchemaPostProcessor = func(spec *schema.PackageSpec) {
replaceWafV2TypesWithRecursive(spec)
removeUnusedQuicksightTypes(spec)
}

defer func() {
Expand Down
27 changes: 0 additions & 27 deletions provider/cmd/pulumi-tfgen-aws/quicksight.go
View file

This file was deleted.

75 changes: 0 additions & 75 deletions provider/cmd/pulumi-tfgen-aws/quicksight_test.go
View file

This file was deleted.

6 changes: 3 additions & 3 deletions provider/go.mod
View file
Expand Up @@ -9,8 +9,8 @@ require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36
github.com/mitchellh/go-homedir v1.1.0
github.com/pulumi/providertest v0.0.3
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4
github.com/pulumi/pulumi/pkg/v3 v3.94.2
github.com/pulumi/pulumi/sdk/v3 v3.94.2
github.com/stretchr/testify v1.8.4
Expand Down Expand Up @@ -304,7 +304,7 @@ require (
github.com/posener/complete v1.2.3 // indirect
github.com/pulumi/esc v0.6.0 // indirect
github.com/pulumi/pulumi-java/pkg v0.9.8 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4 // indirect
github.com/pulumi/pulumi-yaml v1.4.2 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
Expand Down
12 changes: 6 additions & 6 deletions provider/go.sum
View file
Expand Up @@ -2396,14 +2396,14 @@ github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZr
github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0=
github.com/pulumi/pulumi-java/pkg v0.9.8 h1:c8mYsalnRXA2Ibgvv6scefOn6mW1Vb0UT0mcDqjsivQ=
github.com/pulumi/pulumi-java/pkg v0.9.8/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5 h1:c9GgvZd6qKwE4Tc9NNM3mMYju/XBcVMyFxXVeEUT1KA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4 h1:ddTvIIXXocPS2eiQO9oZxuUi0KDZ7v84NOPTNwetWmE=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231130182140-6385710fcbc4/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1/go.mod h1:7OeUPH8rpt5ipyj9EFcnXpuzQ8SHL0dyqdfa8nOacdk=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 h1:yfRy8v1faXi3uugjdPD8NC99a2f6wdu64hOqf8K6vBE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4 h1:WITOhFF9PhccW58gk1KdC2OQwe4I0ckVCKxES8K/jBc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231130182140-6385710fcbc4/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4 h1:8lK+vlRrnAxB6K3J2YIPAq50ETpvvWZ92vi66Hko/4o=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20231130182140-6385710fcbc4/go.mod h1:F/fzVS4Ksc4SPPLtMjGFRM9M76QtM1Rc0CYGnHCHEwU=
github.com/pulumi/pulumi-yaml v1.4.2 h1:LKptNH2lG6f5IjJmR7bvu7ouBE4sgkTRNd4I8ZHmjHw=
github.com/pulumi/pulumi-yaml v1.4.2/go.mod h1:1hwsXFnT7hm2ZeftY5fzjkngjs2eT/rv9MsPE48Leb4=
github.com/pulumi/pulumi/pkg/v3 v3.94.2 h1:b+gQ+EJZMYfSIu/sb/+p36VmfZ2ZJWbEWMsptt2f6Kk=
Expand Down
12 changes: 3 additions & 9 deletions provider/resources.go
View file
Expand Up @@ -3772,29 +3772,23 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
Fields: map[string]*tfbridge.SchemaInfo{
// HACK: remove this field for now as it breaks dotnet codegen due to our current type naming strategy.
// https://github.com/pulumi/pulumi-terraform-bridge/issues/1118
"definition": {
Omit: true,
},
"definition": {Omit: true},
},
},
"aws_quicksight_analysis": {
Tok: awsResource(quicksightMod, "Analysis"),
Fields: map[string]*tfbridge.SchemaInfo{
// HACK: remove this field for now as it breaks dotnet and java codegen due to our current type naming strategy.
// https://github.com/pulumi/pulumi-terraform-bridge/issues/1118
"definition": {
Omit: true,
},
"definition": {Omit: true},
},
},
"aws_quicksight_dashboard": {
Tok: awsResource(quicksightMod, "Dashboard"),
Fields: map[string]*tfbridge.SchemaInfo{
// HACK: remove this field for now as it breaks dotnet and java codegen due to our current type naming strategy.
// https://github.com/pulumi/pulumi-terraform-bridge/issues/1118
"definition": {
Omit: true,
},
"definition": {Omit: true},
},
},
// Service Quotas
Expand Down

0 comments on commit 08345fd

Please sign in to comment.