fix: Fix broken managed identity endpoint (#1775)

nagyesta · web-flow · commit 8871b096c887 · 2026-01-01T23:05:53.000+01:00
- Add support to Token API versions - Test token endpoint with API version - Fix Sonar config - Fix validation config Resolves #1773 Resolves #1774 {patch} Signed-off-by: Esta Nagy <nagyesta@gmail.com>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -94,8 +94,10 @@ versioner.apply()
 
 sonar {
     properties {
+        property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/report.xml")
+        property("sonar.junit.reportPaths", "build/test-results/test")
+        property("sonar.sources", "src/main/java")
         property("sonar.exclusions", "**/*.md,.github/**,.idea/**")
-        //no jacoco report because there are no sources
         property("sonar.organization", rootProject.extra.get("sonarOrganization") as String)
         property("sonar.projectKey", rootProject.extra.get("sonarProjectKey") as String)
     }
@@ -105,7 +107,6 @@ subprojects {
     if (project.name != "lowkey-vault-docker") {
         apply(plugin = "java")
         apply(plugin = "org.gradle.jacoco")
-        apply(plugin = "org.sonarqube")
         apply(plugin = "org.gradle.checkstyle")
         apply(plugin = "org.gradle.signing")
         apply(plugin = "org.sonatype.gradle.plugins.scan")
@@ -128,17 +129,6 @@ subprojects {
             toolVersion = rootProject.libs.versions.jacoco.get()
         }
 
-        sonar {
-            properties {
-                property("sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.file("reports/jacoco/report.xml").get().asFile.path)
-                property("sonar.junit.reportPaths", layout.buildDirectory.dir("test-results/test").get().asFile.path)
-                property("sonar.sources", "src/main/java")
-                property("sonar.exclusions", "**/*.md,.github/**,.idea/**")
-                property("sonar.organization", rootProject.extra.get("sonarOrganization") as String)
-                property("sonar.projectKey", rootProject.extra.get("sonarProjectKey") as String)
-            }
-        }
-
         tasks.withType(SonarTask::class).forEach {
             it.dependsOn(tasks.jacocoTestReport)
         }
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/WebConfig.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/WebConfig.java
@@ -15,7 +15,7 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void configureApiVersioning(final ApiVersionConfigurer configurer) {
         configurer.useQueryParam(API_VERSION_NAME)
-                .addSupportedVersions(V_7_2, V_7_3, V_7_4, V_7_5, V_7_6)
+                .addSupportedVersions(TOKEN_VERSION_2018_02_01, TOKEN_VERSION_2019_11_01, V_7_2, V_7_3, V_7_4, V_7_5, V_7_6)
                 .setDefaultVersion(V_7_6)
                 .setVersionParser(IDENTITY_VERSION_PARSER);
     }
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/ApiConstants.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/ApiConstants.java
@@ -56,6 +56,14 @@ public final class ApiConstants {
      * The latest supported API version.
      */
     public static final String LATEST = V_7_6;
+    /**
+     * The token API version: 2018-02-01.
+     */
+    public static final String TOKEN_VERSION_2018_02_01 = "2018-02-01";
+    /**
+     * The token API version: 2019-11-01.
+     */
+    public static final String TOKEN_VERSION_2019_11_01 = "2019-11-01";
     /**
      * API version parameter name.
      */
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/CertificateBackupList.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/CertificateBackupList.java
@@ -12,11 +12,10 @@
 @EqualsAndHashCode
 public class CertificateBackupList implements BackupListContainer<CertificateBackupListItem> {
 
-    @Valid
     @NotNull
     @Size(min = 1)
     @JsonProperty("versions")
-    private List<CertificateBackupListItem> versions = List.of();
+    private List<@Valid CertificateBackupListItem> versions = List.of();
 
     @Override
     public List<CertificateBackupListItem> getVersions() {
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/KeyBackupList.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/KeyBackupList.java
@@ -21,11 +21,10 @@
 public class KeyBackupList
         implements BackupListContainer<KeyBackupListItem> {
 
-    @Valid
     @NotNull
     @Size(min = 1)
     @JsonProperty("versions")
-    private List<KeyBackupListItem> versions = List.of();
+    private List<@Valid KeyBackupListItem> versions = List.of();
     @Nullable
     @Setter
     @Valid
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/SecretBackupList.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/common/backup/SecretBackupList.java
@@ -15,11 +15,10 @@
 public class SecretBackupList
         implements BackupListContainer<SecretBackupListItem> {
 
-    @Valid
     @NotNull
     @Size(min = 1)
     @JsonProperty("versions")
-    private List<SecretBackupListItem> versions = List.of();
+    private List<@Valid SecretBackupListItem> versions = List.of();
 
     public void setVersions(final List<SecretBackupListItem> versions) {
         this.versions = List.copyOf(versions);
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/management/VaultBackupListModel.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/management/VaultBackupListModel.java
@@ -13,9 +13,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class VaultBackupListModel {
 
-    @Valid
     @NotNull
     @Size(min = 1)
     @JsonProperty("vaults")
-    private List<VaultBackupModel> vaults;
+    private List<@Valid VaultBackupModel> vaults;
 }
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/management/VaultBackupModel.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/management/VaultBackupModel.java
@@ -21,15 +21,12 @@ public class VaultBackupModel {
     @JsonProperty("attributes")
     private VaultModel attributes;
     @Nullable
-    @Valid
     @JsonProperty("keys")
-    private Map<String, KeyBackupList> keys;
+    private Map<String, @Valid KeyBackupList> keys;
     @Nullable
-    @Valid
     @JsonProperty("secrets")
-    private Map<String, SecretBackupList> secrets;
+    private Map<String, @Valid SecretBackupList> secrets;
     @Nullable
-    @Valid
     @JsonProperty("certificates")
-    private Map<String, CertificateBackupList> certificates;
+    private Map<String, @Valid CertificateBackupList> certificates;
 }
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/v7_3/certificate/CertificatePolicyModel.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/v7_3/certificate/CertificatePolicyModel.java
@@ -39,9 +39,8 @@ public class CertificatePolicyModel {
     @JsonProperty("attributes")
     private CertificatePropertiesModel attributes;
     @Nullable
-    @Valid
     @Size(max = 1) //only one can be set on the UI
     @JsonProperty("lifetime_actions")
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    private List<CertificateLifetimeActionModel> lifetimeActions;
+    private List<@Valid CertificateLifetimeActionModel> lifetimeActions;
 }
diff --git a/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/v7_3/key/KeyRotationPolicyModel.java b/lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/model/v7_3/key/KeyRotationPolicyModel.java
@@ -26,11 +26,10 @@ public class KeyRotationPolicyModel {
     @NotNull(groups = {Restore.class, Update.class})
     @JsonProperty("attributes")
     private KeyRotationPolicyAttributes attributes;
-    @Valid
     @NotNull(groups = {Restore.class, Update.class})
     @Size(min = 1, max = 2, groups = {Restore.class, Update.class})
     @JsonProperty("lifetimeActions")
-    private List<KeyLifetimeActionModel> lifetimeActions;
+    private List<@Valid KeyLifetimeActionModel> lifetimeActions;
     @Nullable
     @JsonIgnore
     private KeyEntityId keyEntityId;
diff --git a/lowkey-vault-docker/build.gradle.kts b/lowkey-vault-docker/build.gradle.kts
@@ -133,14 +133,6 @@ tasks.test {
     finalizedBy(dockerStop)
 }
 
-sonar {
-    properties {
-        //no jacoco report because there are no sources
-        property("sonar.organization", rootProject.extra.get("sonarOrganization") as String)
-        property("sonar.projectKey", rootProject.extra.get("sonarProjectKey") as String)
-    }
-}
-
 abortMission {
     toolVersion = libs.versions.abortMission.get()
 }
diff --git a/lowkey-vault-testcontainers/src/test/java/com/github/nagyesta/lowkeyvault/testcontainers/AbstractLowkeyVaultContainerTest.java b/lowkey-vault-testcontainers/src/test/java/com/github/nagyesta/lowkeyvault/testcontainers/AbstractLowkeyVaultContainerTest.java
@@ -170,7 +170,8 @@ private static void verifyCertificateCanBeCreated(
     protected void verifyTokenEndpointIsWorking(
             final String endpointUrl,
             final HttpClient httpClient) {
-        final var httpResponse = httpClient.send(new HttpRequest(HttpMethod.GET, endpointUrl + "?resource=https://localhost"))
+        final var httpResponse = httpClient.send(new HttpRequest(HttpMethod.GET, endpointUrl
+                        + "?api-version=2018-02-01&resource=https://localhost"))
                 .doOnError(Assertions::fail)
                 .doOnSuccess(response -> Assertions.assertEquals(SUCCESS, response.getStatusCode()))
                 .single()
diff --git a/lowkey-vault-testcontainers/src/test/java/com/github/nagyesta/lowkeyvault/testcontainers/LowkeyVaultContainerJupiterTest.java b/lowkey-vault-testcontainers/src/test/java/com/github/nagyesta/lowkeyvault/testcontainers/LowkeyVaultContainerJupiterTest.java
@@ -33,15 +33,15 @@ class LowkeyVaultContainerJupiterTest extends AbstractLowkeyVaultContainerTest {
 
     @Test
     void testContainerShouldStartUpWhenCalledWithValidNames() {
-        //given + when test container is created
+        //given + when the test container is created
 
         //then
         verifyConnectionIsWorking(underTest, VAULT_NAME);
     }
 
     @Test
     void testContainerShouldStartUpWhenCalledWithValidNamesUsingAlias() {
-        //given + when test container is created
+        //given + when the test container is created
 
         //then
         final var endpoint = URI.create("https://" + ALIAS);
@@ -50,7 +50,7 @@ void testContainerShouldStartUpWhenCalledWithValidNamesUsingAlias() {
 
     @Test
     void testContainerShouldProvideTokenEndpointWhenCalledWithValidParameters() {
-        //given test container is created
+        //given, the test container is created
 
         //when
         final var endpoint = underTest.getTokenEndpointUrl();
@@ -63,7 +63,7 @@ void testContainerShouldProvideTokenEndpointWhenCalledWithValidParameters() {
 
     @Test
     void testContainerShouldProvideDefaultKeyStoreWhenRequested() throws Exception {
-        //given test container is created
+        //given, the test container is created
 
         //when
         final var password = underTest.getDefaultKeyStorePassword();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class WebConfig implements WebMvcConfigurer {`
`15`	`15`	`@Override`
`16`	`16`	`public void configureApiVersioning(final ApiVersionConfigurer configurer) {`
`17`	`17`	`configurer.useQueryParam(API_VERSION_NAME)`
`18`		`- .addSupportedVersions(V_7_2, V_7_3, V_7_4, V_7_5, V_7_6)`
	`18`	`+ .addSupportedVersions(TOKEN_VERSION_2018_02_01, TOKEN_VERSION_2019_11_01, V_7_2, V_7_3, V_7_4, V_7_5, V_7_6)`
`19`	`19`	`.setDefaultVersion(V_7_6)`
`20`	`20`	`.setVersionParser(IDENTITY_VERSION_PARSER);`
`21`	`21`	`}`