ETag fix

Author: samgst-amazon

plugins/core/core/src/software/aws/toolkits/core/utils/RemoteResourceResolver.kt

@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.core.utils
 
-import com.intellij.util.io.HttpRequests
 import java.io.FileInputStream
 import java.io.InputStream
 import java.nio.file.Files
@@ -126,13 +125,9 @@ class DefaultRemoteResourceResolver(
 
     private fun getEndpointETag(endpoint: String): String =
         try {
-            HttpRequests.head(endpoint)
-                .userAgent("AWS Toolkit for JetBrains")
-                .connect { request ->
-                    request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
-                }
+            urlFetcher.getETag(endpoint)
         } catch (e: Exception) {
-            LOG.warn { "Failed to fetch notification ETag: ${e.message}" }
+            LOG.warn(e) { "Failed to fetch ETag: $e.message" }
             throw e
         }
 
@@ -157,6 +152,7 @@ class DefaultRemoteResourceResolver(
 
 interface UrlFetcher {
     fun fetch(url: String, file: Path)
+    fun getETag(url: String): String
 }
 
 /**

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/DefaultRemoteResourceResolverProvider.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.core
 
 import com.intellij.openapi.application.PathManager
+import com.intellij.util.io.HttpRequests
 import com.intellij.util.io.createDirectories
 import software.aws.toolkits.core.utils.DefaultRemoteResourceResolver
 import software.aws.toolkits.core.utils.UrlFetcher
@@ -38,6 +39,13 @@ class DefaultRemoteResourceResolverProvider : RemoteResourceResolverProvider {
             override fun fetch(url: String, file: Path) {
                 saveFileFromUrl(url, file)
             }
+
+            override fun getETag(url: String): String =
+                HttpRequests.head(url)
+                    .userAgent("AWS Toolkit for JetBrains")
+                    .connect { request ->
+                        request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
+                    }
         }
     }
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

@@ -21,7 +21,6 @@ import software.aws.toolkits.jetbrains.utils.notifyStickyWithData
 import software.aws.toolkits.telemetry.Component
 import software.aws.toolkits.telemetry.Result
 import software.aws.toolkits.telemetry.ToolkitTelemetry
-import java.nio.file.Paths
 import java.util.concurrent.atomic.AtomicBoolean
 
 object NotificationMapperUtil {

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationResourceResolverTest.kt

@@ -5,10 +5,7 @@ package software.aws.toolkits.jetbrains.core.notifications
 
 import com.intellij.testFramework.ApplicationExtension
 import io.mockk.every
-import io.mockk.just
 import io.mockk.mockk
-import io.mockk.mockkConstructor
-import io.mockk.runs
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -17,8 +14,6 @@ import org.junit.jupiter.api.io.TempDir
 import software.aws.toolkits.core.utils.DefaultRemoteResourceResolver
 import software.aws.toolkits.core.utils.UpdateCheckResult
 import software.aws.toolkits.core.utils.UrlFetcher
-import java.net.HttpURLConnection
-import java.net.URL
 import java.nio.file.Path
 import java.util.concurrent.Callable
 import java.util.concurrent.CompletableFuture
@@ -45,39 +40,17 @@ class NotificationResourceResolverTest {
     fun `first poll with no ETag changes returns FirstPollCheck`() {
         NotificationEtagState.getInstance().etag = "same-etag"
         val expectedETag = "same-etag"
-        val mockConnection = mockk<HttpURLConnection> {
-            every { requestMethod = any() } just runs
-            every { setRequestProperty(any(), any()) } just runs
-            every { connect() } just runs
-            every { getHeaderField("ETag") } returns expectedETag
-            every { disconnect() } just runs
-        }
-
-        mockkConstructor(URL::class)
-        every { anyConstructed<URL>().openConnection() } returns mockConnection
+        every { urlFetcher.getETag(any()) } returns expectedETag
 
         val result = sut.checkForUpdates("http://notification.test", NotificationEtagState.getInstance())
         assertThat(result).isEqualTo(UpdateCheckResult.FirstPollCheck)
-
-        // Second call should not return FirstPollCheck
-        val secondResult = sut.checkForUpdates("http://notification.test", NotificationEtagState.getInstance())
-        assertThat(secondResult).isEqualTo(UpdateCheckResult.NoUpdates)
     }
 
     @Test
     fun `ETag changes returns HasUpdates`() {
         NotificationEtagState.getInstance().etag = "old-etag"
         val expectedETag = "new-etag"
-        val mockConnection = mockk<HttpURLConnection> {
-            every { requestMethod = any() } just runs
-            every { setRequestProperty(any(), any()) } just runs
-            every { connect() } just runs
-            every { getHeaderField("ETag") } returns expectedETag
-            every { disconnect() } just runs
-        }
-
-        mockkConstructor(URL::class)
-        every { anyConstructed<URL>().openConnection() } returns mockConnection
+        every { urlFetcher.getETag(any()) } returns expectedETag
 
         val result = sut.checkForUpdates("http://notification.test", NotificationEtagState.getInstance())
         assertThat(result).isEqualTo(UpdateCheckResult.HasUpdates)
@@ -87,16 +60,8 @@ class NotificationResourceResolverTest {
     fun `no ETag changes returns NoUpdates after first poll`() {
         NotificationEtagState.getInstance().etag = "same-etag"
         val expectedETag = "same-etag"
-        val mockConnection = mockk<HttpURLConnection> {
-            every { requestMethod = any() } just runs
-            every { setRequestProperty(any(), any()) } just runs
-            every { connect() } just runs
-            every { getHeaderField("ETag") } returns expectedETag
-            every { disconnect() } just runs
-        }
+        every { urlFetcher.getETag(any()) } returns expectedETag
 
-        mockkConstructor(URL::class)
-        every { anyConstructed<URL>().openConnection() } returns mockConnection
         // sets isFirstPoll to false
         val firstResult = sut.checkForUpdates("http://notification.test", NotificationEtagState.getInstance())
         assertThat(firstResult).isEqualTo(UpdateCheckResult.FirstPollCheck)