Merge pull request #179 from alexjoybc/feature/sftp-demo-app

Added config for sftp
bcgov · Apr 15, 2020 · f5c589c · f5c589c
2 parents cd0cb85 + 7950c8f
commit f5c589c
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 12 deletions.
diff --git a/jrcc-access-api/pom.xml b/jrcc-access-api/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-document-api</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

diff --git a/jrcc-access-spring-boot-autoconfigure/pom.xml b/jrcc-access-spring-boot-autoconfigure/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-autoconfigure</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>jrcc-access-spring-boot-autoconfigure</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -98,12 +98,12 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-access-libs</artifactId>
-			<version>1.1.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-api</artifactId>
-			<version>1.1.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/jrcc-access-spring-boot-sample-app/README.md b/jrcc-access-spring-boot-sample-app/README.md
@@ -0,0 +1,22 @@
+# Sample application
+
+## SFTP Config
+
+run
+
+```bash
+docker-compose up
+```
+
+run
+
+```bash
+ssh-keyscan -H localhost -p 22 >> ~/.ssh/known_hosts
+```
+
+configure the following environment variables on your environment:
+
+| Name | Value |
+| --- | --- |
+| KNOWN_HOSTS | ~/.ssh/known_hosts |
+| spring_active_profiles | sftp |
diff --git a/jrcc-access-spring-boot-sample-app/docker-compose.yml b/jrcc-access-spring-boot-sample-app/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3.7'
+services:
+
+  #############################################################################################
+  ###                             SFTP SERVER                                               ###
+  #############################################################################################
+  dps-sftp:
+    image: atmoz/sftp
+    ports:
+    - "22:22"
+    command: admin:admin:::upload
+    networks:
+    - doc-access
+
+
+  #############################################################################################
+  ###                                 REDIS SERVER                                          ###
+  #############################################################################################
+  dps-redis:
+    container_name: redis
+    image: redis
+    command: redis-server --requirepass admin
+    ports:
+    - "6379:6379"
+    volumes:
+    - data-redis:/data
+    restart: always
+    networks:
+    - doc-access
+
+volumes:
+  data-redis:
+
+networks:
+  doc-access:
+    driver: "bridge"
diff --git a/jrcc-access-spring-boot-sample-app/pom.xml b/jrcc-access-spring-boot-sample-app/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-sample-app</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>jrcc-access-spring-boot-sample-app</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-access-spring-boot-starter</artifactId>
-			<version>1.1.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

diff --git a/jrcc-access-spring-boot-sample-app/src/main/resources/application-sftp.yml b/jrcc-access-spring-boot-sample-app/src/main/resources/application-sftp.yml
@@ -0,0 +1,34 @@
+main:
+  web-application-type: none
+logging:
+  level:
+    ca:
+      gov:
+        bc: DEBUG
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} %X{transaction.filename} %X{transaction.id} - %msg%n"
+    file: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} %X{transaction.filename} - %msg%n"
+spring:
+  redis:
+    host: localhost
+    port: 6379
+    password: admin
+bcgov:
+  access:
+    input:
+      sender: bcgov
+      document-type: test-doc
+      plugin: sftp
+      sftp:
+        port: 22
+        username: admin
+        password: admin
+        remoteDirectory:  upload
+        filterPattern: .*.xml
+        cron: '*/5 * * * * ?'
+        maxMessagePerPoll: 1
+        allowUnknownKeys: true
+        knownHostFile: ${KNOWN_HOSTS}
+    output:
+      document-type: test-doc
+      plugin: console
diff --git a/jrcc-access-spring-boot-starter/pom.xml b/jrcc-access-spring-boot-starter/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-starter</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>jrcc-access-spring-boot-starter</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -37,12 +37,12 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-access-spring-boot-autoconfigure</artifactId>
-			<version>1.1.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-access-libs</artifactId>
-			<version>1.1.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

diff --git a/jrcc-document-access-libs/pom.xml b/jrcc-document-access-libs/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>ca.bc.gov.open</groupId>
 		<artifactId>document-access</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-document-access-libs</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>jrcc-document-access-libs</name>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>document-access</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>document-access</name>
 	<packaging>pom</packaging>