Upgrade terraform-provider-keycloak to v4.5.0

.ci-mgmt.yaml

@@ -11,17 +11,7 @@ plugins:
   - name: terraform
     version: "1.0.16"
     kind: converter
-
   - name: aws
     version: "4.2.0"
-actions:
-  preTest:
-    - name: Ensure upstream
-      run: make upstream
-    - name: Setup local Keycloak
-      run: make -C upstream local
-    - name: Run provider tests
-      run: |
-        cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
 pulumiConvert: 1
 registryDocs: true

.github/workflows/master.yml

@@ -175,13 +175,6 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         version: v2.5.0
-    - name: Ensure upstream
-      run: make upstream
-    - name: Setup local Keycloak
-      run: make -C upstream local
-    - name: Run provider tests
-      run: |
-        cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
     - name: Run tests
       run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4
     strategy:

.github/workflows/prerelease.yml

@@ -116,13 +116,6 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         version: v2.5.0
-    - name: Ensure upstream
-      run: make upstream
-    - name: Setup local Keycloak
-      run: make -C upstream local
-    - name: Run provider tests
-      run: |
-        cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
     - name: Run tests
       run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 .
     strategy:

.github/workflows/release.yml

@@ -122,13 +122,6 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         version: v2.5.0
-    - name: Ensure upstream
-      run: make upstream
-    - name: Setup local Keycloak
-      run: make -C upstream local
-    - name: Run provider tests
-      run: |
-        cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
     - name: Run tests
       run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 .
     strategy:

.github/workflows/run-acceptance-tests.yml

@@ -171,13 +171,6 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         version: v2.5.0
-    - name: Ensure upstream
-      run: make upstream
-    - name: Setup local Keycloak
-      run: make -C upstream local
-    - name: Run provider tests
-      run: |
-        cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
     - name: Run tests
       if: matrix.testTarget == 'local'
       run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 4 .

.pulumi-java-gen.version

@@ -1 +1 @@
-0.17.0
+0.18.0

examples/examples_dotnet_test.go

@@ -9,6 +9,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build dotnet || all
 // +build dotnet all
 
 package examples
@@ -20,19 +21,16 @@ import (
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 )
 
-func getCSBaseOptions() integration.ProgramTestOptions {
-	base := getBaseOptions()
-	csharpBase := base.With(integration.ProgramTestOptions{
+func getCSBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	return getBaseOptions(t).With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			"Pulumi.Keycloak",
 		},
 	})
-
-	return csharpBase
 }
 
 func TestAccRealmCsharp(t *testing.T) {
-	test := getCSBaseOptions().
+	test := getCSBaseOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: path.Join(getCwd(t), "realm", "csharp"),
 		})

examples/examples_go_test.go

@@ -9,6 +9,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build go || all
 // +build go all
 
 package examples
@@ -21,21 +22,18 @@ import (
 )
 
 func TestAccRealmGo(t *testing.T) {
-	test := getGoBaseOptions().
+	test := getGoBaseOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: filepath.Join(getCwd(t), "realm", "go"),
 		})
 
 	integration.ProgramTest(t, &test)
 }
 
-func getGoBaseOptions() integration.ProgramTestOptions {
-	base := getBaseOptions()
-	goBase := base.With(integration.ProgramTestOptions{
+func getGoBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	return getBaseOptions(t).With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			"github.com/pulumi/pulumi-keycloak/sdk/v4",
 		},
 	})
-
-	return goBase
 }

examples/examples_nodejs_test.go

@@ -9,6 +9,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build nodejs || all
 // +build nodejs all
 
 package examples
@@ -20,19 +21,16 @@ import (
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 )
 
-func getJSBaseOptions() integration.ProgramTestOptions {
-	base := getBaseOptions()
-	baseJS := base.With(integration.ProgramTestOptions{
+func getJSBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	return getBaseOptions(t).With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			"@pulumi/keycloak",
 		},
 	})
-
-	return baseJS
 }
 
 func TestAccRealmTs(t *testing.T) {
-	test := getJSBaseOptions().
+	test := getJSBaseOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: path.Join(getCwd(t), "realm", "ts"),
 		})

examples/examples_py_test.go

@@ -9,6 +9,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build python || all
 // +build python all
 
 package examples
@@ -21,19 +22,16 @@ import (
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 )
 
-func getPythonBaseOptions() integration.ProgramTestOptions {
-	base := getBaseOptions()
-	basePython := base.With(integration.ProgramTestOptions{
+func getPythonBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	return getBaseOptions(t).With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			filepath.Join("..", "sdk", "python", "bin"),
 		},
 	})
-
-	return basePython
 }
 
 func TestAccRealmPython(t *testing.T) {
-	test := getPythonBaseOptions().
+	test := getPythonBaseOptions(t).
 		With(integration.ProgramTestOptions{
 			Dir: path.Join(getCwd(t), "realm", "python"),
 		})

examples/examples_test.go

@@ -28,7 +28,8 @@ func getCwd(t *testing.T) string {
 	return cwd
 }
 
-func getBaseOptions() integration.ProgramTestOptions {
+func getBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	t.Skip("Skipping tests -  this provider is not high enough usage to merit automated E2E testing in CI")
 	return integration.ProgramTestOptions{
 		ExpectRefreshChanges: true,
 	}

provider/cmd/pulumi-resource-keycloak/schema.json

@@ -3347,7 +3347,7 @@
             }
         },
         "keycloak:index/groupMemberships:GroupMemberships": {
-            "description": "Allows for managing a Keycloak group's members.\n\nNote that this resource attempts to be an **authoritative** source over group members. When this resource takes control\nover a group's members, users that are manually added to the group will be removed, and users that are manually removed\nfrom the group will be added upon the next run of `pulumi up`.\n\nAlso note that you should not use `keycloak.GroupMemberships` with a group has been assigned as a default group via\n`keycloak.DefaultGroups`.\n\nThis resource **should not** be used to control membership of a group that has its members federated from an external\nsource via group mapping.\n\nTo non-exclusively manage the group's of a user, see the [`keycloak.UserGroups` resource][1]\n\nThis resource paginates its data loading on refresh by 50 items.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as keycloak from \"@pulumi/keycloak\";\n\nconst realm = new keycloak.Realm(\"realm\", {\n    realm: \"my-realm\",\n    enabled: true,\n});\nconst group = new keycloak.Group(\"group\", {\n    realmId: realm.id,\n    name: \"my-group\",\n});\nconst user = new keycloak.User(\"user\", {\n    realmId: realm.id,\n    username: \"my-user\",\n});\nconst groupMembers = new keycloak.GroupMemberships(\"group_members\", {\n    realmId: realm.id,\n    groupId: group.id,\n    members: [user.username],\n});\n```\n```python\nimport pulumi\nimport pulumi_keycloak as keycloak\n\nrealm = keycloak.Realm(\"realm\",\n    realm=\"my-realm\",\n    enabled=True)\ngroup = keycloak.Group(\"group\",\n    realm_id=realm.id,\n    name=\"my-group\")\nuser = keycloak.User(\"user\",\n    realm_id=realm.id,\n    username=\"my-user\")\ngroup_members = keycloak.GroupMemberships(\"group_members\",\n    realm_id=realm.id,\n    group_id=group.id,\n    members=[user.username])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Keycloak = Pulumi.Keycloak;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n    var realm = new Keycloak.Realm(\"realm\", new()\n    {\n        RealmName = \"my-realm\",\n        Enabled = true,\n    });\n\n    var @group = new Keycloak.Group(\"group\", new()\n    {\n        RealmId = realm.Id,\n        Name = \"my-group\",\n    });\n\n    var user = new Keycloak.User(\"user\", new()\n    {\n        RealmId = realm.Id,\n        Username = \"my-user\",\n    });\n\n    var groupMembers = new Keycloak.GroupMemberships(\"group_members\", new()\n    {\n        RealmId = realm.Id,\n        GroupId = @group.Id,\n        Members = new[]\n        {\n            user.Username,\n        },\n    });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-keycloak/sdk/v5/go/keycloak\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\trealm, err := keycloak.NewRealm(ctx, \"realm\", \u0026keycloak.RealmArgs{\n\t\t\tRealm:   pulumi.String(\"my-realm\"),\n\t\t\tEnabled: pulumi.Bool(true),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tgroup, err := keycloak.NewGroup(ctx, \"group\", \u0026keycloak.GroupArgs{\n\t\t\tRealmId: realm.ID(),\n\t\t\tName:    pulumi.String(\"my-group\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tuser, err := keycloak.NewUser(ctx, \"user\", \u0026keycloak.UserArgs{\n\t\t\tRealmId:  realm.ID(),\n\t\t\tUsername: pulumi.String(\"my-user\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = keycloak.NewGroupMemberships(ctx, \"group_members\", \u0026keycloak.GroupMembershipsArgs{\n\t\t\tRealmId: realm.ID(),\n\t\t\tGroupId: group.ID(),\n\t\t\tMembers: pulumi.StringArray{\n\t\t\t\tuser.Username,\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.keycloak.Realm;\nimport com.pulumi.keycloak.RealmArgs;\nimport com.pulumi.keycloak.Group;\nimport com.pulumi.keycloak.GroupArgs;\nimport com.pulumi.keycloak.User;\nimport com.pulumi.keycloak.UserArgs;\nimport com.pulumi.keycloak.GroupMemberships;\nimport com.pulumi.keycloak.GroupMembershipsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n    public static void main(String[] args) {\n        Pulumi.run(App::stack);\n    }\n\n    public static void stack(Context ctx) {\n        var realm = new Realm(\"realm\", RealmArgs.builder()\n            .realm(\"my-realm\")\n            .enabled(true)\n            .build());\n\n        var group = new Group(\"group\", GroupArgs.builder()\n            .realmId(realm.id())\n            .name(\"my-group\")\n            .build());\n\n        var user = new User(\"user\", UserArgs.builder()\n            .realmId(realm.id())\n            .username(\"my-user\")\n            .build());\n\n        var groupMembers = new GroupMemberships(\"groupMembers\", GroupMembershipsArgs.builder()\n            .realmId(realm.id())\n            .groupId(group.id())\n            .members(user.username())\n            .build());\n\n    }\n}\n```\n```yaml\nresources:\n  realm:\n    type: keycloak:Realm\n    properties:\n      realm: my-realm\n      enabled: true\n  group:\n    type: keycloak:Group\n    properties:\n      realmId: ${realm.id}\n      name: my-group\n  user:\n    type: keycloak:User\n    properties:\n      realmId: ${realm.id}\n      username: my-user\n  groupMembers:\n    type: keycloak:GroupMemberships\n    name: group_members\n    properties:\n      realmId: ${realm.id}\n      groupId: ${group.id}\n      members:\n        - ${user.username}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nThis resource does not support import. Instead of importing, feel free to create this resource\n\nas if it did not already exist on the server.\n\n[1]: providers/mrparkers/keycloak/latest/docs/resources/group_memberships\n\n",
+            "description": "Allows for managing a Keycloak group's members.\n\nNote that this resource attempts to be an **authoritative** source over group members. When this resource takes control\nover a group's members, users that are manually added to the group will be removed, and users that are manually removed\nfrom the group will be added upon the next run of `pulumi up`.\n\nAlso note that you should not use `keycloak.GroupMemberships` with a group has been assigned as a default group via\n`keycloak.DefaultGroups`.\n\nThis resource **should not** be used to control membership of a group that has its members federated from an external\nsource via group mapping.\n\nTo non-exclusively manage the group's of a user, see the [`keycloak.UserGroups` resource][1]\n\nThis resource paginates its data loading on refresh by 50 items.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as keycloak from \"@pulumi/keycloak\";\n\nconst realm = new keycloak.Realm(\"realm\", {\n    realm: \"my-realm\",\n    enabled: true,\n});\nconst group = new keycloak.Group(\"group\", {\n    realmId: realm.id,\n    name: \"my-group\",\n});\nconst user = new keycloak.User(\"user\", {\n    realmId: realm.id,\n    username: \"my-user\",\n});\nconst groupMembers = new keycloak.GroupMemberships(\"group_members\", {\n    realmId: realm.id,\n    groupId: group.id,\n    members: [user.username],\n});\n```\n```python\nimport pulumi\nimport pulumi_keycloak as keycloak\n\nrealm = keycloak.Realm(\"realm\",\n    realm=\"my-realm\",\n    enabled=True)\ngroup = keycloak.Group(\"group\",\n    realm_id=realm.id,\n    name=\"my-group\")\nuser = keycloak.User(\"user\",\n    realm_id=realm.id,\n    username=\"my-user\")\ngroup_members = keycloak.GroupMemberships(\"group_members\",\n    realm_id=realm.id,\n    group_id=group.id,\n    members=[user.username])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Keycloak = Pulumi.Keycloak;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n    var realm = new Keycloak.Realm(\"realm\", new()\n    {\n        RealmName = \"my-realm\",\n        Enabled = true,\n    });\n\n    var @group = new Keycloak.Group(\"group\", new()\n    {\n        RealmId = realm.Id,\n        Name = \"my-group\",\n    });\n\n    var user = new Keycloak.User(\"user\", new()\n    {\n        RealmId = realm.Id,\n        Username = \"my-user\",\n    });\n\n    var groupMembers = new Keycloak.GroupMemberships(\"group_members\", new()\n    {\n        RealmId = realm.Id,\n        GroupId = @group.Id,\n        Members = new[]\n        {\n            user.Username,\n        },\n    });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-keycloak/sdk/v5/go/keycloak\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\trealm, err := keycloak.NewRealm(ctx, \"realm\", \u0026keycloak.RealmArgs{\n\t\t\tRealm:   pulumi.String(\"my-realm\"),\n\t\t\tEnabled: pulumi.Bool(true),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tgroup, err := keycloak.NewGroup(ctx, \"group\", \u0026keycloak.GroupArgs{\n\t\t\tRealmId: realm.ID(),\n\t\t\tName:    pulumi.String(\"my-group\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tuser, err := keycloak.NewUser(ctx, \"user\", \u0026keycloak.UserArgs{\n\t\t\tRealmId:  realm.ID(),\n\t\t\tUsername: pulumi.String(\"my-user\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = keycloak.NewGroupMemberships(ctx, \"group_members\", \u0026keycloak.GroupMembershipsArgs{\n\t\t\tRealmId: realm.ID(),\n\t\t\tGroupId: group.ID(),\n\t\t\tMembers: pulumi.StringArray{\n\t\t\t\tuser.Username,\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.keycloak.Realm;\nimport com.pulumi.keycloak.RealmArgs;\nimport com.pulumi.keycloak.Group;\nimport com.pulumi.keycloak.GroupArgs;\nimport com.pulumi.keycloak.User;\nimport com.pulumi.keycloak.UserArgs;\nimport com.pulumi.keycloak.GroupMemberships;\nimport com.pulumi.keycloak.GroupMembershipsArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n    public static void main(String[] args) {\n        Pulumi.run(App::stack);\n    }\n\n    public static void stack(Context ctx) {\n        var realm = new Realm(\"realm\", RealmArgs.builder()\n            .realm(\"my-realm\")\n            .enabled(true)\n            .build());\n\n        var group = new Group(\"group\", GroupArgs.builder()\n            .realmId(realm.id())\n            .name(\"my-group\")\n            .build());\n\n        var user = new User(\"user\", UserArgs.builder()\n            .realmId(realm.id())\n            .username(\"my-user\")\n            .build());\n\n        var groupMembers = new GroupMemberships(\"groupMembers\", GroupMembershipsArgs.builder()\n            .realmId(realm.id())\n            .groupId(group.id())\n            .members(user.username())\n            .build());\n\n    }\n}\n```\n```yaml\nresources:\n  realm:\n    type: keycloak:Realm\n    properties:\n      realm: my-realm\n      enabled: true\n  group:\n    type: keycloak:Group\n    properties:\n      realmId: ${realm.id}\n      name: my-group\n  user:\n    type: keycloak:User\n    properties:\n      realmId: ${realm.id}\n      username: my-user\n  groupMembers:\n    type: keycloak:GroupMemberships\n    name: group_members\n    properties:\n      realmId: ${realm.id}\n      groupId: ${group.id}\n      members:\n        - ${user.username}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nThis resource does not support import. Instead of importing, feel free to create this resource\n\nas if it did not already exist on the server.\n\n[1]: providers/keycloak/keycloak/latest/docs/resources/group_memberships\n\n",
             "properties": {
                 "groupId": {
                     "type": "string",

provider/go.mod

@@ -142,6 +142,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/keycloak/terraform-provider-keycloak v0.0.0-20241206084240-f87470c95855 // indirect
 	github.com/klauspost/compress v1.15.11 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect