From 0a9bedda73defa5058e402d2e53cb5c622d9213c Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 15 Oct 2024 14:26:29 -0400 Subject: [PATCH] Minor fixes while debugging an environmental issue that was resulting in test failures --- app/src/main/resources/application.properties | 2 +- .../noprofile/rest/v3/DraftContentTest.java | 4 +-- .../ref-registry-all-configs.adoc | 8 +++--- ...afkasqlRecoverFromSnapshotTestProfile.java | 27 ------------------- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 utils/tests/src/main/java/io/apicurio/registry/utils/tests/KafkasqlRecoverFromSnapshotTestProfile.java diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index d53c3c73f3..104293b6fd 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -160,7 +160,7 @@ apicurio.import.work-dir=${java.io.tmpdir} ## SQL Storage apicurio.storage.sql.kind=h2 -apicurio.datasource.url=jdbc:h2:mem:${quarkus.uuid} +apicurio.datasource.url=jdbc:h2:mem:db_${quarkus.uuid} apicurio.datasource.username=sa apicurio.datasource.password=sa apicurio.datasource.jdbc.initial-size=20 diff --git a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/DraftContentTest.java b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/DraftContentTest.java index 69796eb4db..9daa069b6d 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/DraftContentTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/DraftContentTest.java @@ -436,8 +436,8 @@ public void testDraftVersionsInCoreV2() throws Exception { String artifactId = TestUtils.generateArtifactId(); // Create artifact with version as DRAFT - CreateArtifact createArtifact = TestUtils.clientCreateArtifact(artifactId, ArtifactType.AVRO, - content, ContentTypes.APPLICATION_JSON); + CreateArtifact createArtifact = TestUtils.clientCreateArtifact(artifactId, ArtifactType.AVRO, content, + ContentTypes.APPLICATION_JSON); createArtifact.getFirstVersion().setIsDraft(true); createArtifact.getFirstVersion().setVersion("1.0"); CreateArtifactResponse car = clientV3.groups().byGroupId(groupId).artifacts().post(createArtifact); diff --git a/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc b/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc index 9a28bd12b3..5c76e1e944 100644 --- a/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc +++ b/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc @@ -71,7 +71,7 @@ The following {registry} configuration options are available for each component |`apicurio.auth.admin-override.user` |`string` |`admin` -|`3.0.0.Final` +|`3.0.0` |Auth admin override user name |`apicurio.auth.anonymous-read-access.enabled` |`boolean [dynamic]` @@ -530,12 +530,12 @@ The following {registry} configuration options are available for each component |`apicurio.rest.artifact.download.max-size.bytes` |`int` |`1000000` -|`2.2.6-SNAPSHOT` +|`2.2.6` |Max size of the artifact allowed to be downloaded from URL |`apicurio.rest.artifact.download.ssl-validation.disabled` |`boolean` |`false` -|`2.2.6-SNAPSHOT` +|`2.2.6` |Skip SSL validation when downloading artifacts from URL |`apicurio.rest.deletion.artifact-version.enabled` |`boolean [dynamic]` @@ -832,7 +832,7 @@ The following {registry} configuration options are available for each component |`artifacts.skip.disabled.latest` |`boolean` |`true` -|`2.4.2-SNAPSHOT` +|`2.4.2` |Skip artifact versions with DISABLED state when retrieving latest artifact version |=== diff --git a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/KafkasqlRecoverFromSnapshotTestProfile.java b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/KafkasqlRecoverFromSnapshotTestProfile.java deleted file mode 100644 index 3ff76d54d3..0000000000 --- a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/KafkasqlRecoverFromSnapshotTestProfile.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.apicurio.registry.utils.tests; - -import io.quarkus.test.junit.QuarkusTestProfile; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public class KafkasqlRecoverFromSnapshotTestProfile implements QuarkusTestProfile { - - @Override - public Map getConfigOverrides() { - return Map.of("apicurio.storage.kind", "kafkasql", "apicurio.datasource.url", - "jdbc:h2:mem:" + UUID.randomUUID()); - } - - @Override - public List testResources() { - if (!Boolean.parseBoolean(System.getProperty("cluster.tests"))) { - return List.of(new TestResourceEntry(KafkaTestContainerManager.class)); - } else { - return Collections.emptyList(); - } - } - -}