Add --name option for storage profile clis.

Author: chenkins

admin-cli/src/main/java/cloud/katta/cli/commands/hub/AbstractStorageProfile.java

@@ -19,20 +19,22 @@ public abstract class AbstractStorageProfile extends AbstractAuthorizationCode i
     @CommandLine.Option(names = {"--uuid"}, description = "The uuid.", required = true)
     String uuid;
 
+    @CommandLine.Option(names = {"--name"}, description = "The name.", required = true)
+    String name;
+
     @Override
     public Void call() throws Exception {
         final String accessToken = login();
-        call(hubUrl, accessToken, uuid);
+        call(hubUrl, accessToken, uuid, name);
         return null;
     }
 
-    protected void call(final String hubUrl, final String accessToken, final String uuid) throws ApiException {
+    protected void call(final String hubUrl, final String accessToken, final String uuid, final String name) throws ApiException {
         final ApiClient apiClient = new ApiClient();
         apiClient.setBasePath(hubUrl);
         apiClient.addDefaultHeader("Authorization", "Bearer " + accessToken);
-        call(UUID.fromString(uuid), apiClient);
+        call(UUID.fromString(uuid), name, apiClient);
     }
 
-
-    protected abstract void call(final UUID uuid, final ApiClient apiClient) throws ApiException;
+    protected abstract void call(final UUID uuid, final String name, final ApiClient apiClient) throws ApiException;
 }

admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileArchive.java

@@ -24,7 +24,7 @@
 public class StorageProfileArchive extends AbstractStorageProfile {
 
     @Override
-    protected void call(final UUID uuid, final ApiClient apiClient) throws ApiException {
+    protected void call(final UUID uuid, final String name, final ApiClient apiClient) throws ApiException {
         final StorageProfileResourceApi storageProfileResourceApi = new StorageProfileResourceApi(apiClient);
         call(uuid, storageProfileResourceApi);
     }

admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileAwsStaticSetup.java

@@ -26,16 +26,16 @@
 public class StorageProfileAwsStaticSetup extends AbstractStorageProfile {
 
     @Override
-    protected void call(final UUID uuid, final ApiClient apiClient) throws ApiException {
+    protected void call(final UUID uuid, final String name, final ApiClient apiClient) throws ApiException {
         final StorageProfileResourceApi storageProfileResourceApi = new StorageProfileResourceApi(apiClient);
 
-        call(uuid, storageProfileResourceApi);
+        call(uuid, name, storageProfileResourceApi);
     }
 
-    protected void call(UUID uuid, StorageProfileResourceApi storageProfileResourceApi) throws ApiException {
+    protected void call(final UUID uuid, final String name, final StorageProfileResourceApi storageProfileResourceApi) throws ApiException {
         storageProfileResourceApi.apiStorageprofileS3staticPost(new StorageProfileS3StaticDto()
                 .id(uuid)
-                .name("AWS S3 static")
+                .name(name)
                 .protocol(Protocol.S3_STATIC)
                 .storageClass(S3STORAGECLASSES.STANDARD)
                 .archived(false)

admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileAwsStsSetup.java

@@ -35,16 +35,16 @@ public class StorageProfileAwsStsSetup extends AbstractStorageProfile {
     String bucketPrefix;
 
     @Override
-    protected void call(final UUID uuid, final ApiClient apiClient) throws ApiException {
+    protected void call(final UUID uuid, final String name, final ApiClient apiClient) throws ApiException {
         final StorageProfileResourceApi storageProfileResourceApi = new StorageProfileResourceApi(apiClient);
 
-        call(uuid, storageProfileResourceApi);
+        call(uuid, name, storageProfileResourceApi);
     }
 
-    protected void call(UUID uuid, StorageProfileResourceApi storageProfileResourceApi) throws ApiException {
+    protected void call(final UUID uuid, final String name, final StorageProfileResourceApi storageProfileResourceApi) throws ApiException {
         storageProfileResourceApi.apiStorageprofileS3stsPost(new StorageProfileS3STSDto()
                 .id(uuid)
-                .name("AWS S3 STS")
+                .name(name)
                 .bucketPrefix(bucketPrefix)
                 .protocol(Protocol.S3_STS)
                 .storageClass(S3STORAGECLASSES.STANDARD)

admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileArchiveIT.java

@@ -54,7 +54,7 @@ public void testStorageProfileArchive() throws Exception {
             assertTrue(profile.isPresent());
             assertFalse(profile.get().getArchived());
         }
-        new StorageProfileArchive().call("http://localhost:8280", accessToken, storageProfileId);
+        new StorageProfileArchive().call("http://localhost:8280", accessToken, storageProfileId, "S3 static");
         {
             final Optional<StorageProfileS3StaticDto> profile = storageProfileResourceApi.apiStorageprofileGet(null).stream().filter(p -> StorageProfileDtoWrapper.coerce(p).getId().toString().toLowerCase().equals(storageProfileId)).map(StorageProfileDto::getActualInstance).map(StorageProfileS3StaticDto.class::cast).findFirst();
             assertTrue(profile.isPresent());

admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileAwsStaticSetupTest.java

@@ -24,7 +24,7 @@ public void testCall() throws ApiException {
         final StorageProfileResourceApi api = Mockito.mock(StorageProfileResourceApi.class);
         final UUID vaultId = UUID.randomUUID();
         final StorageProfileAwsStaticSetup cli = new StorageProfileAwsStaticSetup();
-        cli.call(vaultId, api);
+        cli.call(vaultId, "AWS S3 static", api);
 
         final StorageProfileS3StaticDto dto = new StorageProfileS3StaticDto();
         dto.setId(vaultId);

admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileAwsStsSetupIT.java

@@ -35,6 +35,7 @@ public void testStorageProfileAwsStsSetup() throws Exception {
                 "--hubUrl", "http://localhost:8280",
                 "--accessToken", accessToken,
                 "--uuid", storageProfileId.toString(),
+                "--name", "AWS S3 STS",
                 "--rolePrefix", "arn:aws:iam::linguine:role/farfalle"
         );
         assertEquals(0, rc);

admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileAwsStsSetupTest.java

@@ -28,7 +28,7 @@ public void testCall() throws ApiException {
         final StorageProfileAwsStsSetup cli = new StorageProfileAwsStsSetup();
         cli.bucketPrefix = "fancy";
         cli.rolePrefix = "arn:aws:iam::1234:role/testing.katta.cloud-kc-realms-pepper";
-        cli.call(vaultId, api);
+        cli.call(vaultId, "AWS S3 STS", api);
 
         final StorageProfileS3STSDto dto = new StorageProfileS3STSDto();
         dto.setId(vaultId);