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.

Sign up for GitHub

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

Enable Plugin Framework based resources and functions for pulumi-gcp #1075

Merged
merged 16 commits into from
May 30, 2023
Merged

Enable Plugin Framework based resources and functions for pulumi-gcp #1075

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b25adc9
Convert provider
iwahbe May 1, 2023
63f4c52
Run `make tfgen`
iwahbe May 1, 2023
fabb9b5
Run `make build_sdks`
iwahbe May 1, 2023
86feb0e
Allow no docs for new resource
iwahbe May 1, 2023
c903183
Merge branch 'master' into iwahbe/hybrid-sdk-pf-provider
t0yv0 May 17, 2023
e7929de
Update dependencies
t0yv0 May 17, 2023
94668f7
make tfgen
t0yv0 May 17, 2023
4e24304
make build_sdks
t0yv0 May 17, 2023
95137a8
Merge master
t0yv0 May 23, 2023
431ddc0
make build_sdks
t0yv0 May 23, 2023
4b077a2
pf/v0.9.2
t0yv0 May 23, 2023
a122bfc
Use version.Version
t0yv0 May 23, 2023
7340fe1
Link to upstream with reverted anti-PF datasource patch
t0yv0 May 26, 2023
5131d0d
make provider
t0yv0 May 26, 2023
174374e
make build_sdks
t0yv0 May 26, 2023
7919a03
Regenerate code
t0yv0 May 26, 2023
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
16,393 changes: 16,393 additions & 0 deletions provider/cmd/pulumi-resource-gcp/bridge-metadata.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions provider/cmd/pulumi-resource-gcp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@
package main

import (
"context"
_ "embed"

gcp "github.com/pulumi/pulumi-gcp/provider/v6"
"github.com/pulumi/pulumi-gcp/provider/v6/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
"github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
)

//go:embed schema-embed.json
var pulumiSchema []byte

func main() {
tfbridge.Main("gcp", version.Version, gcp.Provider(), pulumiSchema)
tfbridge.MainWithMuxer(context.Background(), "gcp",
gcp.Provider(), pulumiSchema)
}
4,751 changes: 2,397 additions & 2,354 deletions provider/cmd/pulumi-resource-gcp/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions provider/cmd/pulumi-tfgen-gcp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ package main

import (
gcp "github.com/pulumi/pulumi-gcp/provider/v6"
"github.com/pulumi/pulumi-gcp/provider/v6/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
"github.com/pulumi/pulumi-terraform-bridge/pf/tfgen"
)

func main() {
tfgen.Main("gcp", version.Version, gcp.Provider())
tfgen.MainWithMuxer("gcp", gcp.Provider())
}
21 changes: 11 additions & 10 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ go 1.19

require (
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20210315160117-642085ce9b99
github.com/pulumi/pulumi-terraform-bridge/v3 v3.45.0
github.com/pulumi/pulumi/pkg/v3 v3.63.0
github.com/pulumi/pulumi-terraform-bridge/pf v0.9.1
github.com/pulumi/pulumi-terraform-bridge/v3 v3.47.2
github.com/pulumi/pulumi/pkg/v3 v3.67.1
github.com/pulumi/pulumi/sdk v1.14.1
github.com/pulumi/pulumi/sdk/v3 v3.63.0
github.com/pulumi/pulumi/sdk/v3 v3.67.1
)

replace (
Expand Down Expand Up @@ -85,7 +86,7 @@ require (
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.1.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down Expand Up @@ -152,7 +153,7 @@ require (
github.com/hashicorp/terraform-exec v0.17.3 // indirect
github.com/hashicorp/terraform-json v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-framework v1.1.1 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.3 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-plugin-mux v0.8.0 // indirect
Expand All @@ -166,7 +167,7 @@ require (
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -202,9 +203,9 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/pulumi/pulumi-java/pkg v0.9.0 // indirect
github.com/pulumi/pulumi-java/pkg v0.9.2 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.3 // indirect
github.com/pulumi/pulumi-yaml v1.1.0 // indirect
github.com/pulumi/pulumi-yaml v1.1.1 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e // indirect
github.com/rivo/uniseg v0.2.0 // indirect
Expand All @@ -220,7 +221,7 @@ require (
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.2 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
Expand All @@ -241,7 +242,7 @@ require (
gocloud.dev v0.27.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
Expand Down
41 changes: 22 additions & 19 deletions provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,9 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY=
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
Expand Down Expand Up @@ -1214,8 +1215,8 @@ github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e
github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM=
github.com/hashicorp/terraform-plugin-framework v1.1.1 h1:PbnEKHsIU8KTTzoztHQGgjZUWx7Kk8uGtpGMMc1p+oI=
github.com/hashicorp/terraform-plugin-framework v1.1.1/go.mod h1:DyZPxQA+4OKK5ELxFIIcqggcszqdWWUpTLPHAhS/tkY=
github.com/hashicorp/terraform-plugin-framework-validators v0.9.0 h1:LYz4bXh3t7bTEydXOmPDPupRRnA480B/9+jV8yZvxBA=
github.com/hashicorp/terraform-plugin-framework-validators v0.9.0/go.mod h1:+BVERsnfdlhYR2YkXMBtPnmn9UsL19U3qUtSZ+Y/5MY=
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0 h1:4L0tmy/8esP6OcvocVymw52lY0HyQ5OxB7VNl7k4bS0=
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0/go.mod h1:qdQJCdimB9JeX2YwOpItEu+IrfoJjWQ5PhLpAOMDQAE=
github.com/hashicorp/terraform-plugin-go v0.14.0/go.mod h1:2nNCBeRLaenyQEi78xrGrs9hMbulveqG/zDMQSvVJTE=
github.com/hashicorp/terraform-plugin-go v0.14.3 h1:nlnJ1GXKdMwsC8g1Nh05tK2wsC3+3BL/DBBxFEki+j0=
github.com/hashicorp/terraform-plugin-go v0.14.3/go.mod h1:7ees7DMZ263q8wQ6E4RdIdR6nHHJtrdt4ogX5lPkX1A=
Expand Down Expand Up @@ -1270,8 +1271,8 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
github.com/ionos-cloud/sdk-go/v6 v6.1.0/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME=
Expand Down Expand Up @@ -1704,21 +1705,23 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/XjZNJXQmbmgQlY=
github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGOON44WyAp4Xqbbk=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi-java/pkg v0.9.0 h1:8KQG7AJVtVBoPE3+Psmhv/lvGHI8RL3/E5uT59Aken0=
github.com/pulumi/pulumi-java/pkg v0.9.0/go.mod h1:eHpNTbf4n5X3YvqoDI/+cbVIkQaycBFdsvQb/24ykpc=
github.com/pulumi/pulumi-java/pkg v0.9.2 h1:fpBwf1NHf3j5YuigOWsXPvJCAFivEp1D6aOlYIrSbr0=
github.com/pulumi/pulumi-java/pkg v0.9.2/go.mod h1:+5V4jggi3063hksi28zYvLm42UWVg3VqpR6qGZraIdM=
github.com/pulumi/pulumi-terraform-bridge/pf v0.9.1 h1:Y/RTRnPelN2FFZUkYqVX8BvNpKp0fJUBK2u5H7cBzr0=
github.com/pulumi/pulumi-terraform-bridge/pf v0.9.1/go.mod h1:gSFHOCAEiConvcxLQp5BMHOzdkwDhx0EX0gnO6lwvRQ=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.45.0 h1:W2Ul7hGPJY0Ixqvv+ZIR5LdMrQjORZ9vCf6palLysg8=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.45.0/go.mod h1:jqKILqxa7+8RK6RYyFbXsSkLVWDw62KLLkVDHSVbPXI=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.47.2 h1:uNrHr+VQJ5e8GzLt8c3iBG32KHjG3Z2YBvtTncsy39U=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.47.2/go.mod h1:bXuzPzwY73LZH5+EgdSlHTV8ed09p51ztpca2G13fLI=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.3 h1:1SmRVwRnrplcdBVVgoKYL8xqW8dCeiQPSwpGkx4ga6U=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.3/go.mod h1:n0TS1WsPjOfto6hyDZbXfNZQuLli2X9iDWt2nzmQJsg=
github.com/pulumi/pulumi-yaml v1.1.0 h1:Rm2TOS8/ZLRsgx1IOkiId7bwimbxcfPpAzSH0Tp7ePQ=
github.com/pulumi/pulumi-yaml v1.1.0/go.mod h1:SIu26o/xRupOoZgrPjgmbUn6dS7FT74pTions9CSSfU=
github.com/pulumi/pulumi/pkg/v3 v3.63.0 h1:N7kKL+42abk1T8JjZ70oZb3Y0MJX4KNXE3r/Z+5RRVU=
github.com/pulumi/pulumi/pkg/v3 v3.63.0/go.mod h1:VYy99tfLwhYsMUxMk27gTxBYh9fN1fYD/dUJGkSrK6Y=
github.com/pulumi/pulumi-yaml v1.1.1 h1:8pyBNIU8+ym0wYpjhsCqN+cutygfK1XbhY2YEeNfyXY=
github.com/pulumi/pulumi-yaml v1.1.1/go.mod h1:GhpdS6rFpwqvUtKdA+fQy8P28iNvncng39IXh5q68vE=
github.com/pulumi/pulumi/pkg/v3 v3.67.1 h1:8KdVLHoSFu9rP031Pg4iOjtHD93UurmTJn/103B2Ayk=
github.com/pulumi/pulumi/pkg/v3 v3.67.1/go.mod h1:b+d+T/jgXEwkwGZcn0kRIYCjy1RFdg5TF/t5yOI81GU=
github.com/pulumi/pulumi/sdk v1.14.1 h1:FnUPMgO2AgqvKzSBOy3F2X4nJ8n/SaXCOP2eYSNkAxk=
github.com/pulumi/pulumi/sdk v1.14.1/go.mod h1:7HttsBa/x9udp5/sO8r/ibSpoQ7/zFo7a16zHWHktZ4=
github.com/pulumi/pulumi/sdk/v3 v3.63.0 h1:XSoAON9YfjYzJz2fSjXtD0PF5rbWrATPaQ9fetx2YxY=
github.com/pulumi/pulumi/sdk/v3 v3.63.0/go.mod h1:Pb5H3OaRZg0n4TRIfY0pagR/NBIEvjp3lZe2Spr6Umc=
github.com/pulumi/pulumi/sdk/v3 v3.67.1 h1:1uzbts3YW+V/VgszWx79o7kk8G/DH+eVFxpMqLH8+Yc=
github.com/pulumi/pulumi/sdk/v3 v3.67.1/go.mod h1:A/WHc5MlxU8GpX/sRmfQ9G0/Bxxl4GNdSP7TQmy4yIw=
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Dik4Qe/+xguB8JagPyXNlbOnRiXGmq/PSPQTGunYnTk=
Expand Down Expand Up @@ -1813,8 +1816,8 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3
github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
Expand Down Expand Up @@ -2134,8 +2137,8 @@ golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
14 changes: 14 additions & 0 deletions provider/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package gcp

import (
"context"
_ "embed"
"fmt"
"os"
"path/filepath"
Expand All @@ -16,6 +17,7 @@ import (

google "github.com/hashicorp/terraform-provider-google-beta/google-beta"
"github.com/pulumi/pulumi-gcp/provider/v6/pkg/version"
pf "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/x"
shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
Expand Down Expand Up @@ -348,9 +350,13 @@ func preConfigureCallbackWithLogger(ctx context.Context, host *provider.HostClie
return nil
}

//go:embed cmd/pulumi-resource-gcp/bridge-metadata.json
var metadata []byte

// Provider returns additional overlaid schema and metadata associated with the gcp package.
func Provider() tfbridge.ProviderInfo {
p := shimv2.NewProvider(google.Provider())
p = pf.MuxShimWithPF(context.Background(), p, google.New(""))
Copy link
Member

Choose a reason for hiding this comment

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

What's the significance of the google.New("") - why the empty string?

Copy link
Member

Choose a reason for hiding this comment

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

It's a version. Perhaps version.Version would be more appropriate here, something we could try.

Looks like the version is used by the pluginFrameworkProvider in particular in responses to GetMetadata function but I doubt we depend on that being accurate.

// New is a helper function to simplify provider server and testing implementation.
func New(version string) provider.ProviderWithMetaSchema {
	return &frameworkProvider{
		version: version,
	}
}

prov := tfbridge.ProviderInfo{
P: p,
Name: "google-beta",
Expand All @@ -361,6 +367,8 @@ func Provider() tfbridge.ProviderInfo {
License: "Apache-2.0",
Homepage: "https://pulumi.io",
Repository: "https://github.com/pulumi/pulumi-gcp",
Version: version.Version,
MetadataInfo: tfbridge.NewProviderMetadata(metadata),
Config: map[string]*tfbridge.SchemaInfo{
"project": {
Default: &tfbridge.DefaultInfo{
Expand Down Expand Up @@ -3527,6 +3535,12 @@ func Provider() tfbridge.ProviderInfo {
Source: "firebase_apple_app.html.markdown",
},
},
"google_firebase_android_app_config": {
Tok: gcpDataSource(gcpFirebase, "getAndroidAppConfig"),
Docs: &tfbridge.DocInfo{
Markdown: []byte(" "),
},
},
"google_firebase_hosting_channel": {
Tok: gcpDataSource(gcpFirebase, "getHostingChannel"),
Docs: &tfbridge.DocInfo{
Expand Down
9 changes: 9 additions & 0 deletions sdk/dotnet/AccessContextManager/AccessLevel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ public partial class AccessLevel : global::Pulumi.CustomResource
/// Resource name for the Access Level. The short_name component must begin
/// with a letter and only include alphanumeric and '_'.
/// Format: accessPolicies/{policy_id}/accessLevels/{short_name}
///
///
/// - - -
/// </summary>
[Output("name")]
public Output<string> Name { get; private set; } = null!;
Expand Down Expand Up @@ -201,6 +204,9 @@ public sealed class AccessLevelArgs : global::Pulumi.ResourceArgs
/// Resource name for the Access Level. The short_name component must begin
/// with a letter and only include alphanumeric and '_'.
/// Format: accessPolicies/{policy_id}/accessLevels/{short_name}
///
///
/// - - -
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }
Expand Down Expand Up @@ -251,6 +257,9 @@ public sealed class AccessLevelState : global::Pulumi.ResourceArgs
/// Resource name for the Access Level. The short_name component must begin
/// with a letter and only include alphanumeric and '_'.
/// Format: accessPolicies/{policy_id}/accessLevels/{short_name}
///
///
/// - - -
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }
Expand Down
9 changes: 9 additions & 0 deletions sdk/dotnet/AccessContextManager/AccessLevelCondition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public partial class AccessLevelCondition : global::Pulumi.CustomResource
{
/// <summary>
/// The name of the Access Level to add this condition to.
///
///
/// - - -
/// </summary>
[Output("accessLevel")]
public Output<string> AccessLevel { get; private set; } = null!;
Expand Down Expand Up @@ -245,6 +248,9 @@ public sealed class AccessLevelConditionArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// The name of the Access Level to add this condition to.
///
///
/// - - -
/// </summary>
[Input("accessLevel", required: true)]
public Input<string> AccessLevel { get; set; } = null!;
Expand Down Expand Up @@ -345,6 +351,9 @@ public sealed class AccessLevelConditionState : global::Pulumi.ResourceArgs
{
/// <summary>
/// The name of the Access Level to add this condition to.
///
///
/// - - -
/// </summary>
[Input("accessLevel")]
public Input<string>? AccessLevel { get; set; }
Expand Down
9 changes: 9 additions & 0 deletions sdk/dotnet/AccessContextManager/AccessLevels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ public partial class AccessLevels : global::Pulumi.CustomResource
/// <summary>
/// The AccessPolicy this AccessLevel lives in.
/// Format: accessPolicies/{policy_id}
///
///
/// - - -
/// </summary>
[Output("parent")]
public Output<string> Parent { get; private set; } = null!;
Expand Down Expand Up @@ -201,6 +204,9 @@ public InputList<Inputs.AccessLevelsAccessLevelArgs> AccessLevelDetails
/// <summary>
/// The AccessPolicy this AccessLevel lives in.
/// Format: accessPolicies/{policy_id}
///
///
/// - - -
/// </summary>
[Input("parent", required: true)]
public Input<string> Parent { get; set; } = null!;
Expand Down Expand Up @@ -229,6 +235,9 @@ public InputList<Inputs.AccessLevelsAccessLevelGetArgs> AccessLevelDetails
/// <summary>
/// The AccessPolicy this AccessLevel lives in.
/// Format: accessPolicies/{policy_id}
///
///
/// - - -
/// </summary>
[Input("parent")]
public Input<string>? Parent { get; set; }
Expand Down
9 changes: 9 additions & 0 deletions sdk/dotnet/AccessContextManager/AccessPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ public partial class AccessPolicy : global::Pulumi.CustomResource

/// <summary>
/// Human readable title. Does not affect behavior.
///
///
/// - - -
/// </summary>
[Output("title")]
public Output<string> Title { get; private set; } = null!;
Expand Down Expand Up @@ -184,6 +187,9 @@ public sealed class AccessPolicyArgs : global::Pulumi.ResourceArgs

/// <summary>
/// Human readable title. Does not affect behavior.
///
///
/// - - -
/// </summary>
[Input("title", required: true)]
public Input<string> Title { get; set; } = null!;
Expand Down Expand Up @@ -224,6 +230,9 @@ public sealed class AccessPolicyState : global::Pulumi.ResourceArgs

/// <summary>
/// Human readable title. Does not affect behavior.
///
///
/// - - -
/// </summary>
[Input("title")]
public Input<string>? Title { get; set; }
Expand Down
Loading