Merge pull request #190 from authlete/fix/client-jwks-update

fix: client remove jwk when neither jwk or jwks is provided

Author: shaikathaque

GNUmakefile

@@ -4,7 +4,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=authlete
 NAME=authlete
 BINARY=terraform-provider-${NAME}
-VERSION=1.3.14
+VERSION=1.3.17
 OS_ARCH=darwin_arm64
 OS_ARCH_AMD64=linux_amd64
 

internal/provider/client.go

@@ -794,12 +794,23 @@ func setDataToClient(d *schema.ResourceData, diags diag.Diagnostics, client ICli
 		}
 	}
 	if d.HasChanges("jwks", "jwk") {
-		if NotZeroString(d, "jwks") {
+		isJwksStringProvided := NotZeroString(d, "jwks")
+		configuredJwkBlocks := d.Get("jwk").(*schema.Set).List()
+
+		if isJwksStringProvided {
+			// jwks takes importance over jwk
 			client.SetJwks(d.Get("jwks").(string))
-		} else if NotZeroArray(d, "jwk") {
+		} else if len(configuredJwkBlocks) > 0 {
 			var jwk string
-			jwk, _ = updateJWKS(d.Get("jwk").(*schema.Set).List(), client.GetJwks(), diags)
+			jwk, _ = updateJWKS(configuredJwkBlocks, client.GetJwks(), diags)
 			client.SetJwks(jwk)
+		} else {
+			// neither jwks string or jwk blocks provided. Remove jwk.
+			if v3 {
+				client.(*authlete3.Client).Jwks = nil
+			} else {
+				client.(*authlete.Client).Jwks = nil
+			}
 		}
 	}
 	if d.HasChange("derived_sector_identifier") {