Merge pull request #16 from tikurahul/main

Add the ability to construct a credential from a block
androidx · Apr 18, 2022 · a3aa146 · a3aa146
2 parents eb40b53 + 0c9850c
commit a3aa146
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpCredentials.kt b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpCredentials.kt
@@ -28,11 +28,16 @@ sealed interface GcpCredentials
 /**
  * Use Application Default to authenticate to Google Cloud Platform.
  */
-object ApplicationDefaultGcpCredentials: GcpCredentials
+object ApplicationDefaultGcpCredentials : GcpCredentials
 
 /**
  * Use Service Account to authenticate to Google Cloud Platform.
  *
- * @param pathToCredentials a file that stores the exported service account credentials.
+ * @param credentials a block which returns the exported service account credentials payload.
  */
-class ExportedKeyGcpCredentials(val pathToCredentials: File): GcpCredentials
+class ExportedKeyGcpCredentials(val credentials: () -> String) : GcpCredentials {
+    /**
+     * Builds an [ExportedKeyGcpCredentials] from a file containing the exported service account keys.
+     */
+    constructor(file: File) : this({ file.readText() })
+}
diff --git a/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt
@@ -155,12 +155,13 @@ internal class GcpStorageService(
                     GoogleCredentials.getApplicationDefault().createScoped(scopes)
                 }
                 is ExportedKeyGcpCredentials -> {
-                    val path = gcpCredentials.pathToCredentials
-                    if (!path.exists()) throw GradleException("Credentials path $path does not exist")
-                    if (!path.isFile) throw GradleException("Credentials path $path is not a file")
+                    val contents = gcpCredentials.credentials.invoke()
+                    if (contents.isBlank()) throw GradleException("Credentials are empty.")
                     // Use the underlying transport factory to ensure logging is disabled.
-                    GoogleCredentials.fromStream(path.inputStream(), transportOptions.httpTransportFactory)
-                        .createScoped(scopes)
+                    GoogleCredentials.fromStream(
+                        contents.byteInputStream(charset = Charsets.UTF_8),
+                        transportOptions.httpTransportFactory
+                    ).createScoped(scopes)
                 }
             }
         }