Merge pull request #5 from localstack-samples/migrate-to-aws-endpoint-url

Migrate to AWS_ENDPOINT_URL

Author: tinyg210

shipment-picture-lambda-validator/src/main/java/dev/ancaghenade/shipmentpicturelambdavalidator/S3ClientHelper.java

@@ -7,15 +7,15 @@
 
 public class S3ClientHelper {
 
-  private static final String LOCALSTACK_HOSTNAME = System.getenv("LOCALSTACK_HOSTNAME");
+  private static final String AWS_ENDPOINT_URL = System.getenv("AWS_ENDPOINT_URL");
 
   public static S3Client getS3Client() throws IOException {
 
     var clientBuilder = S3Client.builder();
-    if (Objects.nonNull(LOCALSTACK_HOSTNAME)) {
+    if (Objects.nonNull(AWS_ENDPOINT_URL)) {
       return clientBuilder
           .region(Location.REGION.getRegion())
-          .endpointOverride(URI.create(String.format("http://%s:4566", LOCALSTACK_HOSTNAME)))
+          .endpointOverride(URI.create(AWS_ENDPOINT_URL))
           .forcePathStyle(true)
           .build();
     } else {

shipment-picture-lambda-validator/src/main/java/dev/ancaghenade/shipmentpicturelambdavalidator/SNSClientHelper.java

@@ -6,20 +6,20 @@
 
 public class SNSClientHelper {
 
-  private static final String LOCALSTACK_HOSTNAME = System.getenv("LOCALSTACK_HOSTNAME");
+  private static final String AWS_ENDPOINT_URL = System.getenv("AWS_ENDPOINT_URL");
   private static String snsTopicArn;
 
   public static SnsClient getSnsClient() {
 
     var clientBuilder = SnsClient.builder();
 
-    if (Objects.nonNull(LOCALSTACK_HOSTNAME)) {
+    if (Objects.nonNull(AWS_ENDPOINT_URL)) {
       snsTopicArn = String.format("arn:aws:sns:%s:000000000000:update_shipment_picture_topic",
           Location.REGION.getRegion());
 
       return clientBuilder
           .region(Location.REGION.getRegion())
-          .endpointOverride(URI.create(String.format("http://%s:4566", LOCALSTACK_HOSTNAME)))
+          .endpointOverride(URI.create(AWS_ENDPOINT_URL))
           .build();
     } else {
       snsTopicArn = String.format("arn:aws:sns:%s:%s:update_shipment_picture_topic",