Fix Cors, added call to service

Author: Rodrigo Dos Santos

README.md

@@ -299,8 +299,19 @@ Configuration(`Deployment/Services`) for Kubernetes look at [.github/workflows/k
 
 ### GRAALVM
 
+First need to compile project
+
+`mvn clean package`
+
 To run an app native using Spring Native
 
+`
+mvn spring-boot:build-image -pl authentication-service
+`
+
+PS: Valid modules are `authentication-service, person-service, user-service, kotlin-service, edge-server and edge-server`.
+
+Or to run with GraalVM Plugin.
 `
 mvn package -Pnative -q -pl authentication-service -am -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests
 `
@@ -359,7 +370,8 @@ Access it [Swagger UI](http://localhost:{SERVICE_PORT}/swagger-ui.html) - `http:
 * [X] Replace Eureka/Spring Config Server to Consul
 * [X] Add Query DSL
 * [X] Java - Migrate Zuul to Spring Cloud Gateway
-
+* [ ] React - Need to fix new layout
+* [ ] Go - Fix call to another service
 
 ### References
 [Pattern Microservice Architecture](https://microservices.io/patterns/microservices.html)

authentication-service/src/main/java/com/microservice/authentication/AuthenticationServiceApplication.java

@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.info.GitProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
@@ -66,6 +67,12 @@ static BeanFactoryPostProcessor removeErrorSecurityFilter() {
             ((DefaultListableBeanFactory)beanFactory).removeBeanDefinition("errorPageSecurityInterceptor");
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    BuildProperties buildProperties() {
+        return new BuildProperties(new Properties());
+    }
+
     @ConditionalOnProperty(prefix = "configuration", name = "initialLoad", havingValue = "true", matchIfMissing = true)
     @Bean
     CommandLineRunner runner(AuthenticationCommonRepository authenticationCommonRepository,

docker/docker-compose.yml

@@ -30,22 +30,24 @@ services:
       - ./spring-cloud-config:/spring-cloud-config:ro
 
   gateway:
-    image: edge-server
+    image: edge-server:latest
     container_name: gateway
     environment:
       - SPRING_REDIS_HOST=redisdb
-      - SPRING_PROFILES_ACTIVE=dev
-#      - CONSUL_URL=service-discovery:8500
+      - SPRING_PROFILES_ACTIVE=consul,dev
+      - CONSUL_URL=service-discovery:8500
       - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SERVER_PORT=8080
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017
       - SPRING_DATA_MONGODB_DATABASE=docker
       - MANAGEMENT_ENDPOINTS_WEB_CORS_ALLOW_CREDENTIALS=false
       - DEBUG=true
       - LOGGING_LEVEL_COM_SPRINGBOOT=debug
-      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=debug
+      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=trace
       - OPENTRACING_JAEGER_UDP_SENDER_HOST=jaeger
       - SPRING_MAIN_ALLOW_CIRCULAR_REFERENCES=true
+      - SPRING_MAIN_WEB_APPLICATION_TYPE=reactive
+#      - SPRING_CLOUD_GATEWAY_GLOBAL_CORS_ADD_TO_SIMPLE_URL_HANDLER_MAPPING=true
     depends_on:
       - service-discovery
     ports:
@@ -192,11 +194,12 @@ services:
           - post-api
 
   person-api:
-    image: person-service
+    image: person-service:latest
     container_name: person-api
     environment:
-      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_PROFILES_ACTIVE=consul,dev
       - CONSUL_URL=service-discovery:8500
+      - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SERVER_PORT=8082
       - SPRING_CLOUD_KUBERNETES_ENABLED=false
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017
@@ -224,8 +227,9 @@ services:
     image: kotlin-service
     container_name: task-api
     environment:
-      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_PROFILES_ACTIVE=consul,dev
       - CONSUL_URL=service-discovery:8500
+      - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SERVER_PORT=9092
       - SPRING_CLOUD_KUBERNETES_ENABLED=false
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017
@@ -273,11 +277,12 @@ services:
           - task-api
 
   user-api:
-    image: user-service
+    image: user-service:latest
     container_name: user-api
     environment:
-      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_PROFILES_ACTIVE=consul,dev
       - CONSUL_URL=service-discovery:8500
+      - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SERVER_PORT=8083
       - SPRING_CLOUD_KUBERNETES_ENABLED=false
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017
@@ -301,7 +306,7 @@ services:
           - user-api
 
   authentication-api:
-    image: authentication-service #fielcapao/microservices-design-patterns-authentication-service
+    image: authentication-service:latest #fielcapao/microservices-design-patterns-authentication-service
     container_name: authentication-api
     environment:
       - SPRING_PROFILES_ACTIVE=consul,dev
@@ -427,5 +432,46 @@ services:
         aliases:
           - jaeger
 
+  zookeeper:
+    image: antrea/confluentinc-zookeeper:6.2.0
+    hostname: zookeeper
+    container_name: zookeeper
+    ports:
+      - '2181:2181'
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  broker:
+    image: antrea/confluentinc-kafka:6.2.0
+    hostname: broker
+    container_name: broker
+    depends_on:
+      - zookeeper
+    ports:
+      - '9092:9092'
+      - '9101:9101'
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://broker:29092,PLAINTEXT_HOST://localhost:9092
+      # NOTE: Not supported by current container
+      # KAFKA_METRIC_REPORTERS: io.confluent.metrics.reporter.ConfluentMetricsReporter
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_CONFLUENT_LICENSE_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_CONFLUENT_BALANCER_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9101
+      KAFKA_JMX_HOSTNAME: localhost
+      # TODO: Uncomment once enable schema registry
+      # KAFKA_CONFLUENT_SCHEMA_REGISTRY_URL: http://schema-registry:8081
+      CONFLUENT_METRICS_REPORTER_BOOTSTRAP_SERVERS: broker:29092
+      CONFLUENT_METRICS_REPORTER_TOPIC_REPLICAS: 1
+      CONFLUENT_METRICS_ENABLE: 'true'
+      CONFLUENT_SUPPORT_CUSTOMER_ID: 'anonymous'
+
 networks:
   net:

edge-server/pom.xml

@@ -98,7 +98,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+<!--            <scope>provided</scope>-->
         </dependency>
 
         <dependency>

edge-server/src/main/java/com/springboot/edgeserver/EdgeServerApplication.java

@@ -13,8 +13,6 @@
 import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.Profiles;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
@@ -26,9 +24,6 @@
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.DefaultCookieSerializer;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.reactive.config.EnableWebFlux;
 
 @Slf4j
@@ -74,25 +69,6 @@ public CookieSerializer cookieSerializer() {
 		return serializer;
 	}
 
-	@Bean
-	CorsFilter corsWebFilter(Environment environment) {
-		log.debug("active profiles: {}", environment.getActiveProfiles());
-		CorsConfiguration corsConfig = new CorsConfiguration();
-		corsConfig.setAllowCredentials(true);
-		if (environment.acceptsProfiles(Profiles.of("prod"))) {
-			corsConfig.addAllowedOrigin("https://spendingbetter.com");
-		} else {
-			corsConfig.addAllowedOrigin("*");
-		}
-		corsConfig.addAllowedHeader("*");
-		corsConfig.addAllowedMethod("*");
-
-		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-		source.registerCorsConfiguration("/**", corsConfig);
-
-		return new CorsFilter(source);
-	}
-
 	@Bean
 	public RouteLocator apiRoutes(RouteLocatorBuilder builder, @Value("${grafanaUrl:http://localhost:3000}") String grafanaUrl) {
 		return builder.routes()

edge-server/src/main/resources/application.yml

@@ -3,14 +3,6 @@ spring:
         allow-bean-definition-overriding: true
     application:
         name: edge-server
-    cloud:
-        consul:
-            config:
-                fail-fast: ${FAIL_FAST:true}
-                format: yaml
-    config:
-        import: consul:${consul_url:localhost:8500}
-
 management:
     endpoints:
         web:
@@ -23,6 +15,33 @@ opentracing:
     spring:
         web:
             skip-pattern: "/actuator.*|/api-docs.*|/swagger.*|.*\\.png|.*\\.css|.*\\.js|.*\\.html|/favicon.ico|/hystrix.stream"
+
+---
+spring:
+    config:
+        activate:
+            on-profile: consul
+        import: consul:${consul_url:localhost:8500}
+    cloud:
+        consul:
+            config:
+                fail-fast: ${FAIL_FAST:true}
+                format: yaml
+        gateway:
+            globalcors:
+                cors-configurations:
+                    '[/**]':
+                        allowedOrigins:
+                            - "http://localhost:3000"
+                            - "http://localhost:8080"
+                        allowedHeaders: "*"
+                        allowedMethods: "*"
+                        allowCredentials: true
+            default-filters:
+                - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
+    autoconfigure:
+        exclude: org.springframework.cloud.consul.config.ConsulConfigAutoConfiguration
+
 #zuul:
 #    prefix: /api
 #    sensitiveHeaders:
@@ -36,4 +55,21 @@ opentracing:
 #            swaggerUri: api-documentation # additional custom path for swagger documentation, use zuul.default-swagger-url as default
 #            protocol: http:// # additional protocol info, default: http://
 #            allowedGroups: # springfox swagger groups filtering. if list not defined or empty - all groups are showed.
-#                - securityGroup
+#                - securityGroup
+
+---
+spring:
+    config:
+        activate:
+            on-profile: prod
+    cloud:
+        gateway:
+            globalcors:
+                cors-configurations:
+                    '[/**]':
+                        allowedOrigins: "https://spendingbetter.com"
+                        allowedHeaders: "*"
+                        allowedMethods: "*"
+                        allowCredentials: true
+            default-filters:
+                - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin

go-service/go.mod

@@ -5,24 +5,17 @@ go 1.15
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-playground/validator/v10 v10.4.0
-	github.com/google/btree v1.0.0 // indirect
-	github.com/hashicorp/consul/api v1.7.0
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/hashicorp/consul v1.13.1
+	github.com/hashicorp/consul/api v1.14.0
 	github.com/joho/godotenv v1.3.0
 	github.com/labstack/echo-contrib v0.9.0
 	github.com/labstack/echo/v4 v4.1.17
 	github.com/labstack/gommon v0.3.0
 	github.com/prometheus/client_golang v1.7.1 // indirect
-	github.com/stretchr/testify v1.6.1 // indirect
 	go.mongodb.org/mongo-driver v1.4.1
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.20.1 // indirect
 	k8s.io/apimachinery v0.20.1
 	k8s.io/client-go v0.20.0
-	k8s.io/klog v1.0.0 // indirect
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
 )