refactor: Refactor data scratch-authorization (#1809)

Flank · Apr 15, 2021 · 458a12e · 458a12e
1 parent 6dbf8be
commit 458a12e
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 12 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/adapter/GoogleUserAuthorizationRequest.kt b/test_runner/src/main/kotlin/ftl/adapter/GoogleUserAuthorizationRequest.kt
@@ -0,0 +1,10 @@
+package ftl.adapter
+
+import ftl.adapter.google.UserAuth
+import ftl.data.UserAuthorization
+
+object GoogleUserAuthorizationRequest :
+    UserAuthorization.Request,
+    () -> Unit by {
+        UserAuth().request()
+    }
diff --git a/...src/main/kotlin/ftl/config/Credentials.kt → .../kotlin/ftl/adapter/google/Credentials.kt b/...src/main/kotlin/ftl/config/Credentials.kt → .../kotlin/ftl/adapter/google/Credentials.kt
@@ -1,4 +1,4 @@
-package ftl.config
+package ftl.adapter.google
 
 import com.google.api.client.http.GoogleApiLogger
 import com.google.api.client.http.HttpRequestInitializer
@@ -7,7 +7,7 @@ import com.google.auth.oauth2.GoogleCredentials
 import com.google.auth.oauth2.ServiceAccountCredentials
 import flank.common.defaultCredentialPath
 import flank.common.isWindows
-import ftl.gc.UserAuth
+import ftl.config.FtlConstants
 import ftl.http.HttpTimeoutIncrease
 import ftl.run.exception.FlankGeneralError
 import java.io.IOException

diff --git a/...runner/src/main/kotlin/ftl/gc/UserAuth.kt → ...ain/kotlin/ftl/adapter/google/UserAuth.kt b/...runner/src/main/kotlin/ftl/gc/UserAuth.kt → ...ain/kotlin/ftl/adapter/google/UserAuth.kt
@@ -1,4 +1,4 @@
-package ftl.gc
+package ftl.adapter.google
 
 import com.google.auth.oauth2.ClientId
 import com.google.auth.oauth2.MemoryTokensStorage
@@ -45,7 +45,7 @@ class UserAuth {
         }
 
         fun throwAuthenticationError(): Nothing {
-            Files.delete(userToken)
+            Files.deleteIfExists(userToken)
             throw FlankGeneralError(
                 "Could not load user authentication, please\n" +
                     " - login again using command: flank auth login\n" +

diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt
@@ -12,12 +12,12 @@ import com.google.cloud.storage.StorageOptions
 import flank.common.defaultCredentialPath
 import flank.common.isWindows
 import flank.common.logLn
+import ftl.adapter.google.credential
 import ftl.args.IArgs.Companion.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE
 import ftl.args.yml.YamlObjectMapper
 import ftl.config.FtlConstants.GCS_PREFIX
 import ftl.config.FtlConstants.JSON_FACTORY
 import ftl.config.FtlConstants.useMock
-import ftl.config.credential
 import ftl.gc.GcStorage
 import ftl.gc.GcToolResults
 import ftl.reports.xml.model.JUnitTestResult

diff --git a/test_runner/src/main/kotlin/ftl/data/UserAuthorization.kt b/test_runner/src/main/kotlin/ftl/data/UserAuthorization.kt
@@ -0,0 +1,9 @@
+package ftl.data
+
+import ftl.adapter.GoogleUserAuthorizationRequest
+
+val requestUserAuthorization: UserAuthorization.Request get() = GoogleUserAuthorizationRequest
+
+object UserAuthorization {
+    interface Request : () -> Unit
+}
diff --git a/test_runner/src/main/kotlin/ftl/domain/LoginGoogleAccount.kt b/test_runner/src/main/kotlin/ftl/domain/LoginGoogleAccount.kt
@@ -1,9 +1,9 @@
 package ftl.domain
 
-import ftl.gc.UserAuth
+import ftl.data.requestUserAuthorization
 
 interface LoginGoogleAccount
 
 operator fun LoginGoogleAccount.invoke() {
-    UserAuth().request()
+    requestUserAuthorization()
 }
diff --git a/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt b/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt
@@ -11,11 +11,11 @@ import com.google.cloud.storage.contrib.nio.testing.LocalStorageHelper
 import com.google.common.annotations.VisibleForTesting
 import flank.common.join
 import flank.common.logLn
+import ftl.adapter.google.credential
 import ftl.args.IArgs
 import ftl.config.FtlConstants
 import ftl.config.FtlConstants.GCS_PREFIX
 import ftl.config.FtlConstants.GCS_STORAGE_LINK
-import ftl.config.credential
 import ftl.json.MatrixMap
 import ftl.reports.xml.model.JUnitTestResult
 import ftl.reports.xml.parseAllSuitesXml

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcTesting.kt b/test_runner/src/main/kotlin/ftl/gc/GcTesting.kt
@@ -1,11 +1,11 @@
 package ftl.gc
 
 import com.google.testing.Testing
+import ftl.adapter.google.httpCredential
 import ftl.config.FtlConstants
 import ftl.config.FtlConstants.JSON_FACTORY
 import ftl.config.FtlConstants.applicationName
 import ftl.config.FtlConstants.httpTransport
-import ftl.config.httpCredential
 import ftl.http.executeWithRetry
 
 object GcTesting {

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt b/test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt
@@ -13,12 +13,13 @@ import com.google.testing.model.TestExecution
 import com.google.testing.model.ToolResultsExecution
 import com.google.testing.model.ToolResultsHistory
 import com.google.testing.model.ToolResultsStep
+import ftl.adapter.google.UserAuth
+import ftl.adapter.google.httpCredential
 import ftl.args.IArgs
 import ftl.config.FtlConstants
 import ftl.config.FtlConstants.JSON_FACTORY
 import ftl.config.FtlConstants.applicationName
 import ftl.config.FtlConstants.httpTransport
-import ftl.config.httpCredential
 import ftl.http.executeWithRetry
 import ftl.run.exception.FTLProjectError
 import ftl.run.exception.FailureToken

diff --git a/...er/src/test/kotlin/ftl/gc/UserAuthTest.kt → ...kotlin/ftl/adapter/google/UserAuthTest.kt b/...er/src/test/kotlin/ftl/gc/UserAuthTest.kt → ...kotlin/ftl/adapter/google/UserAuthTest.kt
@@ -1,7 +1,7 @@
-package ftl.gc
+package ftl.adapter.google
 
 import com.google.common.truth.Truth.assertThat
-import ftl.gc.UserAuth.Companion.userToken
+import ftl.adapter.google.UserAuth.Companion.userToken
 import ftl.run.exception.FlankGeneralError
 import ftl.test.util.TestHelper.getThrowable
 import io.mockk.every