@@ -7,8 +7,6 @@ import com.intellij.openapi.Disposable
77import com.intellij.openapi.application.ApplicationManager
88import com.intellij.openapi.components.service
99import com.intellij.openapi.project.Project
10- import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
11- import software.amazon.awssdk.services.codewhisperer.CodeWhispererClient
1210import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanRequest
1311import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanResponse
1412import software.amazon.awssdk.services.codewhisperer.model.GetCodeScanRequest
@@ -63,8 +61,6 @@ import software.aws.toolkits.telemetry.CodewhispererCompletionType
6361import software.aws.toolkits.telemetry.CodewhispererSuggestionState
6462import java.time.Instant
6563import java.util.concurrent.TimeUnit
66- import kotlin.reflect.KProperty0
67- import kotlin.reflect.jvm.isAccessible
6864
6965// TODO: move this file to package "/client"
7066// As the connection is project-level, we need to make this project-level too
@@ -284,17 +280,9 @@ interface CodeWhispererClientAdaptor : Disposable {
284280}
285281
286282open class CodeWhispererClientAdaptorImpl (override val project : Project ) : CodeWhispererClientAdaptor {
287- private val mySigv4Client by lazy { createUnmanagedSigv4Client() }
288-
289283 @Volatile
290284 private var myBearerClient: CodeWhispererRuntimeClient ? = null
291285
292- private val KProperty0 <* >.isLazyInitialized: Boolean
293- get() {
294- isAccessible = true
295- return (getDelegate() as Lazy <* >).isInitialized()
296- }
297-
298286 init {
299287 initClientUpdateListener()
300288 }
@@ -333,25 +321,13 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
333321 bearerClient().createUploadUrl(request)
334322
335323 override fun createCodeScan (request : CreateCodeScanRequest , isSigv4 : Boolean ): CreateCodeScanResponse =
336- if (isSigv4) {
337- mySigv4Client.createCodeScan(request)
338- } else {
339- bearerClient().startCodeAnalysis(request.transform()).transform()
340- }
324+ bearerClient().startCodeAnalysis(request.transform()).transform()
341325
342326 override fun getCodeScan (request : GetCodeScanRequest , isSigv4 : Boolean ): GetCodeScanResponse =
343- if (isSigv4) {
344- mySigv4Client.getCodeScan(request)
345- } else {
346- bearerClient().getCodeAnalysis(request.transform()).transform()
347- }
327+ bearerClient().getCodeAnalysis(request.transform()).transform()
348328
349329 override fun listCodeScanFindings (request : ListCodeScanFindingsRequest , isSigv4 : Boolean ): ListCodeScanFindingsResponse =
350- if (isSigv4) {
351- mySigv4Client.listCodeScanFindings(request)
352- } else {
353- bearerClient().listCodeAnalysisFindings(request.transform()).transform()
354- }
330+ bearerClient().listCodeAnalysisFindings(request.transform()).transform()
355331
356332 override fun startCodeFixJob (request : StartCodeFixJobRequest ): StartCodeFixJobResponse = bearerClient().startCodeFixJob(request)
357333
@@ -860,9 +836,6 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
860836 }
861837
862838 override fun dispose () {
863- if (this ::mySigv4Client.isLazyInitialized) {
864- mySigv4Client.close()
865- }
866839 myBearerClient?.close()
867840 }
868841
@@ -889,11 +862,6 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
889862
890863 companion object {
891864 private val LOG = getLogger<CodeWhispererClientAdaptorImpl >()
892- private fun createUnmanagedSigv4Client (): CodeWhispererClient = AwsClientManager .getInstance().createUnmanagedClient(
893- AnonymousCredentialsProvider .create(),
894- CodeWhispererConstants .Config .Sigv4ClientRegion ,
895- CodeWhispererConstants .Config .CODEWHISPERER_ENDPOINT
896- )
897865 }
898866}
899867
0 commit comments