Renaming some modules

Author: muhamadto

.github/workflows/release.yml

@@ -51,6 +51,10 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
+      - name: maven-settings-xml-action
+        uses: whelk-io/maven-settings-xml-action@v22
+        with:
+          servers: '[{ "id": "github", "password": "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" }]'
       - name: Build with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,6 @@
 
 <!--- Please include the following in your Pull Request when applicable: -->
 
-- [ ] Describe what you did in the pull request description
+- [ ] Describe what you did in the pull secret description
 - [ ] Add Unit and Integration Tests - at least 80% unit tests for new code.
 - [ ] Added or updated documentation

pom.xml

@@ -84,7 +84,6 @@
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
         <groupId>io.awspring.cloud</groupId>
         <artifactId>spring-cloud-aws-dependencies</artifactId>
@@ -108,14 +107,8 @@
       <!-- SPRING-NATIVE-AWS-LAMBDA ENDS -->
 
       <dependency>
-        <groupId>com.coffeebeans</groupId>
-        <artifactId>coffeebeans-cdk-core</artifactId>
-        <version>1.0-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.coffeebeans</groupId>
-        <artifactId>coffeebeans-cdk-assertions</artifactId>
+        <groupId>io.sandpipers</groupId>
+        <artifactId>sandpipers-cdk-bom</artifactId>
         <version>1.0-SNAPSHOT</version>
       </dependency>
 
@@ -298,16 +291,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>github</id>
-      <url>https://public:&#48;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@maven.pkg.github.com/muhamadto/*</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

spring-native-aws-service-infra/pom.xml

@@ -56,8 +56,8 @@
     <!-- AWS CDK ENDS -->
 
     <dependency>
-      <groupId>com.coffeebeans</groupId>
-      <artifactId>coffeebeans-cdk-core</artifactId>
+      <groupId>io.sandpipers</groupId>
+      <artifactId>sandpipers-cdk-core</artifactId>
     </dependency>
 
     <!-- UTILS -->
@@ -99,8 +99,8 @@
 
     <!-- TEST -->
     <dependency>
-      <groupId>com.coffeebeans</groupId>
-      <artifactId>coffeebeans-cdk-assertions</artifactId>
+      <groupId>io.sandpipers</groupId>
+      <artifactId>sandpipers-cdk-assertions</artifactId>
       <scope>test</scope>
     </dependency>
 

spring-native-aws-service/pom.xml

@@ -166,7 +166,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.10.1</version>
             <configuration>
               <mainClass>com.coffeebeans.springnativeawslambda.Application</mainClass>
               <buildArgs combine.children="append">

spring-native-aws-service/src/main/java/com/coffeebeans/springnativeawslambda/ReflectionRuntimeHints.java

@@ -18,34 +18,24 @@
 
 package com.coffeebeans.springnativeawslambda;
 
-import com.coffeebeans.springnativeawslambda.entity.Secret;
-import com.coffeebeans.springnativeawslambda.repository.SecretRepository;
-import io.awspring.cloud.dynamodb.DynamoDbTemplate;
 import java.util.List;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import com.coffeebeans.springnativeawslambda.model.Request;
-import com.coffeebeans.springnativeawslambda.model.Response;
-import java.util.Map;
+import com.coffeebeans.springnativeawslambda.model.Secret;
 import org.joda.time.DateTime;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.lang.Nullable;
-import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
-import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
-import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
-import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
 
 public class ReflectionRuntimeHints implements RuntimeHintsRegistrar {
 
   @Override
   public void registerHints(final RuntimeHints hints, @Nullable final ClassLoader classLoader) {
     final List<TypeReference> typeReferences = List.of(
         TypeReference.of(DateTime.class),
-        TypeReference.of(Response.class),
-        TypeReference.of(Request.class),
+        TypeReference.of(Secret.class),
         TypeReference.of(APIGatewayProxyResponseEvent.class),
         TypeReference.of(APIGatewayProxyRequestEvent.class),
         TypeReference.of(APIGatewayProxyRequestEvent.ProxyRequestContext.class)

spring-native-aws-service/src/main/java/com/coffeebeans/springnativeawslambda/entity/Secret.java

@@ -6,14 +6,11 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
-import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
 
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@DynamoDbBean
 public class Secret implements Serializable {
 
   private String env;
@@ -24,11 +21,22 @@ public class Secret implements Serializable {
 
   private String partitionKey;
 
-  private Map<String, String> variables;
+  private Map<String, String> items;
 
-  @DynamoDbPartitionKey
   public String getPartitionKey() {
     return env + costCentre + applicationName;
   }
 
+  public static Secret of(final com.coffeebeans.springnativeawslambda.model.Secret secretModel) {
+    final String env = secretModel.getEnv();
+    final String costCentre = secretModel.getCostCentre();
+    final String applicationName = secretModel.getApplicationName();
+    return Secret.builder()
+        .env(env)
+        .costCentre(costCentre)
+        .applicationName(applicationName)
+        .items(secretModel.getItems())
+        .partitionKey(secretModel.getId())
+        .build();
+  }
 }

spring-native-aws-service/src/main/java/com/coffeebeans/springnativeawslambda/function/ExampleFunction.java

@@ -20,9 +20,7 @@
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import com.coffeebeans.springnativeawslambda.entity.Secret;
-import com.coffeebeans.springnativeawslambda.model.Request;
-import com.coffeebeans.springnativeawslambda.model.Response;
+import com.coffeebeans.springnativeawslambda.model.Secret;
 import com.coffeebeans.springnativeawslambda.repository.SecretRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,7 +29,6 @@
 import java.util.function.Function;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 
@@ -66,24 +63,14 @@ public ExampleFunction(
   public APIGatewayProxyResponseEvent apply(final APIGatewayProxyRequestEvent proxyRequestEvent) {
     log.info("Converting request into a response...'");
 
-    final Request request = objectMapper.readValue(proxyRequestEvent.getBody(), Request.class);
+    final Secret secret = objectMapper.readValue(proxyRequestEvent.getBody(), Secret.class);
 
-    final Response response = Response.builder()
-        .name(request.getName())
-        .saved(true)
-        .build();
-
-    this.secretRepository.save(Secret.builder()
-        .env("dev")
-        .costCentre("coffeebeans")
-        .applicationName("native-lambda")
-        .variables(Map.of("ENV", "dev", "PASSWORD", "changeit"))
-        .build());
+    this.secretRepository.save(com.coffeebeans.springnativeawslambda.entity.Secret.of(secret));
 
     log.info("Converted request into a response.");
 
     return new APIGatewayProxyResponseEvent()
         .withStatusCode(200)
-        .withBody(objectMapper.writeValueAsString(response));
+        .withBody(objectMapper.writeValueAsString(secret));
   }
 }

spring-native-aws-service/src/main/java/com/coffeebeans/springnativeawslambda/model/Request.java

@@ -21,7 +21,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -31,13 +32,25 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Response {
-
+public class Secret {
   @NotBlank
   @JsonProperty(access = Access.READ_ONLY)
-  private String name;
+  private String id;
+
+  @NotBlank
+  private String env;
+
+  @NotBlank
+  private String costCentre;
+
+  @NotBlank
+  private String applicationName;
+
+  @NotEmpty
+  private Map<String, String> items;
+
+  public String getId() {
+    return "%s-%s-%s".formatted(env, costCentre, applicationName).toLowerCase().replaceAll("[^a-zA-Z0-9]", "");
+  }
 
-  @NotNull
-  @JsonProperty(access = Access.READ_ONLY)
-  private boolean saved;
 }