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.

Sign up for GitHub

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

Add 1-to-2 migration functionality #1175

Merged
merged 1 commit into from
Apr 26, 2022
Merged

Add 1-to-2 migration functionality #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions smithy-cli/src/main/java/software/amazon/smithy/cli/SmithyCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import software.amazon.smithy.cli.commands.BuildCommand;
import software.amazon.smithy.cli.commands.DiffCommand;
import software.amazon.smithy.cli.commands.SelectCommand;
import software.amazon.smithy.cli.commands.Upgrade1to2Command;
import software.amazon.smithy.cli.commands.ValidateCommand;

/**
Expand Down Expand Up @@ -98,6 +99,7 @@ private Cli createCliRunner() {
cli.addCommand(new DiffCommand());
cli.addCommand(new SelectCommand());
cli.addCommand(new AstCommand());
cli.addCommand(new Upgrade1to2Command());
cli.setConfigureLogging(configureLogging);
return cli;
}
Expand Down
73 changes: 48 additions & 25 deletions smithy-cli/src/main/java/software/amazon/smithy/cli/commands/CommandUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
Expand All @@ -44,19 +45,48 @@ final class CommandUtils {
private CommandUtils() {}

static Model buildModel(Arguments arguments, ClassLoader classLoader, Set<Validator.Feature> features) {
List<String> models = arguments.positionalArguments();
Severity minSeverity = arguments.has(SmithyCli.SEVERITY)
? parseSeverity(arguments.parameter(SmithyCli.SEVERITY))
: Severity.NOTE;
return buildModel(
arguments.positionalArguments(),
classLoader,
minSeverity,
arguments.has(SmithyCli.DISCOVER),
arguments.parameter(SmithyCli.DISCOVER_CLASSPATH, null),
arguments.has(SmithyCli.ALLOW_UNKNOWN_TRAITS),
features
);
}

static Model buildModel(
List<String> models,
ClassLoader classLoader,
Severity minSeverity,
boolean discover,
String discoverPath,
boolean allowUnknownTraits
) {
return buildModel(
models, classLoader, minSeverity, discover, discoverPath, allowUnknownTraits, Collections.emptySet());
}

static Model buildModel(
List<String> models,
ClassLoader classLoader,
Severity minSeverity,
boolean discover,
String discoverPath,
boolean allowUnknownTraits,
Set<Validator.Feature> features
) {
ModelAssembler assembler = CommandUtils.createModelAssembler(classLoader);

ContextualValidationEventFormatter formatter = new ContextualValidationEventFormatter();
boolean stdout = features.contains(Validator.Feature.STDOUT);
boolean quiet = features.contains(Validator.Feature.QUIET);
Consumer<String> writer = stdout ? Cli.getStdout() : Cli.getStderr();

// --severity defaults to NOTE.
Severity minSeverity = arguments.has(SmithyCli.SEVERITY)
? parseSeverity(arguments.parameter(SmithyCli.SEVERITY))
: Severity.NOTE;

assembler.validationEventListener(event -> {
// Only log events that are >= --severity.
if (event.getSeverity().ordinal() >= minSeverity.ordinal()) {
Expand All @@ -72,8 +102,17 @@ static Model buildModel(Arguments arguments, ClassLoader classLoader, Set<Valida
}
});

CommandUtils.handleModelDiscovery(arguments, assembler, classLoader);
CommandUtils.handleUnknownTraitsOption(arguments, assembler);
if (discoverPath != null) {
discoverModelsWithClasspath(discoverPath, assembler);
} else if (discover) {
assembler.discoverModels(classLoader);
}

if (allowUnknownTraits) {
LOGGER.fine("Ignoring unknown traits");
assembler.putProperty(ModelAssembler.ALLOW_UNKNOWN_TRAITS, true);
}

models.forEach(assembler::addImport);
ValidatedResult<Model> result = assembler.assemble();
Validator.validate(result, features);
Expand All @@ -89,23 +128,7 @@ static ModelAssembler createModelAssembler(ClassLoader classLoader) {
return Model.assembler(classLoader).putProperty(ModelAssembler.DISABLE_JAR_CACHE, true);
}

private static void handleUnknownTraitsOption(Arguments arguments, ModelAssembler assembler) {
if (arguments.has(SmithyCli.ALLOW_UNKNOWN_TRAITS)) {
LOGGER.fine("Ignoring unknown traits");
assembler.putProperty(ModelAssembler.ALLOW_UNKNOWN_TRAITS, true);
}
}

private static void handleModelDiscovery(Arguments arguments, ModelAssembler assembler, ClassLoader baseLoader) {
if (arguments.has(SmithyCli.DISCOVER_CLASSPATH)) {
discoverModelsWithClasspath(arguments, assembler);
} else if (arguments.has(SmithyCli.DISCOVER)) {
assembler.discoverModels(baseLoader);
}
}

private static void discoverModelsWithClasspath(Arguments arguments, ModelAssembler assembler) {
String rawClasspath = arguments.parameter(SmithyCli.DISCOVER_CLASSPATH);
private static void discoverModelsWithClasspath(String rawClasspath, ModelAssembler assembler) {
LOGGER.finer("Discovering models with classpath: " + rawClasspath);

// Use System.getProperty here each time since it allows the value to be changed.
Expand Down
Loading