feat: reuse config from common, ecs metadata

Author: g-otn

compose.yaml

@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>com.github.soat-tech-challenge</groupId>
 			<artifactId>service-common</artifactId>
-			<version>4.1.0</version>
+			<version>5.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>

pom.xml

@@ -9,6 +9,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 
 @OpenAPIDefinition(
 		info = @Info(title = "${info.name}", description = "${info.description}", version = "${info.version}"),
@@ -26,6 +27,7 @@
 )
 @SpringBootApplication
 @EnableFeignClients
+@ComponentScan(basePackages = {"br.com.grupo63"})
 public class ServiceOrderApplication {
 
 	public static void main(String[] args) {

src/main/java/br/com/grupo63/serviceorder/ServiceOrderApplication.java

@@ -1,5 +1,7 @@
 package br.com.grupo63.serviceorder.config;
 
+import br.com.grupo63.techchallenge.common.config.JwtFilter;
+import br.com.grupo63.techchallenge.common.config.JwtService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;

src/main/java/br/com/grupo63/serviceorder/config/JwtFilter.java

@@ -18,13 +18,11 @@ spring:
   flyway:
     locations: classpath:db/migrations/{vendor}/
     enabled: true
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqStd8n4SGNM0eZhV/hzU+urHA5/IMZPoP9YQ9ZcLKWiX33nI6bSuZMCrLZcJExf63xS+uxDpGxM8Mnk2zOdl+lPwANXLzP1us5P1PyA3YPycW9J7C5YTQW0GiEL3M93ZX7vMJiVoBYblP3JPlYnoYlBORuc0JPk33KtfEZP+78qXpPHM8imYrJLe8ceiDLLFDU/nh5KC2dWAy3ci1ahoJ1Q9ELhp3IZLvOTX57H/T2VKOYOya5+ST41h+JjzI+qGTVnLcKaW+k25YLlVnkSspvdx98+yQDi7kbOTS6yRZHUPD6wPk/nUozpD0nZKccoH4W+zMwmQVtsAA6JCA9gfGwIDAQAB}"
 
 # --- Custom keys ---
 
 app:
+  auth:
+    jwt_public_key:  "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqStd8n4SGNM0eZhV/hzU+urHA5/IMZPoP9YQ9ZcLKWiX33nI6bSuZMCrLZcJExf63xS+uxDpGxM8Mnk2zOdl+lPwANXLzP1us5P1PyA3YPycW9J7C5YTQW0GiEL3M93ZX7vMJiVoBYblP3JPlYnoYlBORuc0JPk33KtfEZP+78qXpPHM8imYrJLe8ceiDLLFDU/nh5KC2dWAy3ci1ahoJ1Q9ELhp3IZLvOTX57H/T2VKOYOya5+ST41h+JjzI+qGTVnLcKaW+k25YLlVnkSspvdx98+yQDi7kbOTS6yRZHUPD6wPk/nUozpD0nZKccoH4W+zMwmQVtsAA6JCA9gfGwIDAQAB}"
   api-url:
     identification: "${API_URL_IDENTIFICATION:http://localhost:8001}"

src/main/java/br/com/grupo63/serviceorder/config/JwtFilterConfig.java

@@ -6,3 +6,6 @@ spring:
     username: ${DB_USERNAME:backend}
   devtools:
     add-properties: false
+
+info:
+  ecs_metadata_url_v4: "${ECS_CONTAINER_METADATA_URI_V4:unknown}"

src/main/java/br/com/grupo63/serviceorder/config/JwtService.java

@@ -1,4 +1,8 @@
 # Global config
+logging:
+  level:
+    br.com.grupo63: "${LOGGING_LEVEL:info}"
+
 spring:
   docker:
     compose:
@@ -14,10 +18,6 @@ spring:
   flyway:
     locations: classpath:db/migrations/{vendor}/
     enabled: true
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY}"
 
 springdoc:
   swagger-ui:
@@ -38,6 +38,7 @@ management:
       exposure:
         include: health, info, metrics, shutdown
 
+
 server:
   servlet:
     context-path: "/order"
@@ -46,6 +47,8 @@ server:
 # --- Custom keys ---
 
 app:
+  auth:
+    jwt_public_key: "${JWT_PUBLIC_KEY}"
   docs-api-url: "${DOCS_API_URL:(no value)}"
   api-url:
     identification: "${API_URL_IDENTIFICATION}"
@@ -54,3 +57,4 @@ info:
   name: "@project.name@"
   description: "@project.description@"
   version: "@project.version@"
+

src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-app:
-  version: '@project.version@'
 springdoc:
   api-docs:
     enabled: false
@@ -13,10 +11,6 @@ spring:
   output:
     ansi:
       enabled: always
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNgzDuoQFLRFb3ivIA5CEHFRuqltT7xR6hFu+6xPD5q0sq8Exjue5s5MIQwkJMldk8/Dhp85OT5ULmAA5x4hPZfFlQEMlMPT5QItQImQ7UFCxBbMwksZlUQEP37Aa5OJ+KhEPBDTe0AaXqXFKxIOLEjHYWqhFHq5whxNotbuPrqLWEopCAgY4lqCe0pSoT3V+7Jszpq+czLBOl6eCbD933pK98/aVD9yA2+7LNOwmkYVyR4kvXX25K5Q/DDUZgMWyQTm3TCnfCrbdH6IH/Z12/DkePNuGFygUKDCEYPkPYnHbRXee4CXbeDkEdgZwzGJPM8gPhSUFrrzFVeihvN5OQIDAQAB}"
 management:
   endpoints:
-    enabled-by-default: false
+    enabled-by-default: false