From 2f181084a31b48311e3fa1431e85f92676b2b380 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Thu, 26 Sep 2024 08:44:58 -0400 Subject: [PATCH] Fixed artifact-version deletion config property name --- .../java/io/apicurio/registry/rest/RestConfig.java | 2 +- app/src/main/resources/application.properties | 6 +++--- .../apicurio/registry/noprofile/config/ConfigTest.java | 4 +++- .../getting-started/ref-registry-all-configs.adoc | 10 +++++----- .../utils/tests/ApplicationRbacEnabledProfile.java | 2 +- .../apicurio/registry/utils/tests/AuthTestProfile.java | 2 +- .../tests/BasicAuthWithPropertiesTestProfile.java | 2 +- .../registry/utils/tests/DeletionEnabledProfile.java | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/io/apicurio/registry/rest/RestConfig.java b/app/src/main/java/io/apicurio/registry/rest/RestConfig.java index 1e15666374..e4b309eb91 100644 --- a/app/src/main/java/io/apicurio/registry/rest/RestConfig.java +++ b/app/src/main/java/io/apicurio/registry/rest/RestConfig.java @@ -29,7 +29,7 @@ public class RestConfig { Supplier artifactDeletionEnabled; @Dynamic(label = "Delete artifact version", description = "When selected, users are permitted to delete artifact versions.") - @ConfigProperty(name = "apicurio.rest.deletion.artifactVersion.enabled", defaultValue = "false") + @ConfigProperty(name = "apicurio.rest.deletion.artifact-version.enabled", defaultValue = "false") @Info(category = "rest", description = "Enables artifact version deletion", availableSince = "2.4.2-SNAPSHOT") Supplier artifactVersionDeletionEnabled; diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 140a642304..4936853548 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -117,19 +117,19 @@ apicurio.config.dynamic.allow-all=true apicurio.auth.owner-only-authorization.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.auth.owner-only-authorization.limit-group-access.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.auth.anonymous-read-access.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} +apicurio.authn.basic-client-credentials.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.ccompat.legacy-id-mode.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.ccompat.use-canonical-hash.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.ccompat.max-subjects.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.download.href.ttl.seconds.dynamic.allow=${apicurio.config.dynamic.allow-all} -apicurio.ui.features.read-only.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} -apicurio.storage.read-only.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} -apicurio.authn.basic-client-credentials.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.rest.deletion.group.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.rest.deletion.artifact.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.rest.deletion.artifact-version.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.semver.validation.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.semver.branching.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} apicurio.semver.branching.coerce.dynamic.allow=${apicurio.config.dynamic.allow-all} +apicurio.storage.read-only.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} +apicurio.ui.features.read-only.enabled.dynamic.allow=${apicurio.config.dynamic.allow-all} # Error apicurio.api.errors.include-stack-in-response=false diff --git a/app/src/test/java/io/apicurio/registry/noprofile/config/ConfigTest.java b/app/src/test/java/io/apicurio/registry/noprofile/config/ConfigTest.java index 8e2ad0b154..973eb86422 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/config/ConfigTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/config/ConfigTest.java @@ -25,6 +25,8 @@ public void configurationTest() { } private boolean propertyDontMatchPattern(String propertyName) { - return propertyName.chars().anyMatch(Character::isUpperCase); + boolean hasUpperCase = propertyName.chars().anyMatch(Character::isUpperCase); + boolean hasUnderscore = propertyName.chars().anyMatch(c -> c == '_'); + return hasUpperCase || hasUnderscore; } } 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 375450c57f..504bf25c5b 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 @@ -542,16 +542,16 @@ The following {registry} configuration options are available for each component |`false` |`2.2.6-SNAPSHOT` |Skip SSL validation when downloading artifacts from URL +|`apicurio.rest.deletion.artifact-version.enabled` +|`boolean [dynamic]` +|`false` +|`2.4.2-SNAPSHOT` +|Enables artifact version deletion |`apicurio.rest.deletion.artifact.enabled` |`boolean [dynamic]` |`false` |`3.0.0` |Enables artifact deletion -|`apicurio.rest.deletion.artifactVersion.enabled` -|`boolean [dynamic]` -|`false` -|`2.4.2-SNAPSHOT` -|Enables artifact version deletion |`apicurio.rest.deletion.group.enabled` |`boolean [dynamic]` |`false` diff --git a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/ApplicationRbacEnabledProfile.java b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/ApplicationRbacEnabledProfile.java index c92ebfd408..d9a202c5e1 100644 --- a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/ApplicationRbacEnabledProfile.java +++ b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/ApplicationRbacEnabledProfile.java @@ -16,7 +16,7 @@ public Map getConfigOverrides() { props.put("apicurio.auth.role-source", "application"); props.put("apicurio.rest.deletion.group.enabled", "true"); props.put("apicurio.rest.deletion.artifact.enabled", "true"); - props.put("apicurio.rest.deletion.artifactVersion.enabled", "true"); + props.put("apicurio.rest.deletion.artifact-version.enabled", "true"); return props; } } diff --git a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/AuthTestProfile.java b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/AuthTestProfile.java index 55acbf7f22..c5969c7cee 100644 --- a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/AuthTestProfile.java +++ b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/AuthTestProfile.java @@ -14,7 +14,7 @@ public Map getConfigOverrides() { Map props = new HashMap<>(); props.put("apicurio.rest.deletion.group.enabled", "true"); props.put("apicurio.rest.deletion.artifact.enabled", "true"); - props.put("apicurio.rest.deletion.artifactVersion.enabled", "true"); + props.put("apicurio.rest.deletion.artifact-version.enabled", "true"); props.put("smallrye.jwt.sign.key.location", "privateKey.jwk"); return props; } diff --git a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/BasicAuthWithPropertiesTestProfile.java b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/BasicAuthWithPropertiesTestProfile.java index 5268538dda..97b276626e 100644 --- a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/BasicAuthWithPropertiesTestProfile.java +++ b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/BasicAuthWithPropertiesTestProfile.java @@ -29,7 +29,7 @@ public Map getConfigOverrides() { map.put("quarkus.security.users.embedded.roles.duncan", "sr-readonly"); map.put("apicurio.rest.deletion.group.enabled", "true"); map.put("apicurio.rest.deletion.artifact.enabled", "true"); - map.put("apicurio.rest.deletion.artifactVersion.enabled", "true"); + map.put("apicurio.rest.deletion.artifact-version.enabled", "true"); return map; } diff --git a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/DeletionEnabledProfile.java b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/DeletionEnabledProfile.java index e1f161b58e..b89af55144 100644 --- a/utils/tests/src/main/java/io/apicurio/registry/utils/tests/DeletionEnabledProfile.java +++ b/utils/tests/src/main/java/io/apicurio/registry/utils/tests/DeletionEnabledProfile.java @@ -12,7 +12,7 @@ public Map getConfigOverrides() { Map props = new HashMap<>(); props.put("apicurio.rest.deletion.group.enabled", "true"); props.put("apicurio.rest.deletion.artifact.enabled", "true"); - props.put("apicurio.rest.deletion.artifactVersion.enabled", "true"); + props.put("apicurio.rest.deletion.artifact-version.enabled", "true"); return props; } }