perf($Starter): dynamic SFTP client

johnnymillergh · Jun 8, 2021 · 4c37cc4 · 4c37cc4
1 parent 7d030a3
commit 4c37cc4
Show file tree

Hide file tree

Showing 27 changed files with 91 additions and 160 deletions.
diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-development-docker
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-development-docker
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -23,12 +23,10 @@ logging:
     com.jcraft.jsch: INFO
 
 sftp:
-  client:
-    configuration:
-      host: localhost
-      port: 23
-      user: johnny
-      password: atmoz@sftp
+  host: localhost
+  port: 23
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-production
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-stage
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-stage
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-test
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-test
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -175,10 +175,9 @@ maf:
 
 
 sftp:
-  client:
-    configuration:
-      directory: upload
-      private-key:
-      private-key-pass-phrase:
-      session-cache-size: 20
-      session-wait-timeout: 15000
+  enabled: true
+  directory: upload
+  private-key:
+  private-key-pass-phrase:
+  session-cache-size: 20
+  session-wait-timeout: 15000
diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/exercise-mis/src/main/resources/application-development-docker.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-development-docker
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-development-docker
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/exercise-mis/src/main/resources/application-development-local.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: localhost
-      port: 23
-      user: johnny
-      password: atmoz@sftp
+  host: localhost
+  port: 23
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-production.yml b/exercise-mis/src/main/resources/application-production.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-production
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-stage.yml b/exercise-mis/src/main/resources/application-stage.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-production
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-test.yml b/exercise-mis/src/main/resources/application-test.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-production
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application.yml b/exercise-mis/src/main/resources/application.yml
@@ -168,10 +168,9 @@ maf:
     included-package-for-http-api-scan: ${maf.project-property.base-package}
 
 sftp:
-  client:
-    configuration:
-      directory: upload
-      private-key:
-      private-key-pass-phrase:
-      session-cache-size: 20
-      session-wait-timeout: 15000
+  enabled: true
+  directory: upload
+  private-key:
+  private-key-pass-phrase:
+  session-cache-size: 20
+  session-wait-timeout: 15000
diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-development-docker
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-development-docker
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml
@@ -22,12 +22,10 @@ logging:
     com.jcraft.jsch: INFO
 
 sftp:
-  client:
-    configuration:
-      host: localhost
-      port: 23
-      user: johnny
-      password: atmoz@sftp
+  host: localhost
+  port: 23
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-production.yml b/muscle-mis/src/main/resources/application-production.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-production
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-stage.yml b/muscle-mis/src/main/resources/application-stage.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-stage
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-stage
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-test.yml b/muscle-mis/src/main/resources/application-test.yml
@@ -18,12 +18,10 @@ spring:
     password: maf@rabbitmq
 
 sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-test
-      port: 22
-      user: johnny
-      password: atmoz@sftp
+  host: maf-atmoz-sftp-test
+  port: 22
+  user: johnny
+  password: atmoz@sftp
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application.yml b/muscle-mis/src/main/resources/application.yml
@@ -156,10 +156,9 @@ maf:
     included-package-for-http-api-scan: ${maf.project-property.base-package}
 
 sftp:
-  client:
-    configuration:
-      directory: upload
-      private-key:
-      private-key-pass-phrase:
-      session-cache-size: 20
-      session-wait-timeout: 15000
+  enabled: true
+  directory: upload
+  private-key:
+  private-key-pass-phrase:
+  session-cache-size: 20
+  session-wait-timeout: 15000
diff --git a/spring-boot-admin/src/main/resources/application-development-docker.yml b/spring-boot-admin/src/main/resources/application-development-docker.yml
@@ -21,10 +21,3 @@ maf:
   configuration:
     swagger-disabled: false
 
-sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-development-docker
-      port: 22
-      user: johnny
-      password: atmoz@sftp
diff --git a/spring-boot-admin/src/main/resources/application-development-local.yml b/spring-boot-admin/src/main/resources/application-development-local.yml
@@ -20,11 +20,3 @@ spring:
 maf:
   configuration:
     swagger-disabled: false
-
-sftp:
-  client:
-    configuration:
-      host: localhost
-      port: 23
-      user: johnny
-      password: atmoz@sftp
diff --git a/spring-boot-admin/src/main/resources/application-production.yml b/spring-boot-admin/src/main/resources/application-production.yml
@@ -20,11 +20,3 @@ spring:
 maf:
   configuration:
     swagger-disabled: true
-
-sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-production
-      port: 22
-      user: johnny
-      password: atmoz@sftp
diff --git a/spring-boot-admin/src/main/resources/application-stage.yml b/spring-boot-admin/src/main/resources/application-stage.yml
@@ -20,11 +20,3 @@ spring:
 maf:
   configuration:
     swagger-disabled: true
-
-sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-stage
-      port: 22
-      user: johnny
-      password: atmoz@sftp
diff --git a/spring-boot-admin/src/main/resources/application-test.yml b/spring-boot-admin/src/main/resources/application-test.yml
@@ -20,11 +20,3 @@ spring:
 maf:
   configuration:
     swagger-disabled: true
-
-sftp:
-  client:
-    configuration:
-      host: maf-atmoz-sftp-test
-      port: 22
-      user: johnny
-      password: atmoz@sftp
diff --git a/spring-boot-admin/src/main/resources/application.yml b/spring-boot-admin/src/main/resources/application.yml
@@ -134,12 +134,3 @@ maf:
         - "/webjars/**"
         - "/doc.html"
     included-package-for-http-api-scan: ${maf.project-property.base-package}
-
-sftp:
-  client:
-    configuration:
-      directory: upload
-      private-key:
-      private-key-pass-phrase:
-      session-cache-size: 20
-      session-wait-timeout: 15000
diff --git a/...src/main/java/com/jmsoftware/maf/springcloudstarter/configuration/MinioConfiguration.java b/...src/main/java/com/jmsoftware/maf/springcloudstarter/configuration/MinioConfiguration.java
@@ -4,6 +4,7 @@
 import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;