Skip to content

Commit d6f6cea

Browse files
committed
Fix: dockerFile, github action 코드 수정
1 parent 711c37b commit d6f6cea

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

.github/workflows/gradle.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ jobs:
3838
## create application-prod.properties
3939
- name: create application.yml
4040
run: |
41-
cd ./src/main
42-
cd ./resources
41+
mkdir -p ./src/main/resources
42+
cd ./src/main/resources
4343
touch ./application.yml
44-
ls *
4544
echo "${{ secrets.APPLICATION_YML }}" > ./application.yml
4645
4746
- name: Build with Gradle
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,50 @@
11
package acc.hotsix.file_share.global.config;
22

3+
import org.springframework.beans.factory.annotation.Value;
34
import org.springframework.context.annotation.Bean;
45
import org.springframework.context.annotation.Configuration;
5-
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
6+
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
7+
import software.amazon.awssdk.auth.credentials.AwsCredentials;
8+
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
9+
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
610
import software.amazon.awssdk.regions.Region;
711
import software.amazon.awssdk.services.s3.S3Client;
812
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
913

1014
@Configuration
1115
public class S3Config {
16+
17+
@Value("${cloud.aws.credentials.access-key}")
18+
private String accessKey;
19+
20+
@Value("${cloud.aws.credentials.secret-key}")
21+
private String secretKey;
22+
23+
@Value("${cloud.aws.region.static}")
24+
private String region;
25+
26+
// access, secret key 이용해 aws 자격증명 제공
27+
@Bean
28+
public AwsCredentialsProvider awsCredentialsProvider() {
29+
AwsCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
30+
return StaticCredentialsProvider.create(awsCredentials);
31+
}
32+
1233
// s3서비스를 이용하기 위한 S3Client 객체 생성
1334
@Bean
1435
public S3Client s3Client() {
1536
return S3Client.builder()
16-
.region(Region.AP_NORTHEAST_2)
17-
.credentialsProvider(DefaultCredentialsProvider.create())
37+
.region(Region.of(region))
38+
.credentialsProvider(awsCredentialsProvider())
1839
.build();
1940
}
2041

2142
// presignedURL 을 적용하기 위한 S3Presigner 객체 생성
2243
@Bean
2344
public S3Presigner s3Presigner() {
2445
return S3Presigner.builder()
25-
.region(Region.AP_NORTHEAST_2)
26-
.credentialsProvider(DefaultCredentialsProvider.create())
46+
.region(Region.of(region))
47+
.credentialsProvider(awsCredentialsProvider())
2748
.build();
2849
}
2950
}

0 commit comments

Comments
 (0)