Addressing code review comments

Author: LokeshDogga13

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt

@@ -5,11 +5,11 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts
 
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.util.io.DigestUtil
-import com.intellij.util.io.HttpRequests
 import software.amazon.awssdk.utils.UserHomeDirectoryUtils
 import software.aws.toolkits.core.utils.exists
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.readText
+import software.aws.toolkits.jetbrains.core.getETagFromUrl
 import software.aws.toolkits.jetbrains.core.getTextFromUrl
 import software.aws.toolkits.jetbrains.core.saveFileFromUrl
 import software.aws.toolkits.jetbrains.services.amazonq.project.manifest.ManifestManager
@@ -97,12 +97,7 @@ class ManifestFetcher {
 
     private fun getManifestETagFromUrl() : String? {
         try {
-            val actualETag = HttpRequests.head(lspManifestUrl)
-
-                .userAgent("AWS Toolkit for JetBrains")
-                .connect { request ->
-                    request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
-                }
+            val actualETag = getETagFromUrl(lspManifestUrl)
             return actualETag.trim('"')
         }
         catch (e: Exception) {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/manifest/ManifestManager.kt

@@ -3,8 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.project.manifest
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.util.SystemInfo
@@ -18,10 +18,9 @@ class ManifestManager {
     val currentVersion = "0.1.32"
     val currentOs = getOs()
     private val arch = CpuArch.CURRENT
-    private val mapper = jacksonObjectMapper()
+    private val mapper = jacksonObjectMapper().apply { configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) }
 
     data class TargetContent(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("filename")
         val filename: String? = null,
         @JsonProperty("url")
@@ -33,7 +32,6 @@ class ManifestManager {
     )
 
     data class VersionTarget(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("platform")
         val platform: String? = null,
         @JsonProperty("arch")
@@ -42,38 +40,34 @@ class ManifestManager {
         val contents: List<TargetContent>? = emptyList(),
     )
 
-    data class RunTime(
-        @JsonIgnoreProperties(ignoreUnknown = true)
+    data class Runtime(
         @JsonProperty("name")
         val name: String? = null,
         @JsonProperty("version")
         val version: String? = null
     )
 
     data class Capabilities(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("name")
         val name: String? = null,
         @JsonProperty("version")
         val version: String? = null
     )
 
     data class Protocol(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("name")
         val name: String?= null,
         @JsonProperty("version")
         val version: String? = null
     )
 
     data class Version(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("serverVersion")
         val serverVersion: String? = null,
         @JsonProperty("isDelisted")
         val isDelisted: Boolean? = null,
         @JsonProperty("runtime")
-        val runtime: RunTime? = null,
+        val runtime: Runtime? = null,
         @JsonProperty("capabilities")
         val capabilities: List<Capabilities>? = emptyList(),
         @JsonProperty("protocol")
@@ -85,7 +79,6 @@ class ManifestManager {
     )
 
     data class Manifest(
-        @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("manifestSchemaVersion")
         val manifestSchemaVersion: String? = null,
         @JsonProperty("artifactId")

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

@@ -4,7 +4,6 @@
 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
@@ -41,11 +40,7 @@ class DefaultRemoteResourceResolverProvider : RemoteResourceResolverProvider {
             }
 
             override fun getETag(url: String): String =
-                HttpRequests.head(url)
-                    .userAgent("AWS Toolkit for JetBrains")
-                    .connect { request ->
-                        request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
-                    }
+                getETagFromUrl(url)
         }
     }
 }

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

@@ -24,3 +24,10 @@ fun writeJsonToUrl(url: String, jsonString: String, indicator: ProgressIndicator
             request.write(jsonString)
             request.readString(indicator)
         }
+
+fun getETagFromUrl(url: String) : String =
+    HttpRequests.head(url)
+        .userAgent("AWS Toolkit for JetBrains")
+        .connect { request ->
+            request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
+        }