From 458a12ed4a7b364f481101a749fbf0f7a408c8e8 Mon Sep 17 00:00:00 2001 From: piotradamczyk5 <65554637+piotradamczyk5@users.noreply.github.com> Date: Thu, 15 Apr 2021 15:34:00 +0200 Subject: [PATCH] refactor: Refactor data scratch-authorization (#1809) --- .../ftl/adapter/GoogleUserAuthorizationRequest.kt | 10 ++++++++++ .../ftl/{config => adapter/google}/Credentials.kt | 4 ++-- .../main/kotlin/ftl/{gc => adapter/google}/UserAuth.kt | 4 ++-- test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt | 2 +- .../src/main/kotlin/ftl/data/UserAuthorization.kt | 9 +++++++++ .../src/main/kotlin/ftl/domain/LoginGoogleAccount.kt | 4 ++-- test_runner/src/main/kotlin/ftl/gc/GcStorage.kt | 2 +- test_runner/src/main/kotlin/ftl/gc/GcTesting.kt | 2 +- test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt | 3 ++- .../kotlin/ftl/{gc => adapter/google}/UserAuthTest.kt | 4 ++-- 10 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 test_runner/src/main/kotlin/ftl/adapter/GoogleUserAuthorizationRequest.kt rename test_runner/src/main/kotlin/ftl/{config => adapter/google}/Credentials.kt (97%) rename test_runner/src/main/kotlin/ftl/{gc => adapter/google}/UserAuth.kt (98%) create mode 100644 test_runner/src/main/kotlin/ftl/data/UserAuthorization.kt rename test_runner/src/test/kotlin/ftl/{gc => adapter/google}/UserAuthTest.kt (92%) diff --git a/test_runner/src/main/kotlin/ftl/adapter/GoogleUserAuthorizationRequest.kt b/test_runner/src/main/kotlin/ftl/adapter/GoogleUserAuthorizationRequest.kt new file mode 100644 index 0000000000..9e5fc6dbfd --- /dev/null +++ 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/test_runner/src/main/kotlin/ftl/config/Credentials.kt b/test_runner/src/main/kotlin/ftl/adapter/google/Credentials.kt similarity index 97% rename from test_runner/src/main/kotlin/ftl/config/Credentials.kt rename to test_runner/src/main/kotlin/ftl/adapter/google/Credentials.kt index f4f299cc44..4ef70a1cdf 100644 --- a/test_runner/src/main/kotlin/ftl/config/Credentials.kt +++ b/test_runner/src/main/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/test_runner/src/main/kotlin/ftl/gc/UserAuth.kt b/test_runner/src/main/kotlin/ftl/adapter/google/UserAuth.kt similarity index 98% rename from test_runner/src/main/kotlin/ftl/gc/UserAuth.kt rename to test_runner/src/main/kotlin/ftl/adapter/google/UserAuth.kt index 4c45462e72..31e59edb66 100644 --- a/test_runner/src/main/kotlin/ftl/gc/UserAuth.kt +++ b/test_runner/src/main/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 index 20544aca1c..da642081cc 100644 --- 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 new file mode 100644 index 0000000000..83ef8c615c --- /dev/null +++ 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 index 4075fb07df..59b6e3df20 100644 --- 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 index 4c1c5d9da1..e10de47e78 100644 --- 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 index e19610420b..e2b8b5398f 100644 --- 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 index 74806d9459..6b691a566c 100644 --- 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/test_runner/src/test/kotlin/ftl/gc/UserAuthTest.kt b/test_runner/src/test/kotlin/ftl/adapter/google/UserAuthTest.kt similarity index 92% rename from test_runner/src/test/kotlin/ftl/gc/UserAuthTest.kt rename to test_runner/src/test/kotlin/ftl/adapter/google/UserAuthTest.kt index 270f949035..afb01fab20 100644 --- a/test_runner/src/test/kotlin/ftl/gc/UserAuthTest.kt +++ b/test_runner/src/test/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