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

Jump to bottom

Upgrade terraform-provider-auth0 to v1.4.0 #611

Closed
wants to merge 2 commits into from
Closed

Upgrade terraform-provider-auth0 to v1.4.0 #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68e044b
make tfgen
pulumi-bot Jul 18, 2024
80dc4da
make build_sdks
pulumi-bot Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-auth0/examples/v2
go 1.21

require (
github.com/pulumi/pulumi/pkg/v3 v3.121.0
github.com/pulumi/pulumi/pkg/v3 v3.124.0
github.com/stretchr/testify v1.9.0
)

Expand Down Expand Up @@ -126,7 +126,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.9.1 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.121.0 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.124.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions examples/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,10 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
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/pulumi/pkg/v3 v3.121.0 h1:cLUQJYGJKfgCY0ubJo8dVwmsIm2WcgTprb9Orc/yiFg=
github.com/pulumi/pulumi/pkg/v3 v3.121.0/go.mod h1:aaRixfKOh4DhGtuDJcI56dTPkb7oJBgRgH1aMF1FzbU=
github.com/pulumi/pulumi/sdk/v3 v3.121.0 h1:UsnFKIVOtJN/hQKPkWHL9cZktewPVQRbNUXbXQY/qrk=
github.com/pulumi/pulumi/sdk/v3 v3.121.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
github.com/pulumi/pulumi/pkg/v3 v3.124.0 h1:JgUePx6Ga9geBJ1dku6K8GXTrsBYzXMhKIsk+cxeKo8=
github.com/pulumi/pulumi/pkg/v3 v3.124.0/go.mod h1:/XUDPNoIikS3lcQe1HpGuKs73cO5HqBvOdxXFeC3UHM=
github.com/pulumi/pulumi/sdk/v3 v3.124.0 h1:f9Rb2AhLSaacKTaBPbKXPCfviHxTuhEXafhT4E095Y0=
github.com/pulumi/pulumi/sdk/v3 v3.124.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
Expand Down
2 changes: 1 addition & 1 deletion patches/0001-Add-a-shim.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mikhail Shilkov <[email protected]>
Date: Tue, 19 Sep 2023 17:21:23 +0200
Subject: [PATCH 1/3] Add a shim
Subject: [PATCH] Add a shim


diff --git a/shim/shim.go b/shim/shim.go
Expand Down
6 changes: 3 additions & 3 deletions patches/0002-Patch-to-avoid-upstream-ResourceServer-panic-code-mo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Kappler <[email protected]>
Date: Fri, 29 Sep 2023 07:52:53 +0200
Subject: [PATCH 2/3] Patch to avoid upstream ResourceServer panic: code moved
Subject: [PATCH] Patch to avoid upstream ResourceServer panic: code moved


diff --git a/internal/auth0/resourceserver/expand.go b/internal/auth0/resourceserver/expand.go
index ee1e6e97..5b1c23fa 100644
index be0a7002..8d4b7c8f 100644
--- a/internal/auth0/resourceserver/expand.go
+++ b/internal/auth0/resourceserver/expand.go
@@ -56,5 +56,6 @@ func resourceServerIsAuth0ManagementAPI(state cty.Value) bool {
@@ -55,5 +55,6 @@ func resourceServerIsAuth0ManagementAPI(state cty.Value) bool {
return false
}

Expand Down
4 changes: 2 additions & 2 deletions patches/0003-Patch-to-allow-allow-User-resource-import-inject-con.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fabrice Baumann <[email protected]>
Date: Thu, 7 Mar 2024 16:31:48 -0500
Subject: [PATCH 3/3] Patch to allow allow User resource import: inject
connection name attribute
Subject: [PATCH] Patch to allow allow User resource import: inject connection
name attribute


diff --git a/internal/auth0/user/flatten.go b/internal/auth0/user/flatten.go
Expand Down
21 changes: 21 additions & 0 deletions provider/cmd/pulumi-resource-auth0/bridge-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,15 @@
}
}
},
"auth0_connection_scim_configuration": {
"current": "auth0:index/connectionScimConfiguration:ConnectionScimConfiguration",
"majorVersion": 3,
"fields": {
"mapping": {
"maxItemsOne": false
}
}
},
"auth0_custom_domain": {
"current": "auth0:index/customDomain:CustomDomain",
"majorVersion": 3,
Expand Down Expand Up @@ -1131,6 +1140,18 @@
}
}
},
"auth0_connection_scim_configuration": {
"current": "auth0:index/getConnectionScimConfiguration:getConnectionScimConfiguration",
"majorVersion": 3,
"fields": {
"default_mapping": {
"maxItemsOne": false
},
"mapping": {
"maxItemsOne": false
}
}
},
"auth0_custom_domain": {
"current": "auth0:index/getCustomDomain:getCustomDomain",
"majorVersion": 3,
Expand Down
261 changes: 256 additions & 5 deletions provider/cmd/pulumi-resource-auth0/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ replace (

require (
github.com/auth0/terraform-provider-auth0 v0.50.2
github.com/pulumi/providertest v0.0.11
github.com/pulumi/pulumi-terraform-bridge/v3 v3.86.0
github.com/pulumi/pulumi/sdk/v3 v3.121.0
github.com/pulumi/providertest v0.0.13
github.com/pulumi/pulumi-terraform-bridge/v3 v3.87.0
github.com/pulumi/pulumi/sdk/v3 v3.124.0
github.com/stretchr/testify v1.9.0
)

Expand Down Expand Up @@ -47,7 +47,7 @@ require (
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/auth0/go-auth0 v1.7.0 // indirect
github.com/auth0/go-auth0 v1.8.0 // indirect
github.com/aws/aws-sdk-go v1.50.36 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
Expand Down Expand Up @@ -112,7 +112,7 @@ require (
github.com/hashicorp/go-getter v1.7.5 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
Expand All @@ -121,7 +121,7 @@ require (
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
github.com/hashicorp/hcl/v2 v2.21.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.23.0 // indirect
Expand Down Expand Up @@ -176,8 +176,8 @@ require (
github.com/pulumi/inflector v0.1.1 // indirect
github.com/pulumi/pulumi-java/pkg v0.11.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect
github.com/pulumi/pulumi-yaml v1.8.0 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.121.0 // indirect
github.com/pulumi/pulumi-yaml v1.9.1 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.124.0 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand Down Expand Up @@ -217,14 +217,14 @@ require (
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.37.0 // indirect
gocloud.dev/secrets/hashivault v0.37.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
Expand All @@ -234,7 +234,7 @@ require (
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
Loading
Loading