Skip to content

Commit

Permalink
Update to a pre-release upstream using the Plugin Framework (#260)
Browse files Browse the repository at this point in the history
Upgrade upstream to a pre-release version f3a69cbc0904 built on top of the Plugin Framework
  • Loading branch information
t0yv0 authored Feb 9, 2023
1 parent 72bd2c0 commit e9101f3
Show file tree
Hide file tree
Showing 60 changed files with 3,275 additions and 3,308 deletions.
6 changes: 4 additions & 2 deletions examples/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ module github.com/pulumi/pulumi-random/examples/v4

go 1.19

require github.com/pulumi/pulumi/pkg/v3 v3.52.1
require (
github.com/pulumi/pulumi/pkg/v3 v3.52.1
github.com/stretchr/testify v1.8.1
)

require (
cloud.google.com/go v0.103.0 // indirect
Expand Down Expand Up @@ -150,7 +153,6 @@ require (
github.com/sergi/go-diff v1.2.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
Expand Down
38 changes: 38 additions & 0 deletions provider/cmd/pulumi-resource-random/bridge-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"resources": {
"random:index/randomId:RandomId": "random_id",
"random:index/randomInteger:RandomInteger": "random_integer",
"random:index/randomPassword:RandomPassword": "random_password",
"random:index/randomPet:RandomPet": "random_pet",
"random:index/randomShuffle:RandomShuffle": "random_shuffle",
"random:index/randomString:RandomString": "random_string",
"random:index/randomUuid:RandomUuid": "random_uuid"
},
"renamedProperties": {
"random:index/randomId:RandomId": {
"b64Std": "b64_std",
"b64Url": "b64_url",
"byteLength": "byte_length"
},
"random:index/randomPassword:RandomPassword": {
"bcryptHash": "bcrypt_hash",
"minLower": "min_lower",
"minNumeric": "min_numeric",
"minSpecial": "min_special",
"minUpper": "min_upper",
"overrideSpecial": "override_special"
},
"random:index/randomShuffle:RandomShuffle": {
"inputs": "input",
"resultCount": "result_count",
"results": "result"
},
"random:index/randomString:RandomString": {
"minLower": "min_lower",
"minNumeric": "min_numeric",
"minSpecial": "min_special",
"minUpper": "min_upper",
"overrideSpecial": "override_special"
}
}
}
14 changes: 11 additions & 3 deletions provider/cmd/pulumi-resource-random/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
package main

import (
"context"
_ "embed"

tfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"

random "github.com/pulumi/pulumi-random/provider/v4"
"github.com/pulumi/pulumi-random/provider/v4/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
)

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

//go:embed bridge-metadata.json
var bridgeMetadata []byte

func main() {
tfbridge.Main("random", version.Version, random.Provider(), pulumiSchema)
meta := tfbridge.ProviderMetadata{
PackageSchema: pulumiSchema,
BridgeMetadata: bridgeMetadata,
}
tfbridge.Main(context.Background(), "random", random.Provider(), meta)
}
425 changes: 206 additions & 219 deletions provider/cmd/pulumi-resource-random/schema.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions provider/cmd/pulumi-tfgen-random/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package main

import (
"github.com/pulumi/pulumi-terraform-bridge/pf/tfgen"

random "github.com/pulumi/pulumi-random/provider/v4"
"github.com/pulumi/pulumi-random/provider/v4/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
)

func main() {
tfgen.Main("random", version.Version, random.Provider())
tfgen.Main("random", random.Provider())
}
31 changes: 15 additions & 16 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ module github.com/pulumi/pulumi-random/provider/v4
go 1.19

require (
github.com/pulumi/pulumi-terraform-bridge/v3 v3.39.3
github.com/pulumi/pulumi-terraform-bridge/pf v0.1.1-0.20230207204608-6dbd650bf8bb
github.com/pulumi/pulumi-terraform-bridge/v3 v3.38.1-0.20230120143314-6ffb2faf051e
github.com/pulumi/pulumi/sdk/v3 v3.53.1
github.com/terraform-providers/terraform-provider-random/shim v0.0.0
)

replace (
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220725190814-23001ad6ec03
github.com/terraform-providers/terraform-provider-random => github.com/pulumi/terraform-provider-random v1.3.2-0.20210112153945-304bbf724bde
github.com/terraform-providers/terraform-provider-random => github.com/terraform-providers/terraform-provider-random v1.3.2-0.20230117062402-cab81572f740
github.com/terraform-providers/terraform-provider-random/shim => ./shim
)

Expand Down Expand Up @@ -40,7 +40,7 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
Expand Down Expand Up @@ -112,7 +112,7 @@ require (
github.com/hashicorp/go-hclog v1.2.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.5 // indirect
github.com/hashicorp/go-plugin v1.4.8 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
Expand All @@ -126,18 +126,19 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.15.0 // indirect
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-plugin-go 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-go v0.14.3 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.19.0 // indirect
github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
github.com/hashicorp/vault/api v1.8.2 // indirect
github.com/hashicorp/vault/sdk v0.6.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -150,7 +151,7 @@ require (
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mitchellh/cli v1.1.3 // indirect
github.com/mitchellh/cli v1.1.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
Expand All @@ -177,7 +178,6 @@ require (
github.com/pulumi/pulumi-yaml v1.0.4 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.53.1 // indirect
github.com/pulumi/schema-tools v0.1.0 // indirect
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -187,21 +187,20 @@ require (
github.com/segmentio/asm v1.1.3 // indirect
github.com/segmentio/encoding v0.3.5 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/terraform-providers/terraform-provider-random v1.3.2-0.20210112153945-304bbf724bde // indirect
github.com/terraform-providers/terraform-provider-random v1.3.2-0.20230207192255-f3a69cbc0904 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.1 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/xanzy/ssh-agent v0.3.2 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
Loading

0 comments on commit e9101f3

Please sign in to comment.