Delete keychain support (#189)

Deprecated in #164 / 2023.4.0 (last release).

Author: gabrielfeo

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/DevelocityApiIntegrationTest.kt

@@ -15,7 +15,6 @@ class DevelocityApiIntegrationTest {
     @Test
     fun canFetchBuildsWithDefaultConfig() = runTest {
         env = RealEnv
-        keychain = realKeychain()
         val api = DevelocityApi.newInstance(
             config = Config(
                 cacheConfig = Config.CacheConfig(cacheEnabled = false)
@@ -33,7 +32,6 @@ class DevelocityApiIntegrationTest {
     @Test
     fun canBuildNewInstanceWithPureCodeConfiguration() = runTest {
         env = FakeEnv()
-        keychain = FakeKeychain()
         assertDoesNotThrow {
             val config = Config(
                 apiUrl = "https://google.com/api/",

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/extension/BuildsApiExtensionsIntegrationTest.kt

@@ -16,7 +16,6 @@ class BuildsApiExtensionsIntegrationTest {
 
     init {
         env = RealEnv
-        keychain = realKeychain()
     }
 
     private val recorder = RequestRecorder()

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/internal/KeychainIntegrationTest.kt

@@ -32,11 +32,12 @@ data class Config(
             ?: error("DEVELOCITY_API_URL is required"),
 
     /**
-     * Provides the access token for a Develocity API instance. By default, uses keychain entry
-     * `gradle-enterprise-api-token` or environment variable `DEVELOCITY_API_TOKEN`.
+     * Provides the access token for a Develocity API instance. By default, uses environment
+     * variable `DEVELOCITY_API_TOKEN`.
      */
     val apiToken: () -> String = {
-        requireEnvOrKeychainToken()
+        env["DEVELOCITY_API_TOKEN"]
+            ?: error("DEVELOCITY_API_TOKEN is required")
     },
 
     /**
@@ -194,14 +195,3 @@ data class Config(
                 ?: 1.days.inWholeSeconds,
     )
 }
-
-internal fun requireEnvOrKeychainToken(): String {
-    if (systemProperties["os.name"] == "Mac OS X") {
-        when (val result = keychain.get("gradle-enterprise-api-token")) {
-            is KeychainResult.Success -> return result.token
-            is KeychainResult.Error -> {}
-        }
-    }
-    return env["DEVELOCITY_API_TOKEN"]
-        ?: error("DEVELOCITY_API_TOKEN is required")
-}

library/src/main/kotlin/com/gabrielfeo/develocity/api/Config.kt

@@ -8,8 +8,6 @@ class CacheConfigTest {
     @BeforeTest
     fun before() {
         env = FakeEnv("DEVELOCITY_API_URL" to "https://example.com/api/")
-        systemProperties = FakeSystemProperties.macOs
-        keychain = FakeKeychain()
     }
 
     @Test

library/src/main/kotlin/com/gabrielfeo/develocity/api/internal/Keychain.kt

@@ -9,8 +9,6 @@ class ConfigTest {
     @BeforeTest
     fun before() {
         env = FakeEnv("DEVELOCITY_API_URL" to "https://example.com/api/")
-        systemProperties = FakeSystemProperties.macOs
-        keychain = FakeKeychain()
     }
 
     @Test
@@ -28,42 +26,16 @@ class ConfigTest {
     }
 
     @Test
-    fun `Given macOS and keychain token, keychain token used`() {
-        (env as FakeEnv)["DEVELOCITY_API_TOKEN"] = "bar"
-        keychain = FakeKeychain("gradle-enterprise-api-token" to "foo")
-        assertEquals("foo", Config().apiToken())
-    }
-
-    @Test
-    fun `Given macOS but no keychain token, env token used`() {
-        (env as FakeEnv)["DEVELOCITY_API_TOKEN"] = "bar"
-        assertEquals("bar", Config().apiToken())
-    }
-
-    @Test
-    fun `Given Linux, keychain never tried and env token used`() {
-        (env as FakeEnv)["DEVELOCITY_API_TOKEN"] = "bar"
-        keychain = object : Keychain {
-            override fun get(entry: String) =
-                error("Error: Tried to access macOS keychain in Linux")
-        }
-        systemProperties = FakeSystemProperties.linux
-        assertEquals("bar", Config().apiToken())
-    }
-
-    @Test
-    fun `Given macOS and no token anywhere, error`() {
+    fun `Given no token, error`() {
         assertFails {
             Config().apiToken()
         }
     }
 
     @Test
-    fun `Given Linux and no env token, fails`() {
-        systemProperties = FakeSystemProperties.linux
-        assertFails {
-            Config().apiToken()
-        }
+    fun `Given token set in env, apiToken is env token`() {
+        (env as FakeEnv)["DEVELOCITY_API_TOKEN"] = "bar"
+        assertEquals("bar", Config().apiToken())
     }
 
     @Test

library/src/test/kotlin/com/gabrielfeo/develocity/api/CacheConfigTest.kt

@@ -11,8 +11,6 @@ class DevelocityApiTest {
     @Test
     fun `Fails eagerly if no API URL`() {
         env = FakeEnv()
-        keychain = FakeKeychain()
-        systemProperties = FakeSystemProperties.linux
         val error = assertThrows<Exception> {
             DevelocityApi.newInstance(Config())
         }
@@ -22,8 +20,6 @@ class DevelocityApiTest {
     @Test
     fun `Fails lazily if no API token`() {
         env = FakeEnv("DEVELOCITY_API_URL" to "example-url")
-        keychain = FakeKeychain()
-        systemProperties = FakeSystemProperties.linux
         val api = assertDoesNotThrow {
             DevelocityApi.newInstance(Config())
         }

library/src/test/kotlin/com/gabrielfeo/develocity/api/ConfigTest.kt

@@ -1,7 +1,6 @@
 package com.gabrielfeo.develocity.api
 
 import com.gabrielfeo.develocity.api.internal.*
-import com.gabrielfeo.develocity.api.internal.FakeKeychain
 import com.gabrielfeo.develocity.api.internal.auth.HttpBearerAuth
 import com.gabrielfeo.develocity.api.internal.caching.CacheEnforcingInterceptor
 import com.gabrielfeo.develocity.api.internal.caching.CacheHitLoggingInterceptor
@@ -72,8 +71,6 @@ class OkHttpClientTest {
         if ("DEVELOCITY_API_URL" !in fakeEnv)
             fakeEnv["DEVELOCITY_API_URL"] = "example-url"
         env = fakeEnv
-        systemProperties = FakeSystemProperties.macOs
-        keychain = FakeKeychain()
         val config = when (clientBuilder) {
             null -> Config()
             else -> Config(clientBuilder = clientBuilder)

library/src/test/kotlin/com/gabrielfeo/develocity/api/DevelocityApiTest.kt

@@ -32,8 +32,6 @@ class RetrofitTest {
         if ("DEVELOCITY_API_TOKEN" !in fakeEnv)
             fakeEnv["DEVELOCITY_API_TOKEN"] = "example-token"
         env = fakeEnv
-        systemProperties = FakeSystemProperties.macOs
-        keychain = FakeKeychain()
         val config = Config()
         return buildRetrofit(
             config = config,