From 2c48016d0b206ebee7b08cecd33e6d9a1a3ecc0b Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 24 Jan 2025 15:01:48 +0100 Subject: [PATCH] feat: add all supported alogithms for java keystore Signed-off-by: Thomas Boerger --- .../resource_keycloak_realm_keystore_java_keystore.go | 3 ++- ...esource_keycloak_realm_keystore_java_kyestore_test.go | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/provider/resource_keycloak_realm_keystore_java_keystore.go b/provider/resource_keycloak_realm_keystore_java_keystore.go index 772a96a95..5a99f835a 100644 --- a/provider/resource_keycloak_realm_keystore_java_keystore.go +++ b/provider/resource_keycloak_realm_keystore_java_keystore.go @@ -2,6 +2,7 @@ package provider import ( "context" + "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" @@ -9,7 +10,7 @@ import ( ) var ( - keycloakRealmKeystoreJavaKeystoreAlgorithm = []string{"RS256", "RS384", "RS512", "PS256", "PS384", "PS512"} + keycloakRealmKeystoreJavaKeystoreAlgorithm = []string{"AES", "EdDSA", "ES256", "ES384", "ES512", "HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "PS256", "PS384", "PS512", "RSA1_5", "RSA-OAEP", "RSA-OAEP-256", "ECDH-ES", "ECDH-ES+A128KW", "ECDH-ES+A192KW", "ECDH-ES+A256KW"} ) func resourceKeycloakRealmKeystoreJavaKeystore() *schema.Resource { diff --git a/provider/resource_keycloak_realm_keystore_java_kyestore_test.go b/provider/resource_keycloak_realm_keystore_java_kyestore_test.go index da3b8c200..6a66a266e 100644 --- a/provider/resource_keycloak_realm_keystore_java_kyestore_test.go +++ b/provider/resource_keycloak_realm_keystore_java_kyestore_test.go @@ -2,13 +2,14 @@ package provider import ( "fmt" + "regexp" + "strconv" + "testing" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/keycloak/terraform-provider-keycloak/keycloak" - "regexp" - "strconv" - "testing" ) func TestAccKeycloakRealmKeystoreJava_basic(t *testing.T) { @@ -74,7 +75,7 @@ func TestAccKeycloakRealmKeystoreJava_algorithmValidation(t *testing.T) { skipIfEnvSet(t, "CI") // temporary while I figure out how to put java keystore file to keycloak container in CI - algorithm := randomStringInSlice(keycloakRealmKeystoreRsaAlgorithm) + algorithm := randomStringInSlice(keycloakRealmKeystoreJavaKeystoreAlgorithm) resource.Test(t, resource.TestCase{ ProviderFactories: testAccProviderFactories,