diff --git a/cli/README.md b/cli/README.md index bbfb0230..79710690 100644 --- a/cli/README.md +++ b/cli/README.md @@ -4,6 +4,8 @@ Commands to provision, export and capture production & consumption chargeback me This page also contains a simple docker guide for local testing. +[See further down the page for setting up a Docker environment](https://github.com/specmesh/specmesh-build/tree/main/cli#quickstart-using-docker-on-the-local-machine) + ## Command: Provision @@ -39,7 +41,7 @@ sr.api.secret=nothing Long form ``` - Usage: provision [-aclEnabled] [-clean] [-dry] [-srEnabled] [-bs=] + Usage: provision [-aclDisabled] [-clean] [-dry] [-srDisabled] [-bs=] [-s=] [-schemaPath=] [-spec=] [-sr=] [-srKey=] [-srSecret=] [-u=] @@ -49,9 +51,8 @@ Use 'provision.properties' for common arguments Explicit properties file location /app/provision.properties - -aclEnabled, --acl-enabled - True (default) will provision/publish/validate - ACls. False will ignore ACL related operations + -aclDisabled, --acl-disabled + Ignore ACL related operations -bs, --bootstrap-server= Kafka bootstrap server url -clean, --clean-unspecified @@ -76,10 +77,8 @@ Use 'provision.properties' for common arguments -spec, --spec= specmesh specification file -sr, --schema-registry= schemaRegistryUrl - -srEnabled, --sr-enabled - True (default) will provision/publish/validate - schemas. False will ignore schema related - operations + -srDisabled, --sr-disabled + Ignore schema related operations -srKey, --sr-api-key= srApiKey for schema registry -srSecret, --sr-api-secret= diff --git a/cli/src/main/java/io/specmesh/cli/Provision.java b/cli/src/main/java/io/specmesh/cli/Provision.java index 7b0bd741..16eeb62e 100644 --- a/cli/src/main/java/io/specmesh/cli/Provision.java +++ b/cli/src/main/java/io/specmesh/cli/Provision.java @@ -92,20 +92,14 @@ public static void main(final String[] args) { private String brokerUrl = ""; @Option( - names = {"-srEnabled", "--sr-enabled"}, - fallbackValue = "true", - description = - "True (default) will provision/publish/validate schemas. False will ignore" - + " schema related operations") - private boolean srEnabled; + names = {"-srDisabled", "--sr-disabled"}, + description = "Ignore schema related operations") + private boolean srDisabled = false; @Option( - names = {"-aclEnabled", "--acl-enabled"}, - fallbackValue = "true", - description = - "True (default) will provision/publish/validate ACls. False will ignore ACL" - + " related operations") - private boolean aclEnabled; + names = {"-aclDisabled", "--acl-enabled"}, + description = "Ignore ACL related operations") + private boolean aclDisabled; @Option( names = {"-sr", "--schema-registry"}, @@ -175,14 +169,14 @@ void setProperty(final Map props) { public Integer call() throws Exception { final var status = Provisioner.provision( - aclEnabled, + !aclDisabled, dryRun, cleanUnspecified, specMeshSpec(), schemaPath, Clients.adminClient(brokerUrl, username, secret), Clients.schemaRegistryClient( - srEnabled, schemaRegistryUrl, srApiKey, srApiSecret)); + !srDisabled, schemaRegistryUrl, srApiKey, srApiSecret)); System.out.println(status.toString()); this.state = status; diff --git a/kafka/src/main/java/io/specmesh/kafka/provision/SchemaProvisioner.java b/kafka/src/main/java/io/specmesh/kafka/provision/SchemaProvisioner.java index 92d4df30..a44a1dfd 100644 --- a/kafka/src/main/java/io/specmesh/kafka/provision/SchemaProvisioner.java +++ b/kafka/src/main/java/io/specmesh/kafka/provision/SchemaProvisioner.java @@ -76,8 +76,8 @@ public static Collection provision( "Required Schemas Failed to load:" + required); } - return mutator(dryRun, cleanUnspecified, client) - .mutate(calculator(client, cleanUnspecified).calculate(existing, required)); + final var schemas = calculator(client, cleanUnspecified).calculate(existing, required); + return mutator(dryRun, cleanUnspecified, client).mutate(schemas); } /**