Fix

seratch · seratch · commit 980840b3651c · 2025-01-14T11:09:47.000+09:00
diff --git a/bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3InstallationService.java b/bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3InstallationService.java
@@ -51,7 +51,7 @@ public AmazonS3InstallationService(
     ) {
         this.bucketName = bucketName;
         this.credentialsProvider = credentialsProvider;
-        this.region = region != null ? region : Region.of(System.getenv("AWS_REGION"));
+        this.region = region != null || System.getenv("AWS_REGION") == null ? region : Region.of(System.getenv("AWS_REGION"));
         this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;
     }
 
diff --git a/bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3OAuthStateService.java b/bolt/src/main/java/com/slack/api/bolt/service/builtin/AmazonS3OAuthStateService.java
@@ -45,7 +45,7 @@ public AmazonS3OAuthStateService(
     ) {
         this.bucketName = bucketName;
         this.credentialsProvider = credentialsProvider;
-        this.region = region != null ? region : Region.of(System.getenv("AWS_REGION"));
+        this.region = region != null || System.getenv("AWS_REGION") == null ? region : Region.of(System.getenv("AWS_REGION"));
         this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public AmazonS3InstallationService(`
`51`	`51`	`) {`
`52`	`52`	`this.bucketName = bucketName;`
`53`	`53`	`this.credentialsProvider = credentialsProvider;`
`54`		`- this.region = region != null ? region : Region.of(System.getenv("AWS_REGION"));`
	`54`	`+ this.region = region != null \|\| System.getenv("AWS_REGION") == null ? region : Region.of(System.getenv("AWS_REGION"));`
`55`	`55`	`this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public AmazonS3OAuthStateService(`
`45`	`45`	`) {`
`46`	`46`	`this.bucketName = bucketName;`
`47`	`47`	`this.credentialsProvider = credentialsProvider;`
`48`		`- this.region = region != null ? region : Region.of(System.getenv("AWS_REGION"));`
	`48`	`+ this.region = region != null \|\| System.getenv("AWS_REGION") == null ? region : Region.of(System.getenv("AWS_REGION"));`
`49`	`49`	`this.endpointOverride = (endpointOverride != null && !endpointOverride.isEmpty()) ? URI.create(endpointOverride) : null;`
`50`	`50`	`}`
`51`	`51`