From 5aee39a1e26de8028c28e563ea275a4051f7aaff Mon Sep 17 00:00:00 2001 From: wslulciuc Date: Mon, 29 Aug 2022 20:46:34 -0700 Subject: [PATCH] Drop need to provide marquez.yml for seed cmd Signed-off-by: wslulciuc --- api/src/main/java/marquez/cli/SeedCommand.java | 13 ++++--------- docker/seed.sh | 7 +------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/marquez/cli/SeedCommand.java b/api/src/main/java/marquez/cli/SeedCommand.java index 4e1b1d131d..9d61c650c8 100644 --- a/api/src/main/java/marquez/cli/SeedCommand.java +++ b/api/src/main/java/marquez/cli/SeedCommand.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.ImmutableList; -import io.dropwizard.cli.ConfiguredCommand; +import io.dropwizard.cli.Command; import io.dropwizard.setup.Bootstrap; import io.openlineage.client.OpenLineage; import io.openlineage.client.OpenLineageClient; @@ -18,7 +18,6 @@ import lombok.NonNull; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import marquez.MarquezConfig; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; @@ -37,7 +36,7 @@ * For example, to override the {@code url}: * *
{@code
- * java -jar marquez-api.jar seed --url http://localhost:5000 --metadata metadata.json marquez.yml
+ * java -jar marquez-api.jar seed --url http://localhost:5000 --metadata metadata.json
  * }
* *

where, {@code metadata.json} contains metadata for run {@code @@ -93,7 +92,7 @@ *

Note: The {@code seed} command requires a running instance of Marquez. */ @Slf4j -public final class SeedCommand extends ConfiguredCommand { +public final class SeedCommand extends Command { /* Default URL for HTTP backend. */ private static final String DEFAULT_OL_URL = "http://localhost:8080"; @@ -109,7 +108,6 @@ public SeedCommand() { /* Configure seed command. */ @Override public void configure(@NonNull final Subparser subparser) { - super.configure(subparser); subparser .addArgument("--url") .dest("url") @@ -126,10 +124,7 @@ public void configure(@NonNull final Subparser subparser) { } @Override - protected void run( - @NonNull Bootstrap bootstrap, - @NonNull Namespace namespace, - @NonNull MarquezConfig config) { + public void run(@NonNull Bootstrap bootstrap, @NonNull Namespace namespace) { final String olUrl = namespace.getString(CMD_ARG_OL_URL); final String olMetadata = namespace.getString(CMD_ARG_OL_METADATA); // Use HTTP transport. diff --git a/docker/seed.sh b/docker/seed.sh index 25134e4d92..8f4f112d64 100755 --- a/docker/seed.sh +++ b/docker/seed.sh @@ -7,9 +7,4 @@ set -e -if [[ -z "${MARQUEZ_CONFIG}" ]]; then - MARQUEZ_CONFIG='marquez.dev.yml' - echo "WARNING 'MARQUEZ_CONFIG' not set, using development configuration." -fi - -java -jar marquez-api-*.jar seed --url "${MARQUEZ_URL:-http://localhost:5000}" --metadata metadata.json "${MARQUEZ_CONFIG}" +java -jar marquez-api-*.jar seed --url "${MARQUEZ_URL:-http://localhost:5000}" --metadata metadata.json