add default environment variables to container (including LOCALSTACK_API_KEY)

Author: whummer

Diff for: Makefile

@@ -1,6 +1,8 @@
 ADDITIONAL_MVN_ARGS ?= -DskipTests -q
 export AWS_DEFAULT_REGION ?= us-east-1
 export AWS_REGION ?= us-east-1
+export AWS_ACCESS_KEY_ID ?= test
+export AWS_SECRET_ACCESS_KEY ?= test
 export SERVICES ?= serverless,kinesis,sns,sqs,iam,cloudwatch,qldb
 
 usage:           ## Show this help
@@ -16,10 +18,10 @@ publish-maven:   ## Publish artifacts to Maven Central
 	ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS="-DskipTests -Pawssdkv1,awssdkv2" make build
 
 test-v1:
-	USE_SSL=1 mvn $(MVN_TEST_ARGS) -Pawssdkv1 -Dtest="cloud.localstack.awssdkv1.*Test" test
+	mvn $(MVN_TEST_ARGS) -Pawssdkv1 -Dtest="cloud.localstack.awssdkv1.*Test" test
 
 test-v2:
-	USE_SSL=1 mvn $(MVN_TEST_ARGS) -Pawssdkv2 -Dtest="cloud.localstack.awssdkv2.*Test" test
+	mvn $(MVN_TEST_ARGS) -Pawssdkv2 -Dtest="cloud.localstack.awssdkv2.*Test" test
 
 test:            ## Run Java/JUnit tests for AWS SDK v1 and v2
 	make test-v2

Diff for: src/main/java/cloud/localstack/Localstack.java

@@ -60,8 +60,7 @@ public class Localstack {
         CommonUtils.disableSslCertChecking();
     }
 
-    private Localstack() {
-    }
+    private Localstack() {}
 
     public void startup(LocalstackDockerConfiguration dockerConfiguration) {
         if (locked) {
@@ -70,12 +69,19 @@ public void startup(LocalstackDockerConfiguration dockerConfiguration) {
         locked = true;
         this.externalHostName = dockerConfiguration.getExternalHostName();
 
+        Map<String, String> environmentVariables = dockerConfiguration.getEnvironmentVariables();
+        environmentVariables = environmentVariables == null ? Collections.emptyMap() : environmentVariables;
+        environmentVariables = new HashMap<String, String>(environmentVariables);
+        // add default environment variables
+        Map<String, String> defaultEnvVars = getDefaultEnvironmentVariables();
+        environmentVariables.putAll(defaultEnvVars);
+
         try {
             localStackContainer = Container.createLocalstackContainer(dockerConfiguration.getExternalHostName(),
                     dockerConfiguration.isPullNewImage(), dockerConfiguration.isRandomizePorts(),
                     dockerConfiguration.getImageName(), dockerConfiguration.getImageTag(),
                     dockerConfiguration.getPortEdge(), dockerConfiguration.getPortElasticSearch(),
-                    dockerConfiguration.getEnvironmentVariables(), dockerConfiguration.getPortMappings(),
+                    environmentVariables, dockerConfiguration.getPortMappings(),
                     dockerConfiguration.getBindMounts(), dockerConfiguration.getPlatform());
             loadServiceToPortMap();
 
@@ -118,25 +124,38 @@ private void loadServiceToPortMap() {
         }
     }
 
+    private Map<String, String> getDefaultEnvironmentVariables() {
+        Map<String, String> result = new HashMap<String, String>();
+        addEnvVariableIfDefined(Constants.ENV_LOCALSTACK_API_KEY, result);
+        return result;
+    }
+
+    private void addEnvVariableIfDefined(String envVarName, Map<String, String> envVars) {
+        String value = System.getenv(envVarName);
+        if (value != null) {
+            envVars.put(envVarName, value);
+        }
+    }
+
     // TODO: this is now obsolete, as we're using a single edge port - remove!
     private void doLoadServiceToPortMap() {
         String localStackPortConfig = "";
         for (int i = 0; i < PYTHON_VERSIONS_FOLDERS.length; i++) {
             String filePath = String.format(PORT_CONFIG_FILENAME, PYTHON_VERSIONS_FOLDERS[i]);
 
             localStackPortConfig = localStackContainer.executeCommand(Arrays.asList("cat", filePath));
-            if(localStackPortConfig.contains("No such container")){
+            if (localStackPortConfig.contains("No such container")) {
                 localStackPortConfig = "";
                 continue;
-            }else if(localStackPortConfig.contains("No such file")){
+            } else if(localStackPortConfig.contains("No such file")) {
                 localStackPortConfig = "";
                 continue;
-            }else{
+            } else {
                 break;
             }
         }
 
-        if(localStackPortConfig.isEmpty()){
+        if (localStackPortConfig.isEmpty()) {
             throw new LocalstackDockerException("No config file found",new Exception());
         }