Expand nested env vars. (#309)

Author: vkryachko

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/Environment.groovy

@@ -0,0 +1,35 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.gradle.plugins.ci
+
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+class Environment {
+    private static final Pattern ENV_PATTERN = Pattern.compile(/\$\(([A-Za-z0-9_-]+)\)/)
+
+    static String expand(String value) {
+        Matcher m = ENV_PATTERN.matcher(value)
+        while (m.find()) {
+            value = value.replace(m.group(), env(m.group(1)))
+        }
+        return value
+
+    }
+
+    private static String env(String varName) {
+        return Optional.ofNullable(System.getenv(varName)).orElse('')
+    }
+}

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.groovy

@@ -15,12 +15,14 @@
 package com.google.firebase.gradle.plugins.ci.device
 
 import com.android.builder.testing.api.TestServer
+import com.google.firebase.gradle.plugins.ci.Environment
+
 import java.nio.file.Paths
 import org.gradle.api.Project
 
 
 class FirebaseTestServer extends TestServer {
-    private static final String BUCKET_NAME = 'android-ci'
+    private static final String DEFAULT_BUCKET_NAME = 'android-ci'
     final Project project
     final FirebaseTestLabExtension extension
     final Random random
@@ -62,10 +64,10 @@ class FirebaseTestServer extends TestServer {
     }
 
     private List<String> getResultUploadArgs() {
-        Optional<String> resultsBucket = Optional.ofNullable(System.getenv('FTL_RESULTS_BUCKET'))
-        Optional<String> resultsDir = Optional.ofNullable(System.getenv('FTL_RESULTS_DIR'))
+        Optional<String> resultsBucket = Optional.ofNullable(System.getenv('FTL_RESULTS_BUCKET')).map(Environment.&expand)
+        Optional<String> resultsDir = Optional.ofNullable(System.getenv('FTL_RESULTS_DIR')).map(Environment.&expand)
 
-        List<String> args = ['--results-bucket', resultsBucket.orElse('android-ci')]
+        List<String> args = ['--results-bucket', resultsBucket.orElse(DEFAULT_BUCKET_NAME)]
         if (resultsDir.isPresent()) {
             args += ['--results-dir', Paths.get(resultsDir.get(), "${project.path}_${random.nextLong()}")]
         }