Merge branch 'release/5.5'

Author: mohamed-taman

.env

@@ -0,0 +1,3 @@
+CONFIG_SERVER_ENCRYPT_KEY=my-very-secure-encrypt-key
+CONFIG_SERVER_USR=dev-usr
+CONFIG_SERVER_PWD=dev-pwd

README.md

@@ -31,6 +31,7 @@ Springy Store μService --> Parent folder.
   |- authorization-server --> Authorization server
   |- edge-server --> API Gateway server
   |- eureka-server --> Service discovery server
+  |- config-server --> Centralized Configuration server
 |-store-common 
   |- store-api --> API Endpoint and services definitions for all microservices 
   |- store-utils --> Common utilities shared between all components 
@@ -66,7 +67,7 @@ The following topics are going to be covered in this 1st stage (other stages top
 - Adding automated tests of microservices in isolation.
 - Adding semi-automated tests to a microservice landscape.
 
-### System Boundary - μServices Landscape (Release 5.0-Latest)
+### System Boundary - μServices Landscape (Release 5.5-Latest)
 
 ![System Boundary](docs/diagram/app_ms_landscape.png)
 
@@ -114,7 +115,8 @@ To build and run the test cases for each service & shared modules in the project
 
 > This done only for the first time or any new changes or versions of shared modules and POMs.
 
-To build and install `store-build-chassis`, `store-utils`, `store-api`, `store-chassis` libraries, from the root folder `springy-store-microservices` run the following commands:
+To build and install `store-build-chassis`, `store-utils`, `store-api`, `store-services-chassis`, and `store-cloud-chassis` libraries, from the root folder `springy-store-microservices` run the
+ following commands:
 
 ```bash
 mohamed.taman@DTLNV8 ~/springy-store-microservices 
@@ -146,7 +148,7 @@ Woohoo, building & installing all project modules are finished successfully.
 The project is ready for the next step. :)
 ```
 #### Second: Build & Test Microservices
-Now it is time to build our **4 microservices** and run each service integration test in
+Now it is the time to build our **4 microservices** and run each service integration test in
  isolation by running the following commands:
 
 ```bash
@@ -177,6 +179,7 @@ All build commands and test suite for each microservice should run successfully,
 [INFO] Eureka Discovery Server ............................ SUCCESS [  6.536 s]
 [INFO] Edge Server ........................................ SUCCESS [ 32.108 s]
 [INFO] Authorization Server ............................... SUCCESS [  1.616 s]
+[INFO] Configuration Server ............................... SUCCESS [  1.216 s]
 [INFO] Springy Store Aggregator ........................... SUCCESS [  0.100 s]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
@@ -200,6 +203,7 @@ All the **services**, **databases**, and **messaging service** will run in paral
 ```bash
 Creating network "ssm_default" with the default driver
 Creating ssm_eureka_1         ... done
+Creating ssm_config-server_1  ... done
 Creating ssm_gateway_1        ... done
 Creating ssm_auth-server_1    ... done
 Creating ssm_mysql_1          ... done
@@ -330,6 +334,7 @@ Stopping ssm_mysql_1          ... done
 Stopping ssm_rabbitmq_1       ... done
 Stopping ssm_eureka_1         ... done
 Stopping ssm_gateway_1        ... done
+Stopping ssm_config-server_1  ... done
 Removing ssm_recommendation_1 ... done
 Removing ssm_product_1        ... done
 Removing ssm_review_1         ... done
@@ -340,6 +345,7 @@ Removing ssm_mysql_1          ... done
 Removing ssm_rabbitmq_1       ... done
 Removing ssm_eureka_1         ... done
 Removing ssm_gateway_1        ... done
+Removing ssm_config-server_1  ... done
 Removing network ssm_default
 ```
 ### The End

store-services/product-service/src/main/resources/application.yml renamed to config/repo/application.yml

@@ -1,82 +1,36 @@
-spring:
-  application.name: product
-  data:
-    mongodb:
-      host: ${app.database.host}
-      port: 27017
-      database: product-db
-      auto-index-creation: true
-
-  rabbitmq:
-    host: ${app.messaging.rabbitmq.host}
-    port: 5672
-    username: guest
-    password: guest
-
-  cloud:
-    # As Spring Cloud Ribbon is in maintenance mode.
-    # It is recommended switching to BlockingLoadBalancerClient instead.
-    loadbalancer.ribbon.enabled: false
-
-    # Event-driven messages Stream config
-    stream:
-      defaultBinder: rabbit
-      default.contentType: application/json
-      bindings:
-        input:
-          destination: products
-          group: productsGroup
-          consumer:
-            maxAttempts: 3
-            backOffInitialInterval: 500
-            backOffMaxInterval: 1000
-            backOffMultiplier: 2.0
-      rabbit:
-        bindings:
-          input.consumer:
-              autoBindDlq: true
-              republishToDlq: true
-      kafka:
-        bindings:
-          input.consumer.enableDlq: true
-        binder:
-          brokers: ${app.messaging.kafka.broker}
-          defaultBrokerPort: 9092
-
+# Server configs
 server:
-  port: 9081
+  ## Should be included to show message, if not error message will be empty
   error:
     include-message: always
     include-binding-errors: always
 
-logging.level:
-    web: DEBUG
-    root: INFO
-    com.siriusxi.ms.store: DEBUG
-    org:
-      springframework.data.mongodb.core.MongoTemplate: DEBUG
-      mongodb: debug
-
-management:
-  info.git:
-      mode: full
-      enabled: true
-  endpoints.web.exposure.include: "*"
-  endpoint:
-    shutdown.enabled: true
-    health.show-details: always
-
+# Custom configurations
 app:
   eureka:
     host: localhost
     user: mt
     pass: p
+    # pass: '{cipher}a672bc1a5c86b877ade72bca188ac4b6d33e7a91c3b524cbd86c8f031d1344c8'
   database:
     host: localhost
   messaging:
     rabbitmq.host: 127.0.0.1
     kafka.broker: 127.0.0.1
 
+spring:
+  cloud:
+    # As Spring Cloud Ribbon is in maintenance mode.
+    # It is recommended switching to BlockingLoadBalancerClient instead.
+    loadbalancer.ribbon.enabled: false
+  # Massaging provider configurations
+  rabbitmq:
+    host: ${app.messaging.rabbitmq.host}
+    port: 5672
+    username: guest
+    password: guest
+    #password: '{cipher}702b8ae88ce0d606c42cd89dd20c43be1100951373416f5eb6f2ab57b0288665'
+
 # Service discovery configs
 eureka:
   instance:
@@ -90,6 +44,26 @@ eureka:
     initial-instance-info-replication-interval-seconds: 5
     registry-fetch-interval-seconds: 5
 
+ribbon:
+  server-list-refresh-interval: 5000
+  NF-load-balancer-ping-interval: 5
+
+# Application health and information management
+management:
+  info.git:
+    mode: full
+    enabled: true
+  endpoints.web.exposure.include: "*"
+  endpoint:
+    shutdown.enabled: true
+    health.show-details: always
+
+logging.level:
+  web: DEBUG
+  root: INFO
+  com.siriusxi.ms.store: DEBUG
+  com.siriusxi.cloud.infra: DEBUG
+
 # This is a docker specific profile properties
 # Also profiles could be separated in its owen file
 # with file name format of "application-docker.yaml"
@@ -98,13 +72,9 @@ spring:
   profiles: docker
   jmx.enabled: false
 
-server.port: 8080
-
 app:
   eureka:
     host: eureka
-  database:
-    host: mongodb
   messaging:
     rabbitmq.host: rabbitmq
-    kafka.broker: kafka
+    kafka.broker: kafka

config/repo/auth-server.yml

@@ -0,0 +1,2 @@
+server:
+  port: 9999

store-cloud-infra/eureka-server/src/main/resources/application.yml renamed to config/repo/eureka-server.yml

@@ -1,27 +1,10 @@
-spring:
-  application.name: eureka-server
-
-  # As Spring Cloud Ribbon is in maintenance mode.
-  # It is recommended switching to BlockingLoadBalancerClient instead.
-  cloud.loadbalancer.ribbon.enabled: false
-
 server:
   port: 8761
-  ## Should be included to show message, if not error message will be empty
-  error:
-    include-message: always
-    include-binding-errors: always
 
 logging.level:
     com.netflix:
-        eureka: debug
-        discovery: debug
-
-# Define Security
-app:
-  eureka:
-    username: mt
-    password: p
+        eureka: DEBUG
+        discovery: DEBUG
 
 eureka:
   environment: Development
@@ -62,10 +45,4 @@ eureka:
     # The interval in which the instance eviction task scans for instances with expired leases.
     # Given in milliseconds.
     eviction-interval-timer-in-ms:  2000
-    wait-time-in-ms-when-sync-empty: 0
-
-management:
-  endpoints.web.exposure.include: "*"
-  info.git:
-    enabled: true
-    mode: full
+    wait-time-in-ms-when-sync-empty: 0

store-cloud-infra/edge-server/src/main/resources/application.yml renamed to config/repo/gateway.yml

@@ -1,11 +1,9 @@
 spring:
-  application.name: gateway
   security.oauth2.resourceserver.jwt:
     jwk-set-uri: ${app.auth-server}
   # As Spring Cloud Ribbon is in maintenance mode.
   # It is recommended switching to BlockingLoadBalancerClient instead.
   cloud:
-    loadbalancer.ribbon.enabled: false
     # Route definitions of the system
     gateway:
       discovery.locator.enabled: true
@@ -41,6 +39,13 @@ spring:
           predicates:
             - Path=/eureka/**
 
+        - id: config-server
+          uri: http://${app.config-server.host}:${app.config-server.port}
+          predicates:
+            - Path=/config/**
+          filters:
+            - RewritePath=/config/(?<segment>.*), /$\{segment}
+
         # Testing URLs
         - id: host_route_200
           uri: http://httpstat.us
@@ -72,46 +77,15 @@ server:
     key-store: classpath:keystore/test.p12
     key-store-password: testtest
     key-alias: localhost
-  error:
-    include-message: always
-    include-binding-errors: always
 
 # Define Security
 app:
   eureka:
-    host: localhost
     port: 8761
-    user: mt
-    pass: p
   auth-server: http://localhost:9999/.well-known/jwks.json
 
-eureka:
-  instance:
-    lease-renewal-interval-in-seconds: 5
-    lease-expiration-duration-in-seconds: 5
-    prefer-ip-address: true
-  client:
-    healthcheck.enabled: true
-    service-Url:
-      defaultZone: http://${app.eureka.user}:${app.eureka.pass}@${app.eureka.host}:${app.eureka.port}/eureka/
-    initial-instance-info-replication-interval-seconds: 5
-    registry-fetch-interval-seconds: 5
-
-ribbon:
-  server-list-refresh-interval: 5000
-  NF-load-balancer-ping-interval: 5
-
-management:
-  info.git:
-    enabled: true
-    mode: full
-  endpoint:
-    health.show-details: "ALWAYS"
-  endpoints:
-    web.exposure.include: "*"
 
 logging.level:
-    root: INFO
     org.springframework.cloud.gateway: TRACE
     org.springframework.cloud.gateway.route.RouteDefinitionRouteLocator: INFO
     org.springframework.web.server.adapter.HttpWebHandlerAdapter: TRACE
@@ -120,14 +94,10 @@ logging.level:
 spring.profiles: docker
 
 app:
-  eureka:
-    host: eureka
   auth-server: http://auth-server:9999/.well-known/jwks.json
 
 ---
 spring.profiles: external-OAuth-Provider
 
 app:
-  eureka:
-    host: eureka
   auth-server: https://dev-taman.eu.auth0.com/.well-known/jwks.json