Staging

.github/workflows/Prod.yml

@@ -75,25 +75,6 @@ jobs:
         run: |
           docker push ${{ secrets.ECR_REGISTRY }}/prod:latest
 
-  deploy:
-    needs: build-and-push
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Deploy on Staging Server
-        uses: appleboy/ssh-action@v0.1.10
-        with:
-          host: ${{ secrets.AWS_STAGING }}
-          username: ${{ secrets.AWS_SSH_USERNAME }}
-          key: ${{ secrets.AWS_SSH_KEY }}
-          script_stop: true
-          script: |
-            cd /app
-            password=$(aws ecr get-login-password --region ${{ env.REGION }})
-            docker login --username AWS --password $password ${{ secrets.ECR_REGISTRY }}
-            docker-compose pull
-            docker-compose up -d
-
 #  notification:
 #    needs: deploy
 #    runs-on: ubuntu-latest

.gitignore

@@ -36,4 +36,4 @@ out/
 
 ### VS Code ###
 .vscode/
-http/*
+http/*

src/main/java/com/kumofactory/cloud/appDeploy/AppDeployController.java

@@ -74,10 +74,18 @@ public Flux<ServerSentEvent<String>> getBuildStatus(@PathVariable("instanceId")
         return buildRequestService.getBuildStatus(instanceId);
     }
 
-    @PostMapping("/deployAsync/v2")
-    @AuthorizationFromToken
-    public ResponseEntity<String> deployRequestAsyncV2(@RequestBody BuildRequestDto request, String userId) {
-        CompletableFuture.runAsync(() -> buildRequestService.RequestBuildAsync2(request, userId));
-        return ResponseEntity.ok("Request Delivered");
-    }
+	@PostMapping("/deployAsync/v2")
+	@AuthorizationFromToken
+	public ResponseEntity<String> deployRequestAsyncV2(@RequestBody BuildRequestDto request, String userId) {
+		CompletableFuture.runAsync(() -> buildRequestService.RequestBuildAsync2(request, userId));
+		return ResponseEntity.ok("Request Delivered");
+	}
+
+	@GetMapping("/info")
+	@AuthorizationFromToken
+	public ResponseEntity<String> instanceInfo(@RequestParam("instanceId") String instanceId, String userId) {
+
+		return ResponseEntity.ok(buildRequestService.getInstanceInfo(instanceId));
+	}
+
 }

src/main/java/com/kumofactory/cloud/appDeploy/domain/BuildLog.java

@@ -17,4 +17,4 @@ public class BuildLog {
     private String repository;
     private String branch;
     private Object logs;
-}
+}

src/main/java/com/kumofactory/cloud/appDeploy/dto/GitHubRepoDto.java

@@ -9,9 +9,18 @@ public record RepoInfoDto(
             @JsonProperty("name") String name,
             @JsonProperty("fullName") String fullName,
             @JsonProperty("private") Boolean isPrivate,
-            @JsonProperty("fork") Boolean isFork
-    ) {
-    }
+            @JsonProperty("fork") Boolean isFork,
+            @JsonProperty("forksCount") Integer forksCount,
+            @JsonProperty("description") String description,
+            @JsonProperty("language") String language,
+            @JsonProperty("stargazersUrl") String stargazersUrl,
+            @JsonProperty("starCount") Integer starCount,
+            @JsonProperty("openIssuesCount") Integer openIssuesCount,
+            @JsonProperty("visibility") String visibility,
+            @JsonProperty("updatedAt") String updatedAt,
+            @JsonProperty("createdAt") String createdAt
+
+    ) { }
 
     public record UserDto(
 //            @JsonProperty("personal_repo_count") Integer personalRepoCount,

src/main/java/com/kumofactory/cloud/appDeploy/service/BuildRequestService.java

@@ -13,7 +13,7 @@ public interface BuildRequestService {
 
     Flux<ServerSentEvent<String>> RequestBuildAsync(BuildRequestDto request, String oauthId);
 
-    void RequestBuildAsync2(BuildRequestDto request, String oauthId);
+	Flux<ServerSentEvent<String>> getBuildStatus(String instanceId);
+	String getInstanceInfo(String instanceId);
 
-    Flux<ServerSentEvent<String>> getBuildStatus(String instanceId);
 }