Update Sync Serverless Application (#3548)

* new changes

* no watch flag added

* removed sams ync from experiment

* added changelog

* feedback changes

* updated message

* detekt

* detekt changes

* removed code only paramter from tests

* fixed tests

* extra space added

Author: manodnyab

.changes/next-release/breaking-2d47a157-abf9-4f75-a62d-c8cb09a5ac38.json

@@ -0,0 +1,4 @@
+{
+  "type" : "breaking",
+  "description" : "Required SAM CLI upgrade to v1.78.0 to for using Sync Serverless Application option."
+}

jetbrains-core/resources/META-INF/plugin.xml

@@ -390,8 +390,6 @@ with what features/services are supported.
         <!-- Experiments -->
         <experiment implementation="software.aws.toolkits.jetbrains.services.ecs.EcsExecExperiment"/>
         <experiment implementation="software.aws.toolkits.jetbrains.services.dynamic.JsonResourceModificationExperiment"/>
-        <experiment implementation="software.aws.toolkits.jetbrains.services.lambda.sam.sync.SyncServerlessApplicationExperiment"/>
-        <experiment implementation="software.aws.toolkits.jetbrains.services.lambda.sam.sync.SyncServerlessApplicationCodeExperiment"/>
 
         <tool implementation="software.aws.toolkits.jetbrains.services.ssm.SsmPlugin"/>
 
@@ -615,7 +613,7 @@ with what features/services are supported.
         <action class="software.aws.toolkits.jetbrains.core.credentials.ConfigureAwsConnectionAction" id="aws.settings.selector" icon="AwsIcons.Logos.AWS"/>
         <action class="software.aws.toolkits.jetbrains.core.credentials.CreateOrUpdateCredentialProfilesAction" id="aws.settings.upsertCredentials" icon="AwsIcons.Logos.AWS"/>
         <action class="software.aws.toolkits.jetbrains.services.lambda.actions.DeployServerlessApplicationAction" id="serverless.application.deploy" />
-        <action class="software.aws.toolkits.jetbrains.services.lambda.actions.SyncServerlessApplicationCodeAction" id="serverless.sync.code"/>
+
         <action class="software.aws.toolkits.jetbrains.services.lambda.actions.SyncServerlessApplicationAction" id="serverless.sync.infra"/>
         <action class="software.aws.toolkits.jetbrains.services.lambda.actions.SyncServerlessAppAction" id="serverless.sync.app"/>
         <action class="software.aws.toolkits.jetbrains.settings.ShowSettingsAction" id="aws.settings.show" icon="AllIcons.General.Settings"/>
@@ -631,11 +629,8 @@ with what features/services are supported.
             <add-to-group group-id="EditorPopupMenu" anchor="last"/>
             <add-to-group group-id="EditorTabPopupMenu" anchor="last"/>
 
-            <separator/>
-            <reference id="serverless.application.deploy"/>
             <separator/>
             <reference id="serverless.sync.infra"/>
-            <reference id="serverless.sync.code"/>
             <separator/>
         </group>
 

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

@@ -16,27 +16,22 @@ import icons.AwsIcons
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient
-import software.aws.toolkits.jetbrains.ToolkitPlaces
 import software.aws.toolkits.jetbrains.core.awsClient
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineUiContext
 import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance
 import software.aws.toolkits.jetbrains.core.executables.ExecutableManager
 import software.aws.toolkits.jetbrains.core.executables.getExecutable
-import software.aws.toolkits.jetbrains.core.experiments.isEnabled
 import software.aws.toolkits.jetbrains.core.explorer.refreshAwsTree
 import software.aws.toolkits.jetbrains.services.cloudformation.describeStack
 import software.aws.toolkits.jetbrains.services.cloudformation.executeChangeSetAndWait
 import software.aws.toolkits.jetbrains.services.cloudformation.stack.StackWindowManager
-import software.aws.toolkits.jetbrains.services.lambda.LambdaHandlerResolver
 import software.aws.toolkits.jetbrains.services.lambda.deploy.DeployServerlessApplicationDialog
 import software.aws.toolkits.jetbrains.services.lambda.deploy.DeployServerlessApplicationSettings
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamCommon
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamExecutable
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamTemplateFileUtils
-import software.aws.toolkits.jetbrains.services.lambda.sam.SamTemplateFileUtils.getSamTemplateFile
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamTemplateFileUtils.validateTemplateFile
-import software.aws.toolkits.jetbrains.services.lambda.sam.sync.SyncServerlessApplicationExperiment
 import software.aws.toolkits.jetbrains.services.lambda.steps.DeployLambda
 import software.aws.toolkits.jetbrains.services.lambda.steps.createDeployWorkflow
 import software.aws.toolkits.jetbrains.services.lambda.upload.UploadFunctionContinueDialog
@@ -187,18 +182,7 @@ class DeployServerlessApplicationAction : AnAction(
     override fun update(e: AnActionEvent) {
         super.update(e)
 
-        e.presentation.isVisible = if (!SyncServerlessApplicationExperiment.isEnabled()) {
-            // If there are no supported runtime groups, it will never succeed so don't show it
-            if (LambdaHandlerResolver.supportedRuntimeGroups().isEmpty()) {
-                false
-            } else {
-                if (e.place == ToolkitPlaces.EXPLORER_TOOL_WINDOW) {
-                    true
-                } else {
-                    getSamTemplateFile(e) != null
-                }
-            }
-        } else false
+        e.presentation.isVisible = false
     }
 
     private fun saveSettings(project: Project, templateFile: VirtualFile, settings: DeployServerlessApplicationSettings) {

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

@@ -23,6 +23,8 @@ import com.intellij.util.text.SemVer
 import icons.AwsIcons
 import software.amazon.awssdk.services.cloudformation.model.StackSummary
 import software.amazon.awssdk.services.lambda.model.PackageType
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.getConnectionSettingsOrThrow
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance
@@ -52,7 +54,7 @@ import software.aws.toolkits.telemetry.Result
 import software.aws.toolkits.telemetry.SamTelemetry
 import software.aws.toolkits.telemetry.SyncedResources
 
-class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
+class SyncServerlessAppAction : AnAction(
     message("serverless.application.sync"),
     null,
     AwsIcons.Resources.SERVERLESS_APP
@@ -75,8 +77,8 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
             }
 
             val execVersion = SemVer.parseFromText(samExecutable.version) ?: error("SAM CLI version could not detected")
-            val minVersion = SemVer("1.53.0", 1, 53, 0)
-            val minVersionForUseContainer = SemVer("1.57.0", 1, 57, 0)
+            val minVersion = SemVer("1.78.0", 1, 78, 0)
+
             if (!execVersion.isGreaterOrEqualThan(minVersion)) {
                 notifyError(
                     message("sam.cli.version.warning"),
@@ -99,7 +101,7 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
             val templateFunctions = SamTemplateUtils.findFunctionsFromTemplate(project, templateFile)
             val hasImageFunctions: Boolean = templateFunctions.any { (it as? SamFunction)?.packageType() == PackageType.IMAGE }
             val lambdaType = if (hasImageFunctions) LambdaPackageType.Image else LambdaPackageType.Zip
-            val syncedResourceType = if (codeOnly) SyncedResources.CodeOnly else SyncedResources.AllResources
+            val syncedResourceType = SyncedResources.AllResources
 
             ProgressManager.getInstance().run(
                 object : Task.WithResult<PreSyncRequirements, Exception>(
@@ -108,15 +110,12 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
                     false
                 ) {
                     override fun compute(indicator: ProgressIndicator): PreSyncRequirements {
-                        val dockerDoesntExist = if (execVersion.isGreaterOrEqualThan(minVersionForUseContainer)) {
-                            try {
-                                val processOutput = ExecUtil.execAndGetOutput(GeneralCommandLine("docker", "ps"))
-                                processOutput.exitCode != 0
-                            } catch (e: Exception) {
-                                true
-                            }
-                        } else {
-                            null
+                        val dockerDoesntExist = try {
+                            val processOutput = ExecUtil.execAndGetOutput(GeneralCommandLine("docker", "ps"))
+                            processOutput.exitCode != 0
+                        } catch (e: Exception) {
+                            LOG.warn(e) { "Docker could not be found" }
+                            true
                         }
 
                         val activeStacks = project.getResourceNow(CloudFormationResources.ACTIVE_STACKS, forceFetch = true, useStale = false)
@@ -158,19 +157,6 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
                             saveSettings(project, templateFile, settings)
 
                             if (settings.useContainer) {
-                                if (!execVersion.isGreaterOrEqualThan(minVersionForUseContainer)) {
-                                    notifyError(
-                                        message("sam.cli.version.warning"),
-                                        message(
-                                            "sam.cli.version.upgrade.required",
-                                            execVersion.parsedVersion,
-                                            minVersionForUseContainer.parsedVersion
-                                        ),
-                                        project = project
-                                    )
-                                    return@runInEdt
-                                }
-
                                 when (result.dockerDoesntExist) {
                                     null -> return@runInEdt
                                     true -> {
@@ -203,7 +189,7 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
             val environment = ExecutionEnvironmentBuilder.create(
                 project,
                 DefaultRunExecutor.getRunExecutorInstance(),
-                SyncApplicationRunProfile(project, settings, project.getConnectionSettingsOrThrow(), templatePath, codeOnly)
+                SyncApplicationRunProfile(project, settings, project.getConnectionSettingsOrThrow(), templatePath)
             ).build()
 
             environment.runner.execute(environment)
@@ -240,6 +226,10 @@ class SyncServerlessAppAction(private val codeOnly: Boolean = false) : AnAction(
             }
         }
     }
+
+    companion object {
+        private val LOG = getLogger<SyncServerlessAppAction>()
+    }
 }
 
 data class PreSyncRequirements(

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

@@ -6,10 +6,8 @@ package software.aws.toolkits.jetbrains.services.lambda.actions
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import icons.AwsIcons
-import software.aws.toolkits.jetbrains.core.experiments.isEnabled
 import software.aws.toolkits.jetbrains.services.lambda.LambdaHandlerResolver
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamTemplateFileUtils.getSamTemplateFile
-import software.aws.toolkits.jetbrains.services.lambda.sam.sync.SyncServerlessApplicationExperiment
 import software.aws.toolkits.resources.message
 
 class SyncServerlessApplicationAction : AnAction(message("serverless.application.sync"), null, AwsIcons.Resources.SERVERLESS_APP) {
@@ -20,7 +18,6 @@ class SyncServerlessApplicationAction : AnAction(message("serverless.application
     override fun update(e: AnActionEvent) {
         super.update(e)
         e.presentation.isEnabledAndVisible = getSamTemplateFile(e) != null &&
-            SyncServerlessApplicationExperiment.isEnabled() &&
             LambdaHandlerResolver.supportedRuntimeGroups().isNotEmpty()
     }
 }

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

@@ -264,8 +264,7 @@ fun GeneralCommandLine.samInitCommand(
 fun GeneralCommandLine.samSyncCommand(
     environmentVariables: Map<String, String>,
     templatePath: Path,
-    settings: SyncServerlessApplicationSettings,
-    syncOnlyCode: Boolean
+    settings: SyncServerlessApplicationSettings
 ) = this.apply {
     withEnvironment(environmentVariables)
     withWorkDirectory(templatePath.toAbsolutePath().parent.toString())
@@ -305,7 +304,6 @@ fun GeneralCommandLine.samSyncCommand(
         addParameter("--use-container")
     }
     addParameter("--no-dependency-layer")
-    if (syncOnlyCode) {
-        addParameter("--code")
-    }
+
+    addParameter("--no-watch")
 }

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

@@ -35,8 +35,7 @@ class SyncApplicationRunProfile(
     private val project: Project,
     private val settings: SyncServerlessApplicationSettings,
     private val connection: ConnectionSettings,
-    private val templatePath: Path,
-    private val syncOnlyCode: Boolean
+    private val templatePath: Path
 ) : RunProfile {
     override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState = SyncApplicationRunProfileState(environment)
 
@@ -55,8 +54,7 @@ class SyncApplicationRunProfile(
         private fun getSamSyncCommand(): GeneralCommandLine = getSamCli().samSyncCommand(
             connection.toEnvironmentVariables(),
             templatePath,
-            settings,
-            syncOnlyCode
+            settings
         )
 
         override fun execute(executor: Executor, runner: ProgramRunner<*>) =