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

README.md

@@ -357,4 +357,10 @@ Now that the setup is done you can deploy to AWS.
         "name": "CoffeeBeans"
       }'
     ```
-3. Et voila! It runs with 500 ms for cold start.
+3. Et voila! It runs with 500 ms for cold start.
+ 
+```shell
+   curl --location --request POST 'https://lmk0qo0xrl.execute-api.ap-southeast-2.amazonaws.com/dev/
+   --header 'Content-Type: application/json' \
+   --data-raw '{ "env": "production", "costCentre": "1234", "applicationName": "some-app", "items": [ { "key": "GITHUB_TOKEN", "value": "WOAH" }, { "key": "AWS_ACCESS_KEY_ID", "value": "OMG" }, { "key": "AWS_SECRET_ACCESS_KEY", "value": "OH, NO" } ] }'
+```

cdk.json

@@ -1,3 +1,6 @@
 {
-  "app": "./mvnw exec:java -pl spring-native-aws-service-infra -Dexec.mainClass=com.coffeebeans.springnativeawslambda.infra.Application"
+  "app": "./mvnw --settings /Users/muhammad/.m2/settings-nonqantas.xml exec:java -pl spring-native-aws-service-infra -Dexec.mainClass=com.coffeebeans.springnativeawslambda.infra.Application",
+  "context": {
+    "@aws-cdk/core:bootstrapQualifier": "cbcore"
+  }
 }

pom.xml

@@ -84,7 +84,6 @@
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
         <groupId>io.awspring.cloud</groupId>
         <artifactId>spring-cloud-aws-dependencies</artifactId>
@@ -298,16 +297,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/src/main/java/com/coffeebeans/springnativeawslambda/infra/Application.java

@@ -37,13 +37,13 @@
 public final class Application extends AbstractApp {
   private static final String ENVIRONMENT_NAME_DEV = "dev";
   private static final String ENVIRONMENT_NAME_PRD = "prd";
-  private static final String LAMBDA_CODE_PATH = "spring-native-aws-service/target/spring-native-aws-function-native-zip.zip";
+  private static final String LAMBDA_CODE_PATH = "spring-native-aws-service/target/spring-native-aws-service-native-zip.zip";
 
   public static void main(final String... args) {
     final Application app = new Application();
 
     final String env = System.getenv(KEY_ENV);
-    checkNotNull(env, "'env' environment variable is required");
+    checkNotNull(env, "'ENVIRONMENT' environment variable is required");
 
     switch (env) {
       case ENVIRONMENT_NAME_DEV -> new SpringNativeAwsFunctionStack(app, COFFEE_BEANS_DEV_111111111111_AP_SOUTHEAST_2, LAMBDA_CODE_PATH, env);

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

@@ -22,9 +22,7 @@
 import static software.amazon.awscdk.services.iam.ManagedPolicy.fromAwsManagedPolicyName;
 import static software.amazon.awscdk.services.lambda.Code.fromAsset;
 
-import com.coffeebeans.cdk.core.AbstractApp;
 import com.coffeebeans.cdk.core.AbstractEnvironment;
-import com.coffeebeans.cdk.core.construct.BaseStack;
 import com.coffeebeans.cdk.core.construct.dynamodb.TableV2;
 import com.coffeebeans.cdk.core.construct.dynamodb.TableV2.TableProps;
 import com.coffeebeans.cdk.core.construct.lambda.CustomRuntime2023Function;
@@ -36,33 +34,36 @@
 import javax.validation.constraints.NotBlank;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import software.amazon.awscdk.DefaultStackSynthesizer;
 import software.amazon.awscdk.Duration;
+import software.amazon.awscdk.RemovalPolicy;
+import software.amazon.awscdk.Stack;
+import software.amazon.awscdk.StackProps;
 import software.amazon.awscdk.services.apigateway.LambdaRestApi;
 import software.amazon.awscdk.services.apigateway.Resource;
 import software.amazon.awscdk.services.apigateway.StageOptions;
 import software.amazon.awscdk.services.dynamodb.Attribute;
 import software.amazon.awscdk.services.dynamodb.AttributeType;
-import software.amazon.awscdk.services.iam.IGrantable;
 import software.amazon.awscdk.services.iam.IManagedPolicy;
 import software.amazon.awscdk.services.iam.Role;
 import software.amazon.awscdk.services.iam.ServicePrincipal;
 import software.amazon.awscdk.services.lambda.AssetCode;
 import software.amazon.awscdk.services.lambda.Function;
 
-public class SpringNativeAwsFunctionStack extends BaseStack {
+public class SpringNativeAwsFunctionStack extends Stack {
 
   private static final int LAMBDA_FUNCTION_TIMEOUT_IN_SECONDS = 3;
   private static final int LAMBDA_FUNCTION_MEMORY_SIZE = 512;
   private static final int LAMBDA_FUNCTION_RETRY_ATTEMPTS = 2;
   private static final String LAMBDA_HANDLER = "org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest";
   private static final String ENVIRONMENT_VARIABLE_SPRING_PROFILES_ACTIVE = "SPRING_PROFILES_ACTIVE";
 
-
-  public SpringNativeAwsFunctionStack(@NotNull final AbstractApp app,
+  public SpringNativeAwsFunctionStack(@NotNull final Application app,
       @NotNull final AbstractEnvironment environment,
       @NotBlank final String lambdaCodePath,
       @NotBlank final String stage) {
-    super(app, environment);
+    super(app, "SpringNativeAwsFunctionStack",
+        StackProps.builder().synthesizer(DefaultStackSynthesizer.Builder.create().qualifier("cbcore").build()).build());
 
     final List<IManagedPolicy> managedPolicies =
         List.of(fromAwsManagedPolicyName("service-role/AWSLambdaBasicExecutionRole"));
@@ -95,6 +96,7 @@ public SpringNativeAwsFunctionStack(@NotNull final AbstractApp app,
         .partitionKey(Attribute.builder().name("id").type(AttributeType.STRING).build())
         .timeToLiveAttribute("creationTime")
         .tableName(KebabCaseString.of("secrets"))
+        .removalPolicy(RemovalPolicy.RETAIN_ON_UPDATE_OR_DELETE)
         .build();
 
     final software.amazon.awscdk.services.dynamodb.TableV2 tableV2 = new TableV2(this, SafeString.of("Table"), tableProps).getTable();

spring-native-aws-service/pom.xml

@@ -43,7 +43,9 @@
 
   <properties>
     <spring-cloud.version>2023.0.0</spring-cloud.version>
-    <repackage.classifier />
+    <repackage.classifier/>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
   </properties>
 
   <dependencyManagement>
@@ -166,7 +168,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();
+  }
 }