#86 Member Service seperate and connect

build.gradle

@@ -30,7 +30,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
 	implementation 'io.fabric8:kubernetes-client:6.12.1' // 최신 버전 확인
-	implementation 'mysql:mysql-connector-java:8.0.33'
 
 	implementation 'org.springframework.boot:spring-boot-starter-freemarker'
 	implementation 'org.springframework.boot:spring-boot-starter-security'

src/main/java/AIWA/McpBackend/provider/aws/api/dto/membercredential/MemberCredentialDTO.java → src/main/java/AIWA/McpBackend/provider/aws/api/dto/member/MemberCredentialDTO.java

@@ -1,9 +1,11 @@
-package AIWA.McpBackend.provider.aws.api.dto.membercredential;
+package AIWA.McpBackend.provider.aws.api.dto.member;
 
 import lombok.Data;
+import lombok.Getter;
 
 
 @Data
+@Getter
 public class MemberCredentialDTO {
     private String email;
     private String accessKey;

src/main/java/AIWA/McpBackend/provider/aws/api/dto/member/MemberDTO.java

@@ -0,0 +1,16 @@
+package AIWA.McpBackend.provider.aws.api.dto.member;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class MemberDTO {
+    private String accessKey;
+    private String secretKey;
+    // 다른 필드 추가 가능
+}

src/main/java/AIWA/McpBackend/service/aws/AwsResourceService.java

@@ -1,19 +1,22 @@
 package AIWA.McpBackend.service.aws;
 
-import AIWA.McpBackend.entity.member.Member;
 //import AIWA.McpBackend.service.kms.KmsService;
 import AIWA.McpBackend.provider.aws.api.dto.ec2.Ec2InstanceDTO;
 import AIWA.McpBackend.provider.aws.api.dto.eip.EipDto;
 import AIWA.McpBackend.provider.aws.api.dto.eni.NetworkInterfaceDto;
 import AIWA.McpBackend.provider.aws.api.dto.internetgateway.InternetGatewayDto;
+import AIWA.McpBackend.provider.aws.api.dto.member.MemberCredentialDTO;
+import AIWA.McpBackend.provider.aws.api.dto.member.MemberResponseDto;
 import AIWA.McpBackend.provider.aws.api.dto.natgateway.NatGatewayDto;
 import AIWA.McpBackend.provider.aws.api.dto.routetable.RouteDTO;
 import AIWA.McpBackend.provider.aws.api.dto.routetable.RouteTableResponseDto;
 import AIWA.McpBackend.provider.aws.api.dto.securitygroup.SecurityGroupDTO;
 import AIWA.McpBackend.provider.aws.api.dto.subnet.SubnetResponseDto;
 import AIWA.McpBackend.provider.aws.api.dto.vpc.VpcTotalResponseDto;
-import AIWA.McpBackend.service.member.MemberService;
 import lombok.RequiredArgsConstructor;
+import lombok.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -28,17 +31,22 @@
 @RequiredArgsConstructor
 public class AwsResourceService {
 
+    private final RestTemplate restTemplate;
+
     private Ec2Client ec2Client;
-    private final MemberService memberService;
 
     public void initializeClient(String email) {
         // 특정 멤버의 AWS 자격 증명 가져오기
-        Member member = memberService.getMemberByEmail(email);
+        MemberCredentialDTO memberCredentialDto = getMemberCredentials(email);
+
+        if (memberCredentialDto == null) {
+            throw new IllegalArgumentException("회원 정보를 찾을 수 없습니다.");
+        }
 
         // AWS 자격 증명 생성
         AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(
-                member.getAccess_key(),
-                member.getSecret_key()
+                memberCredentialDto.getAccessKey(),
+                memberCredentialDto.getSecretKey()
         );
 
         // EC2 클라이언트 생성
@@ -48,6 +56,23 @@ public void initializeClient(String email) {
                 .build();
     }
 
+    private MemberCredentialDTO getMemberCredentials(String email) {
+        String url = "http://" + "member-svc" + "/api/members/email/" + email; // 이메일을 URL 경로로 전달
+
+        try {
+            ResponseEntity<MemberCredentialDTO> response = restTemplate.getForEntity(url, MemberCredentialDTO.class);
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return response.getBody(); // 응답에서 데이터 추출
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            // 오류 처리
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     // EC2 Instances 가져오기
     public List<Ec2InstanceDTO> fetchEc2Instances(String userId) {
         initializeClient(userId);

src/main/java/AIWA/McpBackend/service/aws/s3/S3Service.java

@@ -17,67 +17,6 @@ public class S3Service {
     private final AmazonS3 s3Client;
     private final String bucketName = "aiwa-terraform";
 
-    public void createUserDirectory(String userId) {
-        String userPrefix = "users/" + userId + "/";
-        // 초기 main.tf 및 terraform.tfstate 파일을 업로드합니다
-        uploadInitialFiles(userPrefix);
-    }
-
-    private void uploadInitialFiles(String userPrefix) {
-        // 초기 main.tf 파일
-        String mainTfContent = """
-            variable "aws_access_key" {
-              description = "AWS Access Key"
-              type        = string
-            }
-
-            variable "aws_secret_key" {
-              description = "AWS Secret Key"
-              type        = string
-            }
-
-            provider "aws" {
-              region     = "ap-northeast-2"
-              access_key = var.aws_access_key  // 변수로 AWS Access Key 제공
-              secret_key = var.aws_secret_key  // 변수로 AWS Secret Key 제공
-            }
-            """;
-
-        s3Client.putObject(bucketName, userPrefix + "main.tf", mainTfContent);
-
-//        // 빈 상태 파일
-//        String emptyState = "{}";
-//        s3Client.putObject(bucketName, userPrefix + "terraform.tfstate", emptyState);
-    }
-
-    public void deleteUserDirectory(String userId) {
-        String userPrefix = "users/" + userId + "/";
-
-        // S3에서 해당 디렉터리(prefix)를 기준으로 모든 파일 목록을 가져옴
-        ListObjectsV2Request request = new ListObjectsV2Request().withBucketName(bucketName).withPrefix(userPrefix);
-        ListObjectsV2Result result;
-
-        // 모든 객체를 반복적으로 가져와 삭제
-        do {
-            result = s3Client.listObjectsV2(request);
-            for (S3ObjectSummary objectSummary : result.getObjectSummaries()) {
-                s3Client.deleteObject(bucketName, objectSummary.getKey());
-            }
-            request.setContinuationToken(result.getNextContinuationToken());
-        } while (result.isTruncated());  // 계속해서 모든 객체를 삭제할 때까지 반복
-    }
-
-
-    public void createTfvarsFile(String userId, String accessKey, String secretKey) {
-        String userPrefix = "users/" + userId + "/";
-        String tfvarsContent = String.format("""
-            aws_access_key = "%s"
-            aws_secret_key = "%s"
-            """, accessKey, secretKey);
-
-        s3Client.putObject(bucketName, userPrefix + "terraform.tfvars", tfvarsContent);
-    }
-
 
     /**
      * S3에서 특정 사용자 디렉토리 내 모든 파일 목록을 가져옵니다.