From 5e15f963721cde011b36fd06ee93ad7a9cb03f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= Date: Wed, 21 Apr 2021 12:34:23 +0200 Subject: [PATCH] add composer support to the repo-ls command --- .../com/schibsted/security/artishock/cli/view/Commands.java | 2 +- .../schibsted/security/artishock/cli/viewmodel/Artishock.java | 3 ++- .../com/schibsted/security/artishock/shared/PackageSystem.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/schibsted/security/artishock/cli/view/Commands.java b/src/main/java/com/schibsted/security/artishock/cli/view/Commands.java index 0cea610..e1232a8 100644 --- a/src/main/java/com/schibsted/security/artishock/cli/view/Commands.java +++ b/src/main/java/com/schibsted/security/artishock/cli/view/Commands.java @@ -106,7 +106,7 @@ public void run() { @Command(name = "repo-ls", description = "List Artifactory repositories") public static class RepoLs extends BaseCommand { - @io.airlift.airline.Option(type = OptionType.COMMAND, name = PACKAGE_SYSTEM_NAME, description = "maven, npm, pypi") + @io.airlift.airline.Option(type = OptionType.COMMAND, name = PACKAGE_SYSTEM_NAME, description = "maven, npm, pypi, composer") public String packageSystem; @Override diff --git a/src/main/java/com/schibsted/security/artishock/cli/viewmodel/Artishock.java b/src/main/java/com/schibsted/security/artishock/cli/viewmodel/Artishock.java index a503776..3dc2add 100644 --- a/src/main/java/com/schibsted/security/artishock/cli/viewmodel/Artishock.java +++ b/src/main/java/com/schibsted/security/artishock/cli/viewmodel/Artishock.java @@ -33,7 +33,8 @@ public Artishock() { } public List repoLs(String packageSystem) { - throwIfNotSupportedOptional(packageSystem, List.of(PackageSystem.MAVEN, PackageSystem.NPM, PackageSystem.PYPI)); + throwIfNotSupportedOptional(packageSystem, List.of(PackageSystem.MAVEN, PackageSystem.NPM, PackageSystem.PYPI, + PackageSystem.COMPOSER)); return artifactoryClient.repoLs().stream() .filter(f -> packageSystem == null || f.getArtifactType().equals(packageSystem)) diff --git a/src/main/java/com/schibsted/security/artishock/shared/PackageSystem.java b/src/main/java/com/schibsted/security/artishock/shared/PackageSystem.java index 1181d49..822ef0a 100644 --- a/src/main/java/com/schibsted/security/artishock/shared/PackageSystem.java +++ b/src/main/java/com/schibsted/security/artishock/shared/PackageSystem.java @@ -12,7 +12,8 @@ public enum PackageSystem { NPM("npm"), MAVEN("maven"), GRADLE("gradle"), - PYPI("pypi"); + PYPI("pypi"), + COMPOSER("composer"); private final String alias;