Build update

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
           releaseDate=$(date '+%B-%-d-%Y' | tr '[:upper:]' '[:lower:]')
           releaseVersion=$(echo ${{ steps.get_tag_name.outputs.TAG }} | tr -d '.')
           tmp=$(mktemp -d)
-          echo "[Release Notes](https://github.com/mrparkers/terraform-provider-keycloak/blob/master/CHANGELOG.md#${releaseVersion}-${releaseDate})" > ${tmp}/release-notes.md
+          echo "[Release Notes](https://github.com/qvest-digital/terraform-provider-keycloak/blob/master/CHANGELOG.md#${releaseVersion}-${releaseDate})" > ${tmp}/release-notes.md
           cat ${tmp}/release-notes.md
           echo ::set-output name=NOTES::${tmp}/release-notes.md
 

.github/workflows/test.yml

@@ -9,8 +9,8 @@ on:
 
 jobs:
   verify:
-    runs-on: ubuntu-latest
-#    runs-on: self-hosted
+#    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -57,7 +57,7 @@ jobs:
       (needs.verify.outputs.code-files-changed || startsWith(github.ref, 'refs/tags/v'))
     needs:
       - verify
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       matrix:
         keycloak-version:
@@ -74,7 +74,7 @@ jobs:
       keycloak:
         # we have to use a custom docker image for these tests, since it's not possible to provide command-line args
         # to a service container.  see https://github.com/actions/runner/issues/2139
-        image: mrparkers/keycloak-dev:${{ matrix.keycloak-version }}
+        image: markusqvestseidl/keycloak-dev:${{ matrix.keycloak-version }}
         ports:
           - 8080:8080
         env:
@@ -96,7 +96,8 @@ jobs:
         uses: hashicorp/setup-terraform@v1
         with:
           terraform_wrapper: false
-          terraform_version: 1.4.1
+          # terraform_version: 1.4.1
+          terraform_version: 1.5.7
 
       - name: Initialize Keycloak
         run: ./scripts/wait-for-local-keycloak.sh && ./scripts/create-terraform-client.sh
@@ -111,6 +112,7 @@ jobs:
             return process.env.KEYCLOAK_VERSION.split("-")[0]
       - name: Test
         run: |
+          terraform version
           go mod download
           make testacc
         env:

README.md

@@ -13,7 +13,7 @@ This provider can be installed automatically using Terraform >=0.13 by using the
 terraform {
   required_providers {
     keycloak = {
-      source = "mrparkers/keycloak"
+      source = "qvest-digital/keycloak"
       version = ">= 4.0.0"
     }
   }
@@ -47,14 +47,14 @@ The following versions are used when running acceptance tests in CI:
 ## Releases
 
 This provider uses [GoReleaser](https://goreleaser.com/) to build and publish releases. Each release published to GitHub
-contains binary files for Linux, macOS (darwin), and Windows, as configured within the [`.goreleaser.yml`](https://github.com/mrparkers/terraform-provider-keycloak/blob/master/.goreleaser.yml)
+contains binary files for Linux, macOS (darwin), and Windows, as configured within the [`.goreleaser.yml`](https://github.com/qvest-digital/terraform-provider-keycloak/blob/master/.goreleaser.yml)
 file.
 
 Each release also contains a `terraform-provider-keycloak_${RELEASE_VERSION}_SHA256SUMS` file, accompanied by a signature
 created by a PGP key with the fingerprint `C508 6791 5E11 6CD2`. This key can be found on my Keybase account at https://keybase.io/mrparkers.
 
-You can find the list of releases [here](https://github.com/mrparkers/terraform-provider-keycloak/releases).
-You can find the changelog for each version [here](https://github.com/mrparkers/terraform-provider-keycloak/blob/master/CHANGELOG.md).
+You can find the list of releases [here](https://github.com/qvest-digital/terraform-provider-keycloak/releases).
+You can find the changelog for each version [here](https://github.com/qvest-digital/terraform-provider-keycloak/blob/master/CHANGELOG.md).
 
 Note: Prior to v2.0.0, a statically linked build for use within Alpine linux was included with each release. This is no longer
 done due to [GoReleaser not supporting CGO](https://goreleaser.com/limitations/cgo/). Instead of using a statically linked,
@@ -94,4 +94,4 @@ make testacc
 
 ## License
 
-[MIT](https://github.com/mrparkers/terraform-provider-keycloak/blob/master/LICENSE)
+[MIT](https://github.com/qvest-digital/terraform-provider-keycloak/blob/master/LICENSE)

docker-compose.yml

@@ -38,6 +38,6 @@ services:
     - 8080:8080
 # Enable for remote java debugging
 #    - 8787:8787
-    volumes:
+#    volumes:
 # Make the custom-user-federation-example extension available to Keycloak. The :z option is required and tells Docker that the volume content will be shared between containers.
-    - ./custom-user-federation-example/build/libs/custom-user-federation-example.jar:/opt/jboss/keycloak/standalone/deployments/custom-user-federation-example.jar:z
+#    - ./custom-user-federation-example/build/libs/custom-user-federation-example.jar:/opt/jboss/keycloak/standalone/deployments/custom-user-federation-example.jar:z

docs/resources/custom_user_federation.md

@@ -7,7 +7,7 @@ page_title: "keycloak_custom_user_federation Resource"
 Allows for creating and managing custom user federation providers within Keycloak.
 
 A custom user federation provider is an implementation of Keycloak's [User Storage SPI](https://www.keycloak.org/docs/4.2/server_development/index.html#_user-storage-spi).
-An example of this implementation can be found [here](https://github.com/mrparkers/terraform-provider-keycloak/tree/master/custom-user-federation-example).
+An example of this implementation can be found [here](https://github.com/qvest-digital/terraform-provider-keycloak/tree/master/custom-user-federation-example).
 
 ## Example Usage
 

docs/resources/group_permissions.md

@@ -8,7 +8,7 @@ Allows you to manage all group Scope Based Permissions https://www.keycloak.org/
 
 This is part of a preview Keycloak feature: `admin_fine_grained_authz` (see https://www.keycloak.org/docs/latest/server_admin/#_fine_grain_permissions).
 This feature can be enabled with the Keycloak option `-Dkeycloak.profile.feature.admin_fine_grained_authz=enabled`. See the
-example [`docker-compose.yml`](https://github.com/mrparkers/terraform-provider-keycloak/blob/898094df6b3e01c3404981ce7ca268142d6ff0e5/docker-compose.yml#L21) file for an example.
+example [`docker-compose.yml`](https://github.com/qvest-digital/terraform-provider-keycloak/blob/898094df6b3e01c3404981ce7ca268142d6ff0e5/docker-compose.yml#L21) file for an example.
 
 When enabling Roles Permissions, Keycloak does several things automatically:
 1. Enable Authorization on built-in `realm-management` client (if not already enabled).

docs/resources/user.md

@@ -62,8 +62,8 @@ resource "keycloak_user" "user_with_initial_password" {
 - `first_name` - (Optional) The user's first name.
 - `last_name` - (Optional) The user's last name.
 - `attributes` - (Optional) A map representing attributes for the user. In order to add multivalue attributes, use `##` to seperate the values. Max length for each value is 255 chars
-- `required_actions` - (Optional) A list of required user actions. 
-- `federated_identity` - (Optional) When specified, the user will be linked to a federated identity provider. Refer to the [federated user example](https://github.com/mrparkers/terraform-provider-keycloak/blob/master/example/federated_user_example.tf) for more details.
+- `required_actions` - (Optional) A list of required user actions.
+- `federated_identity` - (Optional) When specified, the user will be linked to a federated identity provider. Refer to the [federated user example](https://github.com/qvest-digital/terraform-provider-keycloak/blob/master/example/federated_user_example.tf) for more details.
   - `identity_provider` - (Required) The name of the identity provider
   - `user_id` - (Required) The ID of the user defined in the identity provider
   - `user_name` - (Required) The user name of the user defined in the identity provider

docs/resources/users_permissions.md

@@ -8,7 +8,7 @@ Allows you to manage fine-grained permissions for all users in a realm: https://
 
 This is part of a preview Keycloak feature: `admin_fine_grained_authz` (see https://www.keycloak.org/docs/latest/server_admin/#_fine_grain_permissions).
 This feature can be enabled with the Keycloak option `-Dkeycloak.profile.feature.admin_fine_grained_authz=enabled`. See the
-example [`docker-compose.yml`](https://github.com/mrparkers/terraform-provider-keycloak/blob/898094df6b3e01c3404981ce7ca268142d6ff0e5/docker-compose.yml#L21) file for an example.
+example [`docker-compose.yml`](https://github.com/qvest-digital/terraform-provider-keycloak/blob/898094df6b3e01c3404981ce7ca268142d6ff0e5/docker-compose.yml#L21) file for an example.
 
 When enabling fine-grained permissions for users, Keycloak does several things automatically:
 1. Enable Authorization on built-in `realm-management` client (if not already enabled).

go.mod

@@ -1,4 +1,4 @@
-module github.com/mrparkers/terraform-provider-keycloak
+module github.com/qvest-digital/terraform-provider-keycloak
 
 require (
 	github.com/hashicorp/errwrap v1.0.0

keycloak/extra_config.go

@@ -2,7 +2,7 @@ package keycloak
 
 import (
 	"encoding/json"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 	"reflect"
 	"strconv"
 	"strings"

keycloak/identity_provider.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 	"reflect"
 )
 

keycloak/keycloak_client.go

@@ -530,3 +530,7 @@ func newHttpClient(tlsInsecureSkipVerify bool, clientTimeout int, caCert string)
 
 	return httpClient, nil
 }
+
+func (keycloakClient *KeycloakClient) InvalidateAccessToken() {
+	keycloakClient.initialLogin = false
+}

keycloak/openid_client.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 	"reflect"
 )
 

keycloak/openid_client_scope.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 )
 
 type OpenidClientScope struct {

keycloak/realm.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 	"strings"
 )
 

keycloak/saml_client.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 	"reflect"
 )
 

keycloak/saml_client_scope.go

@@ -3,7 +3,7 @@ package keycloak
 import (
 	"context"
 	"fmt"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak/types"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak/types"
 )
 
 type SamlClientScope struct {

main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
-	"github.com/mrparkers/terraform-provider-keycloak/provider"
+	"github.com/qvest-digital/terraform-provider-keycloak/provider"
 )
 
 func main() {

makefile

@@ -10,10 +10,10 @@ build:
 	CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$(VERSION)" -o terraform-provider-keycloak_$(VERSION)
 
 build-example: build
-	mkdir -p example/.terraform/plugins/terraform.local/mrparkers/keycloak/4.0.0/$(GOOS)_$(GOARCH)
-	mkdir -p example/terraform.d/plugins/terraform.local/mrparkers/keycloak/4.0.0/$(GOOS)_$(GOARCH)
-	cp terraform-provider-keycloak_* example/.terraform/plugins/terraform.local/mrparkers/keycloak/4.0.0/$(GOOS)_$(GOARCH)/
-	cp terraform-provider-keycloak_* example/terraform.d/plugins/terraform.local/mrparkers/keycloak/4.0.0/$(GOOS)_$(GOARCH)/
+	mkdir -p example/.terraform/plugins/terraform.local/qvest-digital/keycloak/4.0.0/$(GOOS)_$(GOARCH)
+	mkdir -p example/terraform.d/plugins/terraform.local/qvest-digital/keycloak/4.0.0/$(GOOS)_$(GOARCH)
+	cp terraform-provider-keycloak_* example/.terraform/plugins/terraform.local/qvest-digital/keycloak/4.0.0/$(GOOS)_$(GOARCH)/
+	cp terraform-provider-keycloak_* example/terraform.d/plugins/terraform.local/qvest-digital/keycloak/4.0.0/$(GOOS)_$(GOARCH)/
 
 local: deps
 	docker compose up --build -d
@@ -30,8 +30,8 @@ test: fmtcheck vet
 	go test $(TEST)
 
 testacc: fmtcheck vet
-	go test -v github.com/mrparkers/terraform-provider-keycloak/keycloak
-	TF_ACC=1 CHECKPOINT_DISABLE=1 go test -v -timeout 60m -parallel 4 github.com/mrparkers/terraform-provider-keycloak/provider $(TESTARGS)
+	go test -v github.com/qvest-digital/terraform-provider-keycloak/keycloak
+	TF_ACC=1 CHECKPOINT_DISABLE=1 go test -v -timeout 60m -parallel 4 github.com/qvest-digital/terraform-provider-keycloak/provider $(TESTARGS)
 
 fmtcheck:
 	lineCount=$(shell gofmt -l -s $(GOFMT_FILES) | wc -l | tr -d ' ') && exit $$lineCount

provider/data_source_keycloak_authentication_execution.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakAuthenticationExecution() *schema.Resource {

provider/data_source_keycloak_authentication_flow.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakAuthenticationFlow() *schema.Resource {

provider/data_source_keycloak_client_description_converter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakClientDescriptionConverter() *schema.Resource {

provider/data_source_keycloak_group.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakGroup() *schema.Resource {

provider/data_source_keycloak_openid_client.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakOpenidClient() *schema.Resource {

provider/data_source_keycloak_openid_client_authorization_policy.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakOpenidClientAuthorizationPolicy() *schema.Resource {

provider/data_source_keycloak_openid_client_scope.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakOpenidClientScope() *schema.Resource {

provider/data_source_keycloak_openid_client_service_account_user.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakOpenidClientServiceAccountUser() *schema.Resource {

provider/data_source_keycloak_realm.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakRealm() *schema.Resource {

provider/data_source_keycloak_realm_keys.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakRealmKeys() *schema.Resource {

provider/data_source_keycloak_role.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakRole() *schema.Resource {

provider/data_source_keycloak_saml_client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakSamlClient() *schema.Resource {

provider/data_source_keycloak_saml_client_installation_provider.go

@@ -6,7 +6,7 @@ import (
 	"encoding/base64"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakSamlClientInstallationProvider() *schema.Resource {

provider/data_source_keycloak_user.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakUser() *schema.Resource {

provider/data_source_keycloak_user_realm_roles.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 )
 
 func dataSourceKeycloakUserRealmRoles() *schema.Resource {

provider/generic_keycloak_identity_provider.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"github.com/mrparkers/terraform-provider-keycloak/keycloak"
+	"github.com/qvest-digital/terraform-provider-keycloak/keycloak"
 	"reflect"
 	"strings"
 )