tttol · tttol · Jan 29, 2024 · Jan 30, 2024 · Jan 30, 2024 · May 20, 2024
diff --git a/.aws-sam/build.toml b/.aws-sam/build.toml
@@ -0,0 +1,5 @@
+# This file is auto generated by SAM CLI build command
+
+[function_build_definitions]
+
+[layer_build_definitions]
diff --git a/app/Dockerfile b/app/Dockerfile
@@ -0,0 +1,16 @@
+FROM public.ecr.aws/sam/build-java17:1.108.0-20240123221230 as build-image
+WORKDIR "/task"
+COPY src src/
+COPY gradle gradle/
+COPY gradlew ./
+COPY gradlew.bat ./
+COPY build.gradle ./
+COPY settings.gradle ./
+RUN ./gradlew clean assemble
+
+FROM public.ecr.aws/docker/library/amazoncorretto:17.0.10-alpine3.19
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.1 /lambda-adapter /opt/extensions/lambda-adapter
+EXPOSE 8080
+WORKDIR /opt
+COPY --from=build-image /task/build/libs/mrls-2.0.0.jar /opt
+CMD ["java", "-jar", "mrls-2.0.0.jar"]
diff --git a/build.gradle → app/build.gradle b/build.gradle → app/build.gradle
@@ -1,11 +1,11 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.0.1'
+    id 'org.springframework.boot' version '3.2.2'
     id 'io.spring.dependency-management' version '1.1.0'
 }
 
 group = 'io.github.tttol'
-version = "1.1.6"
+version = "2.0.0"
 sourceCompatibility = '17'
 
 configurations {
@@ -32,3 +32,22 @@ dependencies {
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+// sourceSets {
+//     main {
+//         java {
+//             srcDirs = ['app/src/main/java']
+//             resources {
+//                 srcDirs = ['app/src/main/resources']
+//             }
+//         }
+//     }
+//     test {
+//         java {
+//             srcDirs = ['app/src/test/java']
+//             resources {
+//                 srcDirs = ['app/src/test/resources']
+//             }
+//         }
+//     }
+// }
diff --git a/gradle/wrapper/gradle-wrapper.jar → app/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → app/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → app/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew → app/gradlew b/gradlew → app/gradlew
diff --git a/gradlew.bat → app/gradlew.bat b/gradlew.bat → app/gradlew.bat
diff --git a/settings.gradle → app/settings.gradle b/settings.gradle → app/settings.gradle
diff --git a/...io/github/tttol/mrls/MrlsApplication.java → ...io/github/tttol/mrls/MrlsApplication.java b/...io/github/tttol/mrls/MrlsApplication.java → ...io/github/tttol/mrls/MrlsApplication.java
diff --git a/...tttol/mrls/config/RestTemplateConfig.java → ...tttol/mrls/config/RestTemplateConfig.java b/...tttol/mrls/config/RestTemplateConfig.java → ...tttol/mrls/config/RestTemplateConfig.java
diff --git a/...tol/mrls/controller/MrListController.java → ...tol/mrls/controller/MrListController.java b/...tol/mrls/controller/MrListController.java → ...tol/mrls/controller/MrListController.java
diff --git a/app/src/main/java/io/github/tttol/mrls/controller/TopController.java b/app/src/main/java/io/github/tttol/mrls/controller/TopController.java
@@ -0,0 +1,17 @@
+package io.github.tttol.mrls.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequestMapping("/")
+@RequiredArgsConstructor
+public class TopController {
+    @GetMapping
+    public String top() {
+        return "top";
+    }
+}
diff --git a/...dto/GitLabMergeRequestApiResponseDto.java → ...dto/GitLabMergeRequestApiResponseDto.java b/...dto/GitLabMergeRequestApiResponseDto.java → ...dto/GitLabMergeRequestApiResponseDto.java
diff --git a/...ava/io/github/tttol/mrls/dto/UserDto.java → ...ava/io/github/tttol/mrls/dto/UserDto.java b/...ava/io/github/tttol/mrls/dto/UserDto.java → ...ava/io/github/tttol/mrls/dto/UserDto.java
diff --git a/...ol/mrls/exception/GitLabApiException.java → ...ol/mrls/exception/GitLabApiException.java b/...ol/mrls/exception/GitLabApiException.java → ...ol/mrls/exception/GitLabApiException.java
diff --git a/...ttol/mrls/external/GitLabApiExecutor.java → ...ttol/mrls/external/GitLabApiExecutor.java b/...ttol/mrls/external/GitLabApiExecutor.java → ...ttol/mrls/external/GitLabApiExecutor.java
diff --git a/.../github/tttol/mrls/form/MrDetailForm.java → .../github/tttol/mrls/form/MrDetailForm.java b/.../github/tttol/mrls/form/MrDetailForm.java → .../github/tttol/mrls/form/MrDetailForm.java
diff --git a/...io/github/tttol/mrls/form/MrInfoForm.java → ...io/github/tttol/mrls/form/MrInfoForm.java b/...io/github/tttol/mrls/form/MrInfoForm.java → ...io/github/tttol/mrls/form/MrInfoForm.java
diff --git a/...a/io/github/tttol/mrls/form/UserForm.java → ...a/io/github/tttol/mrls/form/UserForm.java b/...a/io/github/tttol/mrls/form/UserForm.java → ...a/io/github/tttol/mrls/form/UserForm.java
diff --git a/...tol/mrls/handler/ApiExceptionHandler.java → ...tol/mrls/handler/ApiExceptionHandler.java b/...tol/mrls/handler/ApiExceptionHandler.java → ...tol/mrls/handler/ApiExceptionHandler.java
diff --git a/...tol/mrls/service/MergeRequestService.java → ...tol/mrls/service/MergeRequestService.java b/...tol/mrls/service/MergeRequestService.java → ...tol/mrls/service/MergeRequestService.java
diff --git a/src/main/resources/application-env.yml → app/src/main/resources/application-env.yml b/src/main/resources/application-env.yml → app/src/main/resources/application-env.yml
diff --git a/src/main/resources/application.yml → app/src/main/resources/application.yml b/src/main/resources/application.yml → app/src/main/resources/application.yml
@@ -1,9 +1,11 @@
+server:
+  port: 8081
 app:
   gitlab:
-    host: ${GITLAB_HOST}
+    host: host
     project:
-      id: ${GITLAB_PROJECT_ID}
-      accessToken: ${GITLAB_ACCESS_TOKEN}
+      id: id
+      accessToken: token
     api:
       endpoint: https://${app.gitlab.host}/api/v4/projects/${app.gitlab.project.id}/merge_requests?state=opened
 logging:

diff --git a/src/main/resources/static/css/list.css → app/src/main/resources/static/css/list.css b/src/main/resources/static/css/list.css → app/src/main/resources/static/css/list.css
diff --git a/...main/resources/static/img/page-sample.png → ...main/resources/static/img/page-sample.png b/...main/resources/static/img/page-sample.png → ...main/resources/static/img/page-sample.png
diff --git a/src/main/resources/templates/apiError.html → ...rc/main/resources/templates/apiError.html b/src/main/resources/templates/apiError.html → ...rc/main/resources/templates/apiError.html
diff --git a/.../resources/templates/fragment/footer.html → .../resources/templates/fragment/footer.html b/.../resources/templates/fragment/footer.html → .../resources/templates/fragment/footer.html
diff --git a/.../resources/templates/fragment/header.html → .../resources/templates/fragment/header.html b/.../resources/templates/fragment/header.html → .../resources/templates/fragment/header.html
diff --git a/src/main/resources/templates/list.html → app/src/main/resources/templates/list.html b/src/main/resources/templates/list.html → app/src/main/resources/templates/list.html
@@ -83,7 +83,7 @@
                     </td>
                 </tr>
             </table>
-            <div class="appVer">1.1.7</div>
+            <div class="appVer">2.0.0</div>
         </main>
         <!--        <div th:replace="fragment/footer::footer"></div>-->
     </body>

diff --git a/app/src/main/resources/templates/top.html b/app/src/main/resources/templates/top.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>MRLS</title>
+        <link rel="icon"
+              href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text x=%2250%%22 y=%2250%%22 style=%22dominant-baseline:central;text-anchor:middle;font-size:90px;%22>😎</text></svg>">
+    </head>
+    <body>
+        <h1>Hello MRLS</h1>
+    </body>
+</html>
diff --git a/...thub/tttol/mrls/MrlsApplicationTests.java → ...thub/tttol/mrls/MrlsApplicationTests.java b/...thub/tttol/mrls/MrlsApplicationTests.java → ...thub/tttol/mrls/MrlsApplicationTests.java
diff --git a/...mrls/controller/MrListControllerTest.java → ...mrls/controller/MrListControllerTest.java b/...mrls/controller/MrListControllerTest.java → ...mrls/controller/MrListControllerTest.java
diff --git a/...mrls/service/MergeRequestServiceTest.java → ...mrls/service/MergeRequestServiceTest.java b/...mrls/service/MergeRequestServiceTest.java → ...mrls/service/MergeRequestServiceTest.java
diff --git a/template.yml b/template.yml
@@ -0,0 +1,75 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  mrls in AWS Lambda
+Globals:
+  Function:
+    Timeout: 10
+
+Resources:
+  MrlsFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      PackageType: Image
+      MemorySize: 2048
+      Tracing: Active
+      Environment:
+        Variables:
+          RUST_LOG: info
+          READINESS_CHECK_PATH: /healthz
+          REMOVE_BASE_PATH: /v1
+      AutoPublishAlias: live
+      DeploymentPreference:
+        Type: AllAtOnce
+      ProvisionedConcurrencyConfig:
+        ProvisionedConcurrentExecutions: 1
+      Events:
+        Root:
+          Type: HttpApi
+          Properties:
+            Path: /v1
+            Method: ANY
+        Mrls:
+          Type: HttpApi
+          Properties:
+            Path: /v1/{proxy+}
+            Method: ANY
+    # Metadata:
+    #   DockerTag: java17.gradle-v1
+    #   DockerContext: ./app
+    #   Dockerfile: Dockerfile
+
+  MyScalableTarget:
+    Type: AWS::ApplicationAutoScaling::ScalableTarget
+    Properties:
+      MaxCapacity: 100
+      MinCapacity: 1
+      ResourceId: !Sub function:${MrlsFunction}:live # You need to specify an alis or version here
+      RoleARN: !Sub arn:aws:iam::${AWS::AccountId}:role/aws-service-role/lambda.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_LambdaConcurrency
+      ScalableDimension: lambda:function:ProvisionedConcurrency
+      ServiceNamespace: lambda
+    DependsOn: MrlsFunctionAliaslive # This is your function logical ID + "Alias" + what you use for AutoPublishAlias
+
+  MyTargetTrackingScalingPolicy:
+    Type: AWS::ApplicationAutoScaling::ScalingPolicy
+    Properties:
+      PolicyName: utilization
+      PolicyType: TargetTrackingScaling
+      ScalingTargetId: !Ref MyScalableTarget
+      TargetTrackingScalingPolicyConfiguration:
+        TargetValue: 0.70 # Any value between 0 and 1 can be used here
+        CustomizedMetricSpecification:
+          Dimensions:
+            - Name: FunctionName
+              Value: !Ref MrlsFunction
+            - Name: Resource
+              Value: !Sub "${MrlsFunction}:live"
+          MetricName: ProvisionedConcurrencyUtilization
+          Namespace: AWS/Lambda
+          Statistic: Maximum
+          Unit: Count
+
+Outputs:
+  MrlsApi:
+    Description: "API Gateway endpoint URL for Prod stage for Mrls function"
+    Value: !Sub "https://${ServerlessHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/v1/mrls"
diff --git a/version.properties b/version.properties