diff options
Diffstat (limited to 'common-be')
3 files changed, 103 insertions, 8 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java index 7b9cf087a6..bc0792b472 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java @@ -24,11 +24,14 @@ import static org.openecomp.sdc.common.errors.Messages.EXTERNAL_CSAR_STORE_CONFI import io.minio.BucketExistsArgs; import io.minio.GetObjectArgs; +import io.minio.ListObjectsArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; import io.minio.PutObjectArgs; +import io.minio.RemoveBucketArgs; import io.minio.RemoveObjectArgs; import io.minio.StatObjectArgs; +import io.minio.messages.Item; import java.io.InputStream; import java.util.Map; import lombok.Getter; @@ -134,12 +137,7 @@ public class MinIoStorageArtifactStorageManager implements ArtifactStorageManage @Override public InputStream get(final ArtifactInfo artifactInfo) { final MinIoArtifactInfo minioObject = (MinIoArtifactInfo) artifactInfo; - try { - return get(minioObject.getBucket(), minioObject.getObjectName()); - } catch (final Exception e) { - LOGGER.error("Failed to get - bucket: '{}', object: '{}'", minioObject.getBucket(), minioObject.getObjectName(), e); - throw new ArtifactStorageException("Failed to get Object", e); - } + return get(minioObject.getBucket(), minioObject.getObjectName()); } @Override @@ -173,6 +171,28 @@ public class MinIoStorageArtifactStorageManager implements ArtifactStorageManage } + @Override + public void delete(final String vspId) { + LOGGER.debug("DELETE VSP - bucket: '{}'", vspId); + final var listObjects = minioClient.listObjects(ListObjectsArgs.builder().bucket(vspId).build()); + listObjects.forEach(itemResult -> { + Item versionId; + try { + versionId = itemResult.get(); + } catch (final Exception e) { + LOGGER.error("Failed to get versionId for VSP - bucket: '{}'", vspId, e); + throw new ArtifactStorageException(String.format("Failed to delete VSP '%s'", vspId), e); + } + delete(new MinIoArtifactInfo(vspId, versionId.objectName())); + }); + try { + minioClient.removeBucket(RemoveBucketArgs.builder().bucket(vspId).build()); + } catch (final Exception e) { + LOGGER.error("Failed to delete VSP - bucket: '{}'", vspId, e); + throw new ArtifactStorageException(String.format("Failed to delete VSP '%s'", vspId), e); + } + } + private MinIoStorageArtifactStorageConfig readMinIoStorageArtifactStorageConfig() { final var commonConfigurationManager = CommonConfigurationManager.getInstance(); final Map<String, Object> endpoint = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, ENDPOINT, null); diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java index aec69d5bd7..562be2de14 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java @@ -61,4 +61,9 @@ public class NoneStorageManager implements ArtifactStorageManager { throw new UnsupportedOperationException(); } + @Override + public void delete(final String vspId) { + throw new UnsupportedOperationException(); + } + } diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java index fa577913fa..09e62841e6 100644 --- a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java +++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java @@ -20,17 +20,29 @@ package org.openecomp.sdc.be.csar.storage; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; import io.minio.BucketExistsArgs; +import io.minio.GetObjectArgs; +import io.minio.GetObjectResponse; +import io.minio.MakeBucketArgs; import io.minio.MinioClient; +import io.minio.RemoveBucketArgs; +import io.minio.RemoveObjectArgs; +import io.minio.StatObjectArgs; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Path; import javax.activation.DataHandler; +import okhttp3.Headers; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -44,6 +56,7 @@ import org.mockito.MockitoAnnotations; import org.mockito.junit.jupiter.MockitoExtension; import org.openecomp.sdc.be.csar.storage.MinIoStorageArtifactStorageConfig.Credentials; import org.openecomp.sdc.be.csar.storage.MinIoStorageArtifactStorageConfig.EndPoint; +import org.openecomp.sdc.be.csar.storage.exception.ArtifactStorageException; @ExtendWith(MockitoExtension.class) class MinIoStorageArtifactStorageManagerTest { @@ -78,7 +91,7 @@ class MinIoStorageArtifactStorageManagerTest { } @Test - void testUpload() throws Exception { + void testUploadOK() throws Exception { when(builderBucketExistsArgs .bucket(anyString()) @@ -95,7 +108,23 @@ class MinIoStorageArtifactStorageManagerTest { } @Test - void testPersist() { + void testUploadFail() throws Exception { + + when(builderBucketExistsArgs + .bucket(anyString()) + .build() + ).thenReturn(new BucketExistsArgs()); + when(minioClient.bucketExists(any(BucketExistsArgs.class))).thenReturn(false); + + final Attachment attachment = mockAttachment(); + doThrow(new RuntimeException()).when(minioClient).makeBucket(any(MakeBucketArgs.class)); + assertThrows(ArtifactStorageException.class, () -> { + testSubject.upload(VSP_ID, VERSION_ID, attachment.getDataHandler().getInputStream()); + }); + } + + @Test + void testPersistOK() { final ArtifactInfo result = testSubject.persist(VSP_ID, VERSION_ID, new MinIoArtifactInfo(VSP_ID, VERSION_ID)); Assertions.assertNotNull(result); Assertions.assertTrue(result instanceof MinIoArtifactInfo); @@ -104,10 +133,51 @@ class MinIoStorageArtifactStorageManagerTest { } @Test + void testPersistFail() throws Exception { + doThrow(new RuntimeException()).when(minioClient).statObject(any(StatObjectArgs.class)); + assertThrows(ArtifactStorageException.class, () -> { + testSubject.persist(VSP_ID, VERSION_ID, new MinIoArtifactInfo(VSP_ID, VERSION_ID)); + }); + } + + @Test void testIsEnabled() { Assertions.assertTrue(testSubject.isEnabled()); } + @Test + void testDeleteVersionFail() throws Exception { + doThrow(new RuntimeException()).when(minioClient).removeObject(any(RemoveObjectArgs.class)); + assertThrows(ArtifactStorageException.class, () -> { + testSubject.delete(new MinIoArtifactInfo(VSP_ID, VERSION_ID)); + }); + } + + @Test + void testDeleteVspFail() throws Exception { + doThrow(new RuntimeException()).when(minioClient).removeBucket(any(RemoveBucketArgs.class)); + assertThrows(ArtifactStorageException.class, () -> { + testSubject.delete(VSP_ID); + }); + } + + @Test + void testGetOK() throws Exception { + when(minioClient.getObject(any(GetObjectArgs.class))).thenReturn( + new GetObjectResponse(Headers.of(), "", "", "", + new FileInputStream(Path.of("src/test/resources/s3StoreArtifactStorageManager/dummy.csar").toFile()))); + final InputStream inputStream = testSubject.get(new MinIoArtifactInfo(VSP_ID, VERSION_ID)); + assertNotNull(inputStream); + } + + @Test + void testGetFail() throws Exception { + doThrow(new RuntimeException()).when(minioClient).getObject(any(GetObjectArgs.class)); + assertThrows(ArtifactStorageException.class, () -> { + final InputStream inputStream = testSubject.get(new MinIoArtifactInfo(VSP_ID, VERSION_ID)); + }); + } + private Attachment mockAttachment() throws IOException { final Attachment attachment = Mockito.mock(Attachment.class); final DataHandler dataHandler = Mockito.mock(DataHandler.class); |