Skip to content

Commit 3003991

Browse files
authored
Fixup some places where we didn't refresh the explorer on create (#2078)
- Refresh on Lambda create - Refresh on CFN deploy (we don't know if it is a create or not, so refresh every time, this is probably better since while actively working with CFN the most updated view would be more useful) - Remove duplicate SamTelemetry.deploy. We need failure in SamDeployDialog but not success as it goes on to DeployServerlessApplicationAction to finish deploying
1 parent c9a79ca commit 3003991

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
2222
import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance
2323
import software.aws.toolkits.jetbrains.core.executables.ExecutableManager
2424
import software.aws.toolkits.jetbrains.core.executables.getExecutable
25+
import software.aws.toolkits.jetbrains.core.explorer.refreshAwsTree
2526
import software.aws.toolkits.jetbrains.services.cloudformation.describeStack
2627
import software.aws.toolkits.jetbrains.services.cloudformation.executeChangeSetAndWait
2728
import software.aws.toolkits.jetbrains.services.cloudformation.stack.StackWindowManager
@@ -142,6 +143,8 @@ class DeployServerlessApplicationAction : AnAction(
142143
project
143144
)
144145
SamTelemetry.deploy(project, Result.Succeeded)
146+
// Since we could update anything, do a full refresh of the resource cache and explorer
147+
project.refreshAwsTree()
145148
} catch (e: Exception) {
146149
e.notifyError(message("cloudformation.execute_change_set.failed", stackName), project)
147150
SamTelemetry.deploy(project, Result.Failed)

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,6 @@ class SamDeployDialog(
165165
doOKAction()
166166
}
167167
}
168-
169-
SamTelemetry.deploy(
170-
project = project,
171-
success = true,
172-
version = SamCommon.getVersionString()
173-
)
174168
}
175169

176170
private fun handleError(error: Throwable): String {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import software.amazon.awssdk.services.s3.S3Client
2222
import software.aws.toolkits.jetbrains.core.AwsClientManager
2323
import software.aws.toolkits.jetbrains.core.awsClient
2424
import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
25+
import software.aws.toolkits.jetbrains.core.explorer.refreshAwsTree
2526
import software.aws.toolkits.jetbrains.core.help.HelpIds
2627
import software.aws.toolkits.jetbrains.services.iam.CreateIamRoleDialog
2728
import software.aws.toolkits.jetbrains.services.iam.IamRole
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.lambda.LambdaFunction
3132
import software.aws.toolkits.jetbrains.services.lambda.LambdaHandlerResolver
3233
import software.aws.toolkits.jetbrains.services.lambda.LambdaLimits.DEFAULT_MEMORY_SIZE
3334
import software.aws.toolkits.jetbrains.services.lambda.LambdaLimits.DEFAULT_TIMEOUT
35+
import software.aws.toolkits.jetbrains.services.lambda.resources.LambdaResources
3436
import software.aws.toolkits.jetbrains.services.lambda.runtimeGroup
3537
import software.aws.toolkits.jetbrains.services.lambda.sam.SamOptions
3638
import software.aws.toolkits.jetbrains.services.lambda.upload.EditFunctionMode.NEW
@@ -245,6 +247,10 @@ class EditFunctionDialog(
245247
null -> {
246248
notifyInfo(title = NOTIFICATION_TITLE, content = message, project = project)
247249
LambdaTelemetry.editFunction(project, update = false, result = Result.Succeeded)
250+
// If we created a new lambda, clear the resource cache for LIST_FUNCTIONS
251+
if (mode == NEW) {
252+
project.refreshAwsTree(LambdaResources.LIST_FUNCTIONS)
253+
}
248254
}
249255
is Exception -> {
250256
error.notifyError(title = NOTIFICATION_TITLE)

0 commit comments

Comments
 (0)