aboutsummaryrefslogtreecommitdiffstats
path: root/common-be
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-10-08 14:48:08 +0100
committerAndr� Schmid <andre.schmid@est.tech>2021-11-05 20:28:52 +0000
commit707fb6d83819058d5736b2dc38bea3c2d9e07a2d (patch)
treed319572a4514f9bdc86619a53eba22a8c0d0abd0 /common-be
parent90ff4221ee13c227cd6b2d4566f785602781f7b0 (diff)
Large csar handling - object store
Change-Id: I4e88bd7bfcc1fdbc93d67da2682f2e873ba243c6 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3754
Diffstat (limited to 'common-be')
-rw-r--r--common-be/pom.xml478
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoArtifactInfo.java (renamed from common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java)13
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageConfig.java (renamed from common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java)30
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java247
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducer.java (renamed from common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java)6
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java54
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java161
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java91
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/ArtifactStorageException.java (renamed from common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java)6
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java120
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducerTest.java (renamed from common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java)12
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/NoneStorageManagerTest.java78
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java118
-rw-r--r--common-be/src/test/resources/csarSizeReducer/dummyToReduce-2-files.zipbin0 -> 3154 bytes
-rw-r--r--common-be/src/test/resources/csarSizeReducer/dummyToReduce-3-files.zip (renamed from common-be/src/test/resources/csarSizeReducer/dummyToReduce.zip)bin23905 -> 23905 bytes
-rw-r--r--common-be/src/test/resources/s3StoreArtifactStorageManager/dummy.csarbin0 -> 25876 bytes
16 files changed, 880 insertions, 534 deletions
diff --git a/common-be/pom.xml b/common-be/pom.xml
index af93628eb5..d84eec5c0c 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -1,156 +1,161 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.openecomp.sdc.be</groupId>
- <artifactId>common-be</artifactId>
-
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>sdc-main</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <!-- Common of SD&C -->
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>common-app-api</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${lang3.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.functionaljava</groupId>
- <artifactId>functionaljava</artifactId>
- <version>${functionaljava.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junitJupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockitoJupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.sdc.common</groupId>
- <artifactId>onap-tosca-datatype</artifactId>
- <version>${tosca.datatype.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.bean-matchers</groupId>
- <artifactId>bean-matchers</artifactId>
- <version>${bean-matchers.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Togglz core module (mandatory) -->
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-core</artifactId>
- <version>${togglz.version}</version>
- </dependency>
-
- <!-- Togglz for Servlet environments (mandatory for webapps) -->
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-servlet</artifactId>
- <version>${togglz.version}</version>
- </dependency>
-
- <!-- Togglz Admin Console -->
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-console</artifactId>
- <version>${togglz.version}</version>
- </dependency>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.openecomp.sdc.be</groupId>
+ <artifactId>common-be</artifactId>
+
+ <parent>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>sdc-main</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>8.3.0</version>
+ </dependency>
+
+ <!-- Common of SD&C -->
+ <dependency>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>common-app-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${lang3.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ <version>${functionaljava.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junitJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockitoJupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
+ <version>${tosca.datatype.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.bean-matchers</groupId>
+ <artifactId>bean-matchers</artifactId>
+ <version>${bean-matchers.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Togglz core module (mandatory) -->
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-core</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+
+ <!-- Togglz for Servlet environments (mandatory for webapps) -->
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-servlet</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+
+ <!-- Togglz Admin Console -->
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-console</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
<!-- Togglz for testing -->
<dependency>
@@ -159,87 +164,92 @@
<version>${togglz.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <executions>
- <execution>
- <id>default-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.sylvainlaurent.maven</groupId>
- <artifactId>yaml-json-validator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- <configuration>
- <validationSets>
- <validationSet>
- <includes>
- <include>src/main/resources/**/*.y*ml</include>
- <include>src/test/resources/**/*.y*ml</include>
- </includes>
- </validationSet>
- <validationSet>
- <includes>
- <include>src/main/resources/**/*.json</include>
- <include>src/test/resources/**/*.json</include>
- </includes>
- </validationSet>
- </validationSets>
- <skip>${skipYamlJsonValidator}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc.core</groupId>
+ <artifactId>openecomp-common-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ <skip>${skipYamlJsonValidator}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoArtifactInfo.java
index 0472661fd9..a193cdd6db 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoArtifactInfo.java
@@ -20,14 +20,19 @@
package org.openecomp.sdc.be.csar.storage;
-import java.nio.file.Path;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
-public class PersistentStorageArtifactInfo implements ArtifactInfo {
+@Getter
+public class MinIoArtifactInfo implements ArtifactInfo {
- @Getter
- private final Path path;
+ private final String bucket;
+ private final String objectName;
+ @Override
+ public String getInfo() {
+ return String.format("bucket: %s\n"
+ + "object: %s", bucket, objectName);
+ }
}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageConfig.java
index d3cd6fb302..6f6778f2b0 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageConfig.java
@@ -20,13 +20,33 @@
package org.openecomp.sdc.be.csar.storage;
-import java.nio.file.Path;
-import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
-@Data
-public class PersistentVolumeArtifactStorageConfig implements ArtifactStorageConfig {
+@AllArgsConstructor
+@Getter
+public class MinIoStorageArtifactStorageConfig implements ArtifactStorageConfig {
private final boolean isEnabled;
- private final Path storagePath;
+ private final EndPoint endPoint;
+ private final Credentials credentials;
+ private final String tempPath;
+
+ @AllArgsConstructor
+ @Getter
+ public static class EndPoint {
+
+ private final String host;
+ private final int port;
+ private final boolean secure;
+ }
+
+ @AllArgsConstructor
+ @Getter
+ public static class Credentials {
+
+ private final String accessKey;
+ private final String secretKey;
+ }
}
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
new file mode 100644
index 0000000000..0a48c2233c
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManager.java
@@ -0,0 +1,247 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.csar.storage;
+
+import static org.openecomp.sdc.common.errors.Messages.EXTERNAL_CSAR_STORE_CONFIGURATION_FAILURE_MISSING;
+
+import io.minio.BucketExistsArgs;
+import io.minio.CopyObjectArgs;
+import io.minio.CopySource;
+import io.minio.GetObjectArgs;
+import io.minio.MakeBucketArgs;
+import io.minio.MinioClient;
+import io.minio.MinioClient.Builder;
+import io.minio.PutObjectArgs;
+import io.minio.RemoveObjectArgs;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import lombok.Getter;
+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;
+import org.openecomp.sdc.common.CommonConfigurationManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MinIoStorageArtifactStorageManager implements ArtifactStorageManager {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(MinIoStorageArtifactStorageManager.class);
+ private static final String EXTERNAL_CSAR_STORE = "externalCsarStore";
+
+ @Getter
+ private final MinIoStorageArtifactStorageConfig storageConfiguration;
+ private final MinioClient minioClient;
+
+ public MinIoStorageArtifactStorageManager() {
+ this.storageConfiguration = readMinIoStorageArtifactStorageConfig();
+ minioClient = initMinioClient();
+ }
+
+ //for testing only
+ MinIoStorageArtifactStorageManager(final ArtifactStorageConfig storageConfiguration) {
+ this.storageConfiguration = (MinIoStorageArtifactStorageConfig) storageConfiguration;
+ minioClient = initMinioClient();
+ }
+
+ @Override
+ public ArtifactInfo persist(final String vspId, final String versionId, final ArtifactInfo uploadedArtifactInfo) {
+ final MinIoArtifactInfo minioObjectTemp = (MinIoArtifactInfo) uploadedArtifactInfo;
+ try {
+ minioClient.getObject(
+ GetObjectArgs.builder()
+ .bucket(minioObjectTemp.getBucket())
+ .object(minioObjectTemp.getObjectName())
+ .build()
+ );
+ } catch (final Exception e) {
+ throw new ArtifactStorageException(
+ String.format("Failed to retrieve uploaded artifact with bucket '%s' and name '%s' while persisting",
+ minioObjectTemp.getBucket(), minioObjectTemp.getObjectName()), e);
+ }
+
+ final var backupPath = backupPreviousVersion(vspId, versionId).orElse(null);
+ try {
+ moveFile(minioObjectTemp, vspId, versionId);
+ } catch (final Exception e) {
+ rollback(minioObjectTemp, vspId, versionId);
+ final var errorMsg = String.format("Could not persist artifact for VSP '%s', version '%s'", vspId, versionId);
+ throw new ArtifactStorageException(errorMsg, e);
+ }
+
+ removePreviousVersion(backupPath);
+
+ return new MinIoArtifactInfo(vspId, versionId);
+ }
+
+ @Override
+ public ArtifactInfo upload(final String vspId, final String versionId, final InputStream fileToUpload) {
+
+ final String name = versionId + "--" + UUID.randomUUID();
+ try {
+ // Make bucket if not exist.
+ final boolean found = minioClient.bucketExists(BucketExistsArgs.builder().bucket(vspId).build());
+
+ if (!found) {
+ // Make a new bucket ${vspId} .
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(vspId).build());
+ } else {
+ LOGGER.info("Bucket '{}' already exists.", vspId);
+ }
+
+ minioClient.putObject(
+ PutObjectArgs.builder()
+ .bucket(vspId)
+ .object(name)
+ .stream(fileToUpload, fileToUpload.available(), -1)
+ .build()
+ );
+
+ } catch (final Exception e) {
+ throw new ArtifactStorageException("Failed to upload artifact", e);
+ }
+
+ return new MinIoArtifactInfo(vspId, name);
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return storageConfiguration != null && storageConfiguration.isEnabled();
+ }
+
+ @Override
+ public InputStream get(final ArtifactInfo artifactInfo) {
+ final MinIoArtifactInfo minioObject = (MinIoArtifactInfo) artifactInfo;
+ try {
+ return minioClient.getObject(GetObjectArgs.builder()
+ .bucket(minioObject.getBucket())
+ .object(minioObject.getObjectName())
+ .build());
+ } catch (final Exception e) {
+ throw new ArtifactStorageException("Failed to get Object", e);
+ }
+ }
+
+ @Override
+ public void delete(final ArtifactInfo artifactInfo) {
+ final MinIoArtifactInfo minioObject = (MinIoArtifactInfo) artifactInfo;
+ try {
+ minioClient.removeObject(RemoveObjectArgs.builder()
+ .bucket(minioObject.getBucket())
+ .object(minioObject.getObjectName())
+ .bypassGovernanceMode(true)
+ .build());
+ } catch (final Exception e) {
+ throw new ArtifactStorageException(String.format("Failed to delete '%s'", minioObject.getObjectName()), e);
+ }
+
+ }
+
+ private Optional<MinIoArtifactInfo> backupPreviousVersion(final String vspId, final String versionId) {
+
+ final String tempName = versionId + "--" + UUID.randomUUID().toString();
+ try {
+ copy(vspId, tempName, versionId);
+ } catch (final Exception e) {
+ return Optional.empty();
+ }
+
+ return Optional.of(new MinIoArtifactInfo(vspId, tempName));
+ }
+
+ private void rollback(final MinIoArtifactInfo minioObject, final String vspId, final String versionId) {
+ try {
+ moveFile(minioObject, vspId, versionId);
+ } catch (final Exception ex) {
+ LOGGER.warn("Could not rollback the backup '{}' to the original '{}'", versionId, minioObject.getObjectName(), ex);
+ }
+ }
+
+ private void removePreviousVersion(final MinIoArtifactInfo minioObject) {
+ if (minioObject == null) {
+ return;
+ }
+ delete(minioObject);
+ }
+
+ private void moveFile(final MinIoArtifactInfo minioObject, final String vspId, final String versionId) {
+ try {
+ copy(vspId, versionId, minioObject.getObjectName());
+ } catch (final Exception e) {
+ throw new ArtifactStorageException("Failed to move", e);
+ }
+ delete(minioObject);
+ }
+
+ private void copy(final String vspId, final String versionId, final String objectName) throws Exception {
+ minioClient.copyObject(
+ CopyObjectArgs.builder()
+ .bucket(vspId)
+ .object(versionId)
+ .source(CopySource.builder()
+ .bucket(vspId)
+ .object(objectName)
+ .build())
+ .build());
+ }
+
+ private MinIoStorageArtifactStorageConfig readMinIoStorageArtifactStorageConfig() {
+ final var commonConfigurationManager = CommonConfigurationManager.getInstance();
+
+ final Map<String, Object> endpoint = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "endpoint", null);
+ final Map<String, Object> credentials = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "credentials", null);
+ final String tempPath = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "tempPath", null);
+ LOGGER.info("ArtifactConfig.endpoint: '{}'", endpoint);
+ LOGGER.info("ArtifactConfig.credentials: '{}'", credentials);
+ LOGGER.info("ArtifactConfig.tempPath: '{}'", tempPath);
+
+ if (endpoint == null) {
+ throw new RuntimeException(EXTERNAL_CSAR_STORE_CONFIGURATION_FAILURE_MISSING.formatMessage("endpoint"));
+ }
+ if (credentials == null) {
+ throw new RuntimeException(EXTERNAL_CSAR_STORE_CONFIGURATION_FAILURE_MISSING.formatMessage("credentials"));
+ }
+ if (tempPath == null) {
+ throw new RuntimeException(EXTERNAL_CSAR_STORE_CONFIGURATION_FAILURE_MISSING.formatMessage("tempPath"));
+ }
+ final String host = (String) endpoint.getOrDefault("host", null);
+ final int port = (int) endpoint.getOrDefault("port", 0);
+ final boolean secure = (boolean) endpoint.getOrDefault("secure", false);
+
+ final String accessKey = (String) credentials.getOrDefault("accessKey", null);
+ final String secretKey = (String) credentials.getOrDefault("secretKey", null);
+
+ return new MinIoStorageArtifactStorageConfig(true, new EndPoint(host, port, secure), new Credentials(accessKey, secretKey), tempPath);
+ }
+
+ private MinioClient initMinioClient() {
+ final EndPoint endPoint = storageConfiguration.getEndPoint();
+ final Credentials credentials = storageConfiguration.getCredentials();
+
+ final Builder builder = MinioClient.builder();
+ return builder
+ .endpoint(endPoint.getHost(), endPoint.getPort(), endPoint.isSecure())
+ .credentials(credentials.getAccessKey(), credentials.getSecretKey())
+ .build();
+ }
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducer.java
index 822acc0766..3181b088c0 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducer.java
@@ -43,9 +43,9 @@ import org.openecomp.sdc.be.csar.storage.exception.CsarSizeReducerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CsarSizeReducer implements PackageSizeReducer {
+public class MinIoStorageCsarSizeReducer implements PackageSizeReducer {
- private static final Logger LOGGER = LoggerFactory.getLogger(CsarSizeReducer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MinIoStorageCsarSizeReducer.class);
private static final Set<String> ALLOWED_SIGNATURE_EXTENSIONS = Set.of("cms");
private static final Set<String> ALLOWED_CERTIFICATE_EXTENSIONS = Set.of("cert", "crt");
private static final String CSAR_EXTENSION = "csar";
@@ -55,7 +55,7 @@ public class CsarSizeReducer implements PackageSizeReducer {
private final CsarPackageReducerConfiguration configuration;
- public CsarSizeReducer(final CsarPackageReducerConfiguration configuration) {
+ public MinIoStorageCsarSizeReducer(final CsarPackageReducerConfiguration configuration) {
this.configuration = configuration;
}
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
new file mode 100644
index 0000000000..3fa22d41be
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/NoneStorageManager.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.csar.storage;
+
+import java.io.InputStream;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class NoneStorageManager implements ArtifactStorageManager {
+
+ @Override
+ public ArtifactInfo persist(final String vspId, final String versionId, final ArtifactInfo uploadedArtifactInfo) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ArtifactInfo upload(final String vspId, final String versionId, final InputStream fileToUpload) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ArtifactStorageConfig getStorageConfiguration() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public InputStream get(final ArtifactInfo artifactInfo) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void delete(final ArtifactInfo artifactInfo) {
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java
deleted file mode 100644
index 10629b3edb..0000000000
--- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.csar.storage;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Optional;
-import java.util.UUID;
-import org.openecomp.sdc.be.csar.storage.exception.PersistentVolumeArtifactStorageException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PersistentVolumeArtifactStorageManager implements ArtifactStorageManager {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(PersistentVolumeArtifactStorageManager.class);
-
- private final PersistentVolumeArtifactStorageConfig storageConfiguration;
-
- public PersistentVolumeArtifactStorageManager(final ArtifactStorageConfig storageConfiguration) {
- this.storageConfiguration = (PersistentVolumeArtifactStorageConfig) storageConfiguration;
- }
-
- @Override
- public ArtifactInfo persist(final String vspId, final String versionId, final ArtifactInfo uploadedArtifactInfo) {
- final var temporaryPath = uploadedArtifactInfo.getPath();
- if (!Files.exists(temporaryPath)) {
- throw new PersistentVolumeArtifactStorageException(String.format("Given artifact does not exist '%s'", uploadedArtifactInfo.getPath()));
- }
-
- final var filePath = buildFilePath(vspId, versionId);
- final var backupPath = backupPreviousVersion(filePath).orElse(null);
- try {
- moveFile(temporaryPath, filePath);
- } catch (final Exception e) {
- rollback(backupPath, filePath);
- final var errorMsg = String.format("Could not persist artifact for VSP '%s', version '%s'", vspId, versionId);
- throw new PersistentVolumeArtifactStorageException(errorMsg, e);
- }
-
- removePreviousVersion(backupPath);
-
- return new PersistentStorageArtifactInfo(filePath);
- }
-
- @Override
- public ArtifactInfo upload(final String vspId, final String versionId, final InputStream artifactInputStream) {
- final var destinationFolder = buildDestinationFolder(vspId, versionId);
- try {
- Files.createDirectories(destinationFolder);
- } catch (final IOException e) {
- throw new PersistentVolumeArtifactStorageException(String.format("Could not create directory '%s'", destinationFolder), e);
- }
-
- final var filePath = createTempFilePath(destinationFolder);
- try {
- persist(artifactInputStream, filePath);
- } catch (final IOException e) {
- throw new PersistentVolumeArtifactStorageException(String.format("Could not persist artifact '%s'", filePath), e);
- }
-
- return new PersistentStorageArtifactInfo(filePath);
- }
-
- private Path buildFilePath(final String vspId, final String versionId) {
- return buildDestinationFolder(vspId, versionId).resolve(versionId);
- }
-
- @Override
- public boolean isEnabled() {
- return storageConfiguration != null && storageConfiguration.isEnabled();
- }
-
- private Optional<Path> backupPreviousVersion(final Path filePath) {
- if (!Files.exists(filePath)) {
- return Optional.empty();
- }
-
- final var backupPath = Path.of(filePath + UUID.randomUUID().toString());
- moveFile(filePath, backupPath);
- return Optional.ofNullable(backupPath);
- }
-
- private void rollback(final Path backupPath, final Path filePath) {
- try {
- moveFile(backupPath, filePath);
- } catch (final Exception ex) {
- LOGGER.warn("Could not rollback the backup file '{}' to the original '{}'", backupPath, filePath, ex);
- }
- }
-
- private void removePreviousVersion(final Path filePath) {
- if (filePath == null || !Files.exists(filePath)) {
- return;
- }
-
- try {
- Files.delete(filePath);
- } catch (final IOException e) {
- throw new PersistentVolumeArtifactStorageException(String.format("Could not delete previous version '%s'", filePath), e);
- }
- }
-
- private Path createTempFilePath(final Path destinationFolder) {
- final var retries = 10;
- return createTempFilePath(destinationFolder, retries).orElseThrow(() -> {
- throw new PersistentVolumeArtifactStorageException(String.format("Could not generate upload file path after '%s' retries", retries));
- });
- }
-
- private Optional<Path> createTempFilePath(final Path destinationFolder, int retries) {
- for (var i = 0; i < retries; i++) {
- final var filePath = destinationFolder.resolve(UUID.randomUUID().toString());
- if (Files.notExists(filePath)) {
- return Optional.of(filePath);
- }
- }
- return Optional.empty();
- }
-
- private Path buildDestinationFolder(final String vspId, final String versionId) {
- return storageConfiguration.getStoragePath().resolve(vspId).resolve(versionId);
- }
-
- private void persist(final InputStream artifactInputStream, final Path filePath) throws IOException {
- try (final var inputStream = artifactInputStream;
- final var fileOutputStream = new FileOutputStream(filePath.toFile());) {
- inputStream.transferTo(fileOutputStream);
- }
- }
-
- private void moveFile(final Path from, final Path to) {
- try {
- Files.move(from, to, StandardCopyOption.REPLACE_EXISTING);
- } catch (final IOException e) {
- throw new PersistentVolumeArtifactStorageException(String.format("Could not move file '%s' to '%s'", from, to), e);
- }
- }
-
-}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java
new file mode 100644
index 0000000000..d120b3af8d
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java
@@ -0,0 +1,91 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.csar.storage;
+
+import static org.openecomp.sdc.be.csar.storage.StorageFactory.StorageType.NONE;
+import static org.openecomp.sdc.be.csar.storage.StorageFactory.StorageType.findByName;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.NoArgsConstructor;
+import org.openecomp.sdc.common.CommonConfigurationManager;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
+
+@NoArgsConstructor
+public class StorageFactory {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(StorageFactory.class);
+ private static final String EXTERNAL_CSAR_STORE = "externalCsarStore";
+
+ public ArtifactStorageManager createArtifactStorageManager() {
+ switch (getConfiguredArtifactStorageType()) {
+ case MINIO: // MinIoStorage enabled
+ return new MinIoStorageArtifactStorageManager();
+ default:// all configured, nothing enabled
+ return new NoneStorageManager();
+ }
+ }
+
+ public Optional<PackageSizeReducer> createPackageSizeReducer() {
+ switch (getConfiguredArtifactStorageType()) {
+ case MINIO: // MinIoStorage enabled
+ return Optional.of(new MinIoStorageCsarSizeReducer(readPackageReducerConfiguration()));
+ default:// all configured, nothing enabled
+ return Optional.empty();
+ }
+ }
+
+ private StorageType getConfiguredArtifactStorageType() {
+ final var commonConfigurationManager = CommonConfigurationManager.getInstance();
+ final String storageType = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "storageType", NONE.name());
+ LOGGER.info("ArtifactConfig.storageType: '{}'", storageType);
+ return findByName(storageType);
+ }
+
+ private CsarPackageReducerConfiguration readPackageReducerConfiguration() {
+ final var commonConfigurationManager = CommonConfigurationManager.getInstance();
+ final List<String> foldersToStrip = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "foldersToStrip", new ArrayList<>());
+ final int sizeLimit = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "sizeLimit", 1000000);
+ final int thresholdEntries = commonConfigurationManager.getConfigValue(EXTERNAL_CSAR_STORE, "thresholdEntries", 10000);
+ LOGGER.info("Folders to strip: '{}'", String.join(", ", foldersToStrip));
+ final Set<Path> foldersToStripPathSet = foldersToStrip.stream().map(Path::of).collect(Collectors.toSet());
+ return new CsarPackageReducerConfiguration(foldersToStripPathSet, sizeLimit, thresholdEntries);
+ }
+
+ public enum StorageType {
+ NONE,
+ MINIO;
+
+ public static StorageType findByName(String name) {
+ for (StorageType curr : StorageType.values()) {
+ if (curr.name().equals(name)) {
+ return curr;
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/ArtifactStorageException.java
index 28fff65bb6..aa621611df 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/ArtifactStorageException.java
@@ -22,13 +22,13 @@ package org.openecomp.sdc.be.csar.storage.exception;
import org.openecomp.sdc.be.exception.BusinessException;
-public class PersistentVolumeArtifactStorageException extends BusinessException {
+public class ArtifactStorageException extends BusinessException {
- public PersistentVolumeArtifactStorageException(final String message, final Throwable cause) {
+ public ArtifactStorageException(final String message, final Throwable cause) {
super(message, cause);
}
- public PersistentVolumeArtifactStorageException(final String message) {
+ public ArtifactStorageException(final String message) {
super(message);
}
}
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
new file mode 100644
index 0000000000..41eed0cebb
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageArtifactStorageManagerTest.java
@@ -0,0 +1,120 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.csar.storage;
+
+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.when;
+
+import io.minio.BucketExistsArgs;
+import io.minio.MinioClient;
+import java.io.IOException;
+import java.io.InputStream;
+import javax.activation.DataHandler;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+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;
+
+@ExtendWith(MockitoExtension.class)
+class MinIoStorageArtifactStorageManagerTest {
+
+ public static final String VSP_ID = "vsp-id";
+ public static final String VERSION_ID = "version-id";
+ private MinIoStorageArtifactStorageManager testSubject;
+ @Mock
+ private MinioClient minioClient;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private MinioClient.Builder builderMinio;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private BucketExistsArgs.Builder builderBucketExistsArgs;
+
+ @BeforeEach
+ void setUp() {
+ MockitoAnnotations.openMocks(this);
+
+ try (MockedStatic<MinioClient> utilities = Mockito.mockStatic(MinioClient.class)) {
+ utilities.when(MinioClient::builder).thenReturn(builderMinio);
+ when(builderMinio
+ .endpoint(anyString(), anyInt(), anyBoolean())
+ .credentials(anyString(), anyString())
+ .build()
+ ).thenReturn(minioClient);
+
+ testSubject = new MinIoStorageArtifactStorageManager(
+ new MinIoStorageArtifactStorageConfig(true, new EndPoint("host", 9000, false), new Credentials("accessKey", "secretKey"), ""));
+ }
+ }
+
+ @Test
+ void testUpload() throws Exception {
+
+ when(builderBucketExistsArgs
+ .bucket(anyString())
+ .build()
+ ).thenReturn(new BucketExistsArgs());
+ when(minioClient.bucketExists(any(BucketExistsArgs.class))).thenReturn(true);
+
+ final Attachment attachment = mockAttachment();
+ final ArtifactInfo result = testSubject.upload(VSP_ID, VERSION_ID, attachment.getDataHandler().getInputStream());
+ Assertions.assertNotNull(result);
+ Assertions.assertTrue(result instanceof MinIoArtifactInfo);
+ Assertions.assertEquals(VSP_ID, ((MinIoArtifactInfo) result).getBucket());
+ Assertions.assertTrue(((MinIoArtifactInfo) result).getObjectName().startsWith(VERSION_ID + "--"));
+ }
+
+ @Test
+ void testPersist() {
+ final ArtifactInfo result = testSubject.persist(VSP_ID, VERSION_ID, new MinIoArtifactInfo(VSP_ID, VERSION_ID));
+ Assertions.assertNotNull(result);
+ Assertions.assertTrue(result instanceof MinIoArtifactInfo);
+ Assertions.assertEquals(VSP_ID, ((MinIoArtifactInfo) result).getBucket());
+ Assertions.assertEquals(VERSION_ID, ((MinIoArtifactInfo) result).getObjectName());
+ }
+
+ @Test
+ void testIsEnabled() {
+ Assertions.assertTrue(testSubject.isEnabled());
+ }
+
+ private Attachment mockAttachment() throws IOException {
+ final Attachment attachment = Mockito.mock(Attachment.class);
+ final DataHandler dataHandler = Mockito.mock(DataHandler.class);
+ final InputStream inputStream = Mockito.mock(InputStream.class);
+ when(dataHandler.getInputStream()).thenReturn(inputStream);
+ when(attachment.getDataHandler()).thenReturn(dataHandler);
+ return attachment;
+ }
+
+}
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducerTest.java
index e9748f0a16..6515c6fb1e 100644
--- a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java
+++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/MinIoStorageCsarSizeReducerTest.java
@@ -42,12 +42,12 @@ import org.mockito.MockitoAnnotations;
import org.openecomp.sdc.common.zip.ZipUtils;
import org.openecomp.sdc.common.zip.exception.ZipException;
-class CsarSizeReducerTest {
+class MinIoStorageCsarSizeReducerTest {
@Mock
private CsarPackageReducerConfiguration csarPackageReducerConfiguration;
@InjectMocks
- private CsarSizeReducer csarSizeReducer;
+ private MinIoStorageCsarSizeReducer minIoStorageCsarSizeReducer;
@BeforeEach
void setUp() {
@@ -55,7 +55,7 @@ class CsarSizeReducerTest {
}
@ParameterizedTest
- @ValueSource(strings = {"dummyToReduce.zip", "dummyToReduce.csar", "dummyToNotReduce.csar"})
+ @ValueSource(strings = {"dummyToReduce-3-files.zip", "dummyToReduce.csar", "dummyToNotReduce.csar", "dummyToReduce-2-files.zip"})
void reduceByPathAndSizeTest(String fileName) throws ZipException {
final var pathToReduce1 = Path.of("Files/images");
final var pathToReduce2 = Path.of("Files/Scripts/my_script.sh");
@@ -68,7 +68,7 @@ class CsarSizeReducerTest {
final Map<String, byte[]> originalCsar = ZipUtils.readZip(csarPath.toFile(), false);
- final byte[] reduce = csarSizeReducer.reduce(csarPath);
+ final byte[] reduce = minIoStorageCsarSizeReducer.reduce(csarPath);
final Map<String, byte[]> reducedCsar = ZipUtils.readZip(reduce, false);
@@ -113,7 +113,7 @@ class CsarSizeReducerTest {
assertArrayEquals("".getBytes(StandardCharsets.UTF_8), reducedCsar.get(originalFilePath),
String.format("File '%s' expected to be reduced to empty string", originalFilePath));
} else {
- if (originalFilePath.endsWith(".csar") && csarSizeReducer.getReduced().get()) {
+ if (originalFilePath.endsWith(".csar") && minIoStorageCsarSizeReducer.getReduced().get()) {
assertNotEquals(originalBytes.length, reducedCsar.get(originalFilePath).length,
String.format("File '%s' expected to be NOT equal", originalFilePath));
} else {
@@ -122,4 +122,4 @@ class CsarSizeReducerTest {
}
}
}
-}
+} \ No newline at end of file
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/NoneStorageManagerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/NoneStorageManagerTest.java
new file mode 100644
index 0000000000..58394b9b76
--- /dev/null
+++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/NoneStorageManagerTest.java
@@ -0,0 +1,78 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.csar.storage;
+
+import java.io.ByteArrayInputStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class NoneStorageManagerTest {
+
+ public static final MinIoArtifactInfo UPLOADED_ARTIFACT_INFO = new MinIoArtifactInfo("bucket", "object");
+ private NoneStorageManager testSubject;
+
+ @BeforeEach
+ void setUp() {
+ testSubject = new NoneStorageManager();
+ }
+
+ @Test
+ void testCtor() {
+ Assertions.assertTrue(testSubject instanceof NoneStorageManager);
+ }
+
+ @Test
+ void testPersist() {
+ Assertions.assertThrows(UnsupportedOperationException.class,
+ () -> testSubject.persist("vspId", "versionId", UPLOADED_ARTIFACT_INFO));
+ }
+
+ @Test
+ void testUpload() {
+ Assertions.assertThrows(UnsupportedOperationException.class,
+ () -> testSubject.upload("vspId", "versionId", new ByteArrayInputStream(new byte[0])));
+ }
+
+ @Test
+ void testGetStorageConfiguration() {
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> testSubject.getStorageConfiguration());
+ }
+
+ @Test
+ void testGet() {
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> testSubject.get(UPLOADED_ARTIFACT_INFO));
+ }
+
+ @Test
+ void testDelete() {
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> testSubject.delete(UPLOADED_ARTIFACT_INFO));
+ }
+
+ @Test
+ void testIsEnabled() {
+ Assertions.assertFalse(testSubject.isEnabled());
+ }
+
+}
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java
deleted file mode 100644
index ab8c11c7c1..0000000000
--- a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.csar.storage;
-
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Objects;
-import javax.activation.DataHandler;
-import org.apache.commons.io.IOUtils;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-
-@TestMethodOrder(OrderAnnotation.class)
-class PersistentVolumeArtifactStorageManagerTest {
-
- private static final String SRC_TEST_RESOURCES = "src/test/resources/";
-
- private PersistentVolumeArtifactStorageManager testSubject;
-
- @BeforeEach
- void setUp() {
- testSubject = new PersistentVolumeArtifactStorageManager(new PersistentVolumeArtifactStorageConfig(true, Path.of(SRC_TEST_RESOURCES)));
- }
-
- @AfterAll
- static void tearDown() throws IOException {
- Files.move(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/versionId"),
- Path.of(SRC_TEST_RESOURCES + "persistentVolumeArtifactStorageManager/dummy.csar"));
- Files.list(Path.of("src/test/resources/vspId/versionId/")).forEach(path -> {
- try {
- Files.deleteIfExists(path);
- } catch (IOException e) {
- e.printStackTrace();
- }
- });
- Files.deleteIfExists(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/"));
- Files.deleteIfExists(Path.of(SRC_TEST_RESOURCES + "vspId/"));
- }
-
- @Test
- @Order(1)
- void testUpload() throws IOException {
- final Attachment attachment = mockAttachment("dummy.csar", this.getClass().getResource("/persistentVolumeArtifactStorageManager/dummy.csar"));
- final ArtifactInfo result = testSubject.upload("vspId", "versionId", attachment.getDataHandler().getInputStream());
- Assertions.assertNotNull(result);
- Assertions.assertNotNull(result.getPath());
- Assertions.assertTrue(result.getPath().startsWith(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/")));
- }
-
- @Test
- @Order(2)
- void testPersist() {
- final ArtifactInfo result = testSubject.persist("vspId", "versionId",
- new PersistentStorageArtifactInfo(Path.of(SRC_TEST_RESOURCES + "persistentVolumeArtifactStorageManager/dummy.csar")));
- Assertions.assertNotNull(result);
- Assertions.assertNotNull(result.getPath());
- Assertions.assertTrue(result.getPath().startsWith(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/")));
- }
-
- @Test
- void testIsEnabled() {
- Assertions.assertTrue(testSubject.isEnabled());
- }
-
- private Attachment mockAttachment(final String fileName, final URL fileToUpload) throws IOException {
- final Attachment attachment = Mockito.mock(Attachment.class);
- when(attachment.getContentDisposition()).thenReturn(new ContentDisposition("test"));
- final DataHandler dataHandler = Mockito.mock(DataHandler.class);
- when(dataHandler.getName()).thenReturn(fileName);
- final InputStream inputStream = Mockito.mock(InputStream.class);
- when(dataHandler.getInputStream()).thenReturn(inputStream);
- when(attachment.getDataHandler()).thenReturn(dataHandler);
- byte[] bytes = "upload package Test".getBytes();
- if (Objects.nonNull(fileToUpload)) {
- try {
- bytes = IOUtils.toByteArray(fileToUpload);
- } catch (final IOException e) {
- fail("Not able to convert file to byte array");
- }
- }
- when(attachment.getObject(ArgumentMatchers.any())).thenReturn(bytes);
- return attachment;
- }
-
-}
diff --git a/common-be/src/test/resources/csarSizeReducer/dummyToReduce-2-files.zip b/common-be/src/test/resources/csarSizeReducer/dummyToReduce-2-files.zip
new file mode 100644
index 0000000000..be48e8a674
--- /dev/null
+++ b/common-be/src/test/resources/csarSizeReducer/dummyToReduce-2-files.zip
Binary files differ
diff --git a/common-be/src/test/resources/csarSizeReducer/dummyToReduce.zip b/common-be/src/test/resources/csarSizeReducer/dummyToReduce-3-files.zip
index fecb45aaaf..fecb45aaaf 100644
--- a/common-be/src/test/resources/csarSizeReducer/dummyToReduce.zip
+++ b/common-be/src/test/resources/csarSizeReducer/dummyToReduce-3-files.zip
Binary files differ
diff --git a/common-be/src/test/resources/s3StoreArtifactStorageManager/dummy.csar b/common-be/src/test/resources/s3StoreArtifactStorageManager/dummy.csar
new file mode 100644
index 0000000000..73b28f52fd
--- /dev/null
+++ b/common-be/src/test/resources/s3StoreArtifactStorageManager/dummy.csar
Binary files differ