Merge branch 'main' into feat/temp-sqs

Author: marcelovbcfilho

pom.xml

@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.1.0</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>br.com.grupo63</groupId>
     <artifactId>serviceproduction</artifactId>
-    <version>4.0.0</version>
+    <version>5.0.0</version>
     <name>Service Production</name>
-    <description>FIAP SOAT1 2023 - Group 63 - Phase 4</description>
+    <description>FIAP SOAT1 2023 - Group 63 - Phase 5 - Production microservice </description>
     <properties>
         <java.version>17</java.version>
         <aws.sdk.version>1.12.674</aws.sdk.version>
+        <sonar.coverage.exclusions>
+            **/config/*,
+            **/dto/*DTO.*,
+        </sonar.coverage.exclusions>
     </properties>
     <repositories>
         <repository>
@@ -130,7 +134,6 @@
     </dependencies>
 
     <build>
-        <finalName>app</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -143,6 +146,17 @@
                         </exclude>
                     </excludes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
             </plugin>
         </plugins>
         <resources>
@@ -191,7 +205,8 @@
                                 </goals>
                                 <configuration>
                                     <excludes>
-                                        <exclude>**/br/com/grupo63/serviceproduction/config/DynamoDBConfig.class</exclude>
+                                        <exclude>**/dto/*DTO.*</exclude>
+                                        <exclude>**/config/**</exclude>
                                     </excludes>
                                     <formats>
                                         <format>XML</format>

src/main/java/br/com/grupo63/serviceproduction/ServiceProductionApplication.java

@@ -12,9 +12,9 @@
 @OpenAPIDefinition(
         info = @Info(title = "${info.name}", description = "${info.description}", version = "${info.version}"),
         servers ={
-                @Server(url = "${server.servlet.context-path}", description = "Current URL"),
-                @Server(url = "localhost:8080", description = "Local"),
-                @Server(url = "${docs.api.url}", description = "API Gateway Invoke URL")
+                @Server(url = "${server.servlet.context-path:}", description = "Current URL"),
+                @Server(url = "localhost:${server.port:8080}${server.servlet.context-path:}", description = "Localhost"),
+                @Server(url = "${app.docs-api-url:(no value)}${server.servlet.context-path:}", description = "Custom URL from env")
         })
 @SecurityScheme(
         name = "bearerAuth",

src/main/java/br/com/grupo63/serviceproduction/config/DynamoDBConfig.java

@@ -2,6 +2,7 @@
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.auth.BasicSessionCredentials;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
 import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
@@ -18,30 +19,36 @@
 @EnableDynamoDBRepositories
         (basePackages = "br.com.grupo63.serviceproduction.gateway")
 public class DynamoDBConfig {
-    @Value("${amazon.dynamodb.endpoint}")
-    private String amazonDynamoDBEndpoint;
+    @Value("${app.aws.dynamodb.endpoint}")
+    private String awsDynamoDBEndpoint;
 
-    @Value("${amazon.aws.accesskey}")
-    private String amazonAWSAccessKey;
+    @Value("${app.aws.access-key}")
+    private String awsAccessKey;
 
-    @Value("${amazon.aws.secretkey}")
-    private String amazonAWSSecretKey;
+    @Value("${app.aws.secret-key}")
+    private String awsSecretKey;
+
+    @Value("${app.aws.session-token}")
+    private String awsSessionToken;
 
     @Bean
     public AmazonDynamoDB amazonDynamoDB(AWSCredentials awsCredentials) {
         AmazonDynamoDB amazonDynamoDB
                 = new AmazonDynamoDBClient(awsCredentials);
 
-        if (!StringUtils.isEmpty(amazonDynamoDBEndpoint)) {
-            amazonDynamoDB.setEndpoint(amazonDynamoDBEndpoint);
+        if (!StringUtils.isEmpty(awsDynamoDBEndpoint)) {
+            amazonDynamoDB.setEndpoint(awsDynamoDBEndpoint);
         }
 
         return amazonDynamoDB;
     }
 
     @Bean
-    public AWSCredentials amazonAWSCredentials() {
-        return new BasicAWSCredentials(
-                amazonAWSAccessKey, amazonAWSSecretKey);
+    public AWSCredentials awsCredentials() {
+        if (awsSessionToken == null || awsSessionToken.isBlank()) {
+            return new BasicAWSCredentials(
+                    awsAccessKey, awsSecretKey);
+        }
+        return new BasicSessionCredentials(awsAccessKey, awsSecretKey, awsSessionToken);
     }
 }

src/main/resources/application.yml

@@ -14,10 +14,6 @@ spring:
   flyway:
     locations: classpath:db/migrations/{vendor}/
     enabled: true
-jwt:
-  token:
-    key:
-      public: "${JWT_PUBLIC_KEY}"
 
 springdoc:
   swagger-ui:
@@ -31,15 +27,37 @@ management:
   endpoint:
     health:
       show-components: always
+    shutdown:
+      enabled: true # For debugging
   endpoints:
     web:
       exposure:
-        include: health, info
+        include: health, info, metrics, shutdown
+
+server:
+  servlet:
+    context-path: "/production"
+  port: 8004
+
+
+# --- Custom keys ---
+
 info:
   name: '@project.name@'
   description: '@project.description@'
   version: '@project.version@'
 
-docs:
-  api:
-    url: "${DOCS_API_URL:https://9ah1j49vm1.execute-api.us-east-2.amazonaws.com}"
+
+app:
+  docs-api-url: "${DOCS_API_URL:(no value)}"
+  aws:
+    access-key: "${AWS_ACCESS_KEY:no_access_key}"
+    secret-key: "${AWS_SECRET_KEY:no_secret_key}"
+    session-token: "${AWS_SESSION_TOKEN:}"
+    dynamodb:
+      endpoint: "${AWS_DYNAMODB_ENDPOINT:dynamodb.us-east-1.amazonaws.com}"
+
+jwt:
+  token:
+    key:
+      public: "${JWT_PUBLIC_KEY}"

src/main/resources/messages.properties

@@ -0,0 +1 @@
+# Due to how Spring Boot autoconfiguration works, this file needs to exist for the locale files to be detected.