Merge main into feature/build-execute

Author: aws-toolkit-automation

.changes/next-release/bugfix-2301aeeb-f36e-4776-8e9b-4238c55e43f4.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/dev: Fix prompt to enable devfile build not triggering when devfile is present."
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -479,7 +479,7 @@ class FeatureDevController(
                 ),
             )
 
-            if (!session.context.checkForDevFile()) {
+            if (!session.context.hasDevFile()) {
                 followUps.add(
                     FollowUp(
                         pillText = message("amazonqFeatureDev.follow_up.generate_dev_file"),
@@ -741,7 +741,7 @@ class FeatureDevController(
             }
 
             val codeWhispererSettings = CodeWhispererSettings.getInstance().getAutoBuildSetting()
-            val hasDevFile = session.context.checkForDevFile()
+            val hasDevFile = session.context.hasDevFile()
             val isPromptedForAutoBuildFeature = codeWhispererSettings.containsKey(session.context.workspaceRoot.path)
 
             if (hasDevFile && !isPromptedForAutoBuildFeature) {

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

@@ -18,6 +18,7 @@ import org.apache.commons.codec.digest.DigestUtils
 import org.apache.commons.io.FileUtils
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
 import software.aws.toolkits.jetbrains.services.amazonq.QConstants.MAX_FILE_SIZE_BYTES
+import software.aws.toolkits.jetbrains.utils.getWorkspaceDevFile
 import software.aws.toolkits.jetbrains.utils.isWorkspaceDevFile
 import software.aws.toolkits.resources.AwsCoreBundle
 import software.aws.toolkits.telemetry.AmazonqTelemetry
@@ -57,11 +58,8 @@ open class FeatureDevSessionContext(val project: Project, val maxProjectSizeByte
 
     private var _selectionRoot = workspaceRoot
 
-    // This function checks for existence of `devfile.yaml` in customer's repository, currently only `devfile.yaml` is supported for this feature.
-    fun checkForDevFile(): Boolean {
-        val devFile = File(addressableRoot.toString(), "devfile.yaml")
-        return devFile.exists()
-    }
+    fun hasDevFile(): Boolean =
+        getWorkspaceDevFile(addressableRoot) != null
 
     fun getProjectZip(isAutoBuildFeatureEnabled: Boolean?): ZipCreationResult {
         val zippedProject = runBlocking {

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

@@ -5,6 +5,11 @@ package software.aws.toolkits.jetbrains.utils
 
 import com.intellij.openapi.vfs.VirtualFile
 
+fun isDevFile(file: VirtualFile): Boolean =
+    file.name.matches(Regex("devfile\\.ya?ml", RegexOption.IGNORE_CASE))
+
 fun isWorkspaceDevFile(file: VirtualFile, addressableRoot: VirtualFile): Boolean =
-    file.name.matches(Regex("devfile\\.ya?ml", RegexOption.IGNORE_CASE)) &&
-        file.parent?.path == addressableRoot.path
+    isDevFile(file) && file.parent?.path == addressableRoot.path
+
+fun getWorkspaceDevFile(addressableRoot: VirtualFile): VirtualFile? =
+    addressableRoot.children.find { isDevFile(it) }