Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prototyping explicit sharing for Quicksight types #4449

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions examples/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/iam v1.35.0
github.com/pulumi/providertest v0.0.14
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another pre-release bridge feature in use.

github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3
github.com/pulumi/pulumi/pkg/v3 v3.130.0
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -447,7 +447,7 @@ require (
github.com/pulumi/esc v0.9.1 // indirect
github.com/pulumi/inflector v0.1.1 // indirect
github.com/pulumi/pulumi-java/pkg v0.14.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240911150014-7864bb06caa7 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect
github.com/pulumi/pulumi-yaml v1.9.2 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.130.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions examples/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2439,12 +2439,12 @@ github.com/pulumi/providertest v0.0.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2p
github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
github.com/pulumi/pulumi-java/pkg v0.14.0 h1:CKL7lLF81Fq6VRhA5TNFsSMnHraTNCUzIhqCzYX8Wzk=
github.com/pulumi/pulumi-java/pkg v0.14.0/go.mod h1:VybuJMWJtJc9ZNbt1kcYH4TbpocMx9mEi7YWL2Co99c=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7 h1:DWbPzzS1OBBa/q9jty33wIXamrXhqn5mVCWiUOwvJYA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7/go.mod h1:xdU2rcUBjPX/alXMiywUK1GvN4goUHZxos8ZfT6sVXM=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9 h1:t7T8zQ/0JXZcEcHGCuy1fBHwki0CJo9Vc+sefCTuFSI=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9/go.mod h1:xdU2rcUBjPX/alXMiywUK1GvN4goUHZxos8ZfT6sVXM=
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.90.1-0.20240911150014-7864bb06caa7 h1:XAog9hKRAAV0D/wulmrFbn+dZAALBg/MMJpLPmUxLPg=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240911150014-7864bb06caa7/go.mod h1:dIVp4qG+GsUwmpz40L7Z+PZnzHf3cQq1CAFwhz++ris=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9 h1:JXobLumbIqNOyMup7PLiFqFWN1LjYFLJtQABViAsBsE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9/go.mod h1:dIVp4qG+GsUwmpz40L7Z+PZnzHf3cQq1CAFwhz++ris=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY=
github.com/pulumi/pulumi-yaml v1.9.2 h1:BCUuRPA1USmFXrExiHRU8yJ+OiphLYnroPxKRgGCJrs=
Expand Down
13,424 changes: 12,069 additions & 1,355 deletions provider/cmd/pulumi-resource-aws/schema.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module github.com/pulumi/pulumi-aws/provider/v6

go 1.23.0

toolchain go1.23.1

require (
github.com/aws/aws-sdk-go-v2 v1.30.4
github.com/aws/aws-sdk-go-v2/config v1.27.28
Expand All @@ -15,8 +17,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.14
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240911150014-7864bb06caa7
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9
github.com/pulumi/pulumi/pkg/v3 v3.130.0
github.com/pulumi/pulumi/sdk/v3 v3.130.0
github.com/stretchr/testify v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2439,10 +2439,10 @@ github.com/pulumi/providertest v0.0.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2p
github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
github.com/pulumi/pulumi-java/pkg v0.14.0 h1:CKL7lLF81Fq6VRhA5TNFsSMnHraTNCUzIhqCzYX8Wzk=
github.com/pulumi/pulumi-java/pkg v0.14.0/go.mod h1:VybuJMWJtJc9ZNbt1kcYH4TbpocMx9mEi7YWL2Co99c=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7 h1:DWbPzzS1OBBa/q9jty33wIXamrXhqn5mVCWiUOwvJYA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240911150014-7864bb06caa7/go.mod h1:xdU2rcUBjPX/alXMiywUK1GvN4goUHZxos8ZfT6sVXM=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240911150014-7864bb06caa7 h1:XAog9hKRAAV0D/wulmrFbn+dZAALBg/MMJpLPmUxLPg=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240911150014-7864bb06caa7/go.mod h1:dIVp4qG+GsUwmpz40L7Z+PZnzHf3cQq1CAFwhz++ris=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9 h1:t7T8zQ/0JXZcEcHGCuy1fBHwki0CJo9Vc+sefCTuFSI=
github.com/pulumi/pulumi-terraform-bridge/pf v0.43.1-0.20240912152522-f0fee4fb1db9/go.mod h1:xdU2rcUBjPX/alXMiywUK1GvN4goUHZxos8ZfT6sVXM=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9 h1:JXobLumbIqNOyMup7PLiFqFWN1LjYFLJtQABViAsBsE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.1-0.20240912152522-f0fee4fb1db9/go.mod h1:dIVp4qG+GsUwmpz40L7Z+PZnzHf3cQq1CAFwhz++ris=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY=
github.com/pulumi/pulumi-yaml v1.9.2 h1:BCUuRPA1USmFXrExiHRU8yJ+OiphLYnroPxKRgGCJrs=
Expand Down
1 change: 1 addition & 0 deletions provider/pkg/quicksight/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared-types-detected.json
49 changes: 49 additions & 0 deletions provider/pkg/quicksight/quicksight.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package quicksight

import (
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)

const (
quicksightMod = "Quicksight" // Quicksight
)

func ConfigureQuicksight(
providerInfo *info.Provider,
awsResource func(mod string, name string) tokens.Type,
awsDataSource func(mod string, name string) tokens.ModuleMember,
) {
quickSightResources := map[string]*info.Resource{
"aws_quicksight_account_subscription": {Tok: awsResource(quicksightMod, "AccountSubscription")},
"aws_quicksight_data_set": {Tok: awsResource(quicksightMod, "DataSet")},
"aws_quicksight_group": {Tok: awsResource(quicksightMod, "Group")},
"aws_quicksight_user": {Tok: awsResource(quicksightMod, "User")},
"aws_quicksight_group_membership": {Tok: awsResource(quicksightMod, "GroupMembership")},
"aws_quicksight_data_source": {Tok: awsResource(quicksightMod, "DataSource")},
"aws_quicksight_folder": {Tok: awsResource(quicksightMod, "Folder")},
"aws_quicksight_template": {Tok: awsResource(quicksightMod, "Template")},
"aws_quicksight_analysis": {Tok: awsResource(quicksightMod, "Analysis")},
"aws_quicksight_dashboard": {Tok: awsResource(quicksightMod, "Dashboard")},
}

for k, v := range quickSightResources {
providerInfo.Resources[k] = v
}

quickSightDataSources := map[string]*info.DataSource{
"aws_quicksight_data_set": {Tok: awsDataSource(quicksightMod, "getDataSet")},
"aws_quicksight_group": {Tok: awsDataSource(quicksightMod, "getQuicksightGroup")},
"aws_quicksight_user": {Tok: awsDataSource(quicksightMod, "getQuicksightUser")},
}

for k, v := range quickSightDataSources {
providerInfo.DataSources[k] = v
}

st, err := readSharedTypesFile("provider/pkg/quicksight/shared-types-rewrites.json")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need to use embed here. Also file is currently too large. If X~>Y, then X.foo ~> Y.foo rewrites are redundant.

contract.AssertNoErrorf(err, "failed to read shared-types-rewrites.json")

shareTypes(st, providerInfo)
}
Loading
Loading