Handle Lambda states on function update (#3139)

Author: rli

.changes/next-release/bugfix-5ef15664-57d0-4c27-bfd6-a210e236c6d2.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Handle Lambda pending states while updating function (#2984)"
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaUtils.kt

@@ -4,9 +4,11 @@
 package software.aws.toolkits.jetbrains.services.lambda
 
 import com.intellij.util.text.SemVer
+import software.amazon.awssdk.services.lambda.LambdaClient
 import software.aws.toolkits.core.lambda.LambdaArchitecture
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamExecutable
+import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
 
 fun LambdaRuntime.minSamDebuggingVersion(): SemVer =
     minSamDebugging?.let { SemVer.parseFromText(it) ?: throw IllegalStateException("$this has bad minSamDebuggingVersion! It should be a semver string!") }
@@ -19,3 +21,10 @@ fun LambdaRuntime.minSamInitVersion(): SemVer =
 fun LambdaArchitecture.minSamVersion(): SemVer =
     minSam?.let { SemVer.parseFromText(it) ?: throw IllegalStateException("$this has bad minSamInitVersion! It should be a semver string!") }
         ?: SamExecutable.minVersion
+
+fun LambdaClient.waitForUpdatableState(functionName: String) {
+    assertIsNonDispatchThread()
+    // wait until function is both active and not being updated
+    waiter().waitUntilFunctionActive { it.functionName(functionName) }
+    waiter().waitUntilFunctionUpdated { it.functionName(functionName) }
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/UpdateLambdaCode.kt

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.lambda.steps
 
 import software.amazon.awssdk.services.lambda.LambdaClient
 import software.aws.toolkits.jetbrains.services.lambda.steps.PackageLambda.Companion.UPLOADED_CODE_LOCATION
+import software.aws.toolkits.jetbrains.services.lambda.waitForUpdatableState
 import software.aws.toolkits.jetbrains.utils.execution.steps.Context
 import software.aws.toolkits.jetbrains.utils.execution.steps.Step
 import software.aws.toolkits.jetbrains.utils.execution.steps.StepEmitter
@@ -13,7 +14,9 @@ import software.aws.toolkits.resources.message
 class UpdateLambdaCode(private val lambdaClient: LambdaClient, private val functionName: String, private val updatedHandler: String?) : Step() {
     override val stepName = message("lambda.create.step.update_lambda")
 
-    override fun execute(context: Context, messageEmitter: StepEmitter, ignoreCancellation: Boolean) {
+    override fun execute(context: Context, stepEmitter: StepEmitter, ignoreCancellation: Boolean) {
+        stepEmitter.emitMessageLine(message("lambda.workflow.update_code.wait_for_updatable"), isError = false)
+        lambdaClient.waitForUpdatableState(functionName)
         lambdaClient.updateFunctionCode {
             it.functionName(functionName)
 
@@ -30,13 +33,15 @@ class UpdateLambdaCode(private val lambdaClient: LambdaClient, private val funct
         }
 
         updatedHandler?.let { _ ->
+            stepEmitter.emitMessageLine(message("lambda.workflow.update_code.wait_for_updatable"), isError = false)
+            lambdaClient.waitForUpdatableState(functionName)
             lambdaClient.updateFunctionConfiguration {
                 it.functionName(functionName)
                 it.handler(updatedHandler)
             }
         }
 
-        messageEmitter.emitMessage(message("lambda.workflow.update_code.wait_for_stable"), isError = false)
+        stepEmitter.emitMessageLine(message("lambda.workflow.update_code.wait_for_stable"), isError = false)
         lambdaClient.waiter().waitUntilFunctionUpdated { it.functionName(functionName) }
     }
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/UpdateFunctionConfigDialog.kt

@@ -16,6 +16,7 @@ import software.amazon.awssdk.services.lambda.model.Runtime
 import software.aws.toolkits.jetbrains.core.awsClient
 import software.aws.toolkits.jetbrains.core.help.HelpIds
 import software.aws.toolkits.jetbrains.services.lambda.LambdaFunction
+import software.aws.toolkits.jetbrains.services.lambda.waitForUpdatableState
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.LambdaPackageType
@@ -82,6 +83,7 @@ class UpdateFunctionConfigDialog(private val project: Project, private val initi
 
         ApplicationManager.getApplication().executeOnPooledThread {
             try {
+                lambdaClient.waitForUpdatableState(functionDetails.name)
                 lambdaClient.updateFunctionConfiguration(functionDetails)
 
                 notifyInfo(

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/steps/UpdateLambdaCodeTest.kt

@@ -17,6 +17,7 @@ import software.amazon.awssdk.services.lambda.LambdaClient
 import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationRequest
 import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationResponse
 import software.amazon.awssdk.services.lambda.model.LastUpdateStatus
+import software.amazon.awssdk.services.lambda.model.State
 import software.amazon.awssdk.services.lambda.model.UpdateFunctionCodeRequest
 import software.amazon.awssdk.services.lambda.model.UpdateFunctionCodeResponse
 import software.amazon.awssdk.services.lambda.model.UpdateFunctionConfigurationRequest
@@ -85,6 +86,7 @@ class UpdateLambdaCodeTest {
             on { updateFunctionCode(codeRequestCaptor.capture()) } doReturn UpdateFunctionCodeResponse.builder().build()
             on { updateFunctionConfiguration(configRequestCaptor.capture()) } doReturn UpdateFunctionConfigurationResponse.builder().build()
             on { getFunctionConfiguration(any<GetFunctionConfigurationRequest>()) } doReturn GetFunctionConfigurationResponse.builder()
+                .state(State.ACTIVE)
                 .lastUpdateStatus(LastUpdateStatus.SUCCESSFUL)
                 .build()
         }

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -809,6 +809,7 @@ lambda.workflow.create_new.name=Create new Lambda
 lambda.workflow.create_new.wait_for_stable=Waiting for function to be created
 lambda.workflow.update_code.name=Update Lambda code
 lambda.workflow.update_code.wait_for_stable=Waiting for function to stabilize
+lambda.workflow.update_code.wait_for_updatable=Waiting for function to transition to an updatable state
 loading_resource.failed=Failed loading resources
 loading_resource.loading=Loading...
 loading_resource.still_loading=Resources are still loading