Marmelator/search-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Pull request #11: RED-2172: Enbled to configure azure blob storage as storage backend

Browse Source 
Merge in RED/search-service from RED-2172 to master

* commit '5d211fb4c38b16115a45559fb4073c9e589f86ec':
  RED-2172: Enbled to configure azure blob storage as storage backend
This commit is contained in:
Dominique Eiflaender 2021-10-06 15:46:17 +02:00
commit 2b0a357659
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search-service-v1/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>platform-dependency</artifactId>
<groupId>com.iqser.red</groupId>
<version>1.1.4</version>
<version>1.1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.iqser.red</groupId>
<artifactId>platform-commons-dependency</artifactId>
<version>1.4.0</version>
<version>1.6.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>

1
search-service-v1/search-service-server-v1/src/main/resources/application.yml
View File

@ -45,3 +45,4 @@ storage:
bucket-name: 'redaction'
region: 'us-east-1'
endpoint: 'https://s3.amazonaws.com'
backend: 's3'

3
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
View File

@ -21,6 +21,7 @@ import com.amazonaws.services.s3.AmazonS3;
import com.iqser.red.service.search.v1.server.Application;
import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
import com.iqser.red.storage.commons.StorageAutoConfiguration;
import com.iqser.red.storage.commons.service.StorageService;
@DirtiesContext
@ -42,7 +43,7 @@ public class AbstractElasticsearchIntegrationTest {
private AmazonS3 amazonS3;
@Configuration
@EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
@EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
@Import(Application.class)
@EnableFeignClients(basePackageClasses = TestConfiguration.class)
public static class TestConfiguration {

4
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
View File

@ -10,11 +10,11 @@ import org.apache.commons.io.IOUtils;
import org.springframework.core.io.InputStreamResource;
import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
import com.iqser.red.storage.commons.service.StorageService;
import com.iqser.red.storage.commons.service.S3StorageService;
import lombok.SneakyThrows;
public class FileSystemBackedStorageService extends StorageService {
public class FileSystemBackedStorageService extends S3StorageService {
private final Map<String, File> dataMap = new HashMap<>();

7
search-service-v1/search-service-server-v1/src/test/resources/application.yml
View File

@ -7,3 +7,10 @@ logging.level.root: INFO
spring:
main:
allow-bean-definition-overriding: true
storage:
signer-type: 'AWSS3V4SignerType'
bucket-name: 'redaction'
region: 'us-east-1'
endpoint: 'https://s3.amazonaws.com'
backend: 's3'