Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed artifact-version deletion config property name #117

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class RestConfig {
Supplier<Boolean> 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<Boolean> artifactVersionDeletionEnabled;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public Map<String, String> 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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public Map<String, String> getConfigOverrides() {
Map<String, String> 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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Map<String, String> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public Map<String, String> getConfigOverrides() {
Map<String, String> 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;
}
}