Feature/sjad

cli/azd/.vscode/cspell.yaml

@@ -35,6 +35,13 @@ overrides:
       - cloudapp
       - mediaservices
       - msecnd
+  - filename: internal/tracing/fields/fields.go
+    words:
+      - azuredeps
+  - filename: internal/appdetect/java.go
+    words:
+      - springframework
+      - eventhubs
   - filename: docs/docgen.go
     words:
       - alexwolf

cli/azd/internal/appdetect/appdetect.go

@@ -110,6 +110,7 @@ const (
 	DbPostgres  DatabaseDep = "postgres"
 	DbMongo     DatabaseDep = "mongo"
 	DbMySql     DatabaseDep = "mysql"
+	DbCosmos    DatabaseDep = "cosmos"
 	DbSqlServer DatabaseDep = "sqlserver"
 	DbRedis     DatabaseDep = "redis"
 )
@@ -122,6 +123,8 @@ func (db DatabaseDep) Display() string {
 		return "MongoDB"
 	case DbMySql:
 		return "MySQL"
+	case DbCosmos:
+		return "Cosmos DB"
 	case DbSqlServer:
 		return "SQL Server"
 	case DbRedis:
@@ -131,6 +134,48 @@ func (db DatabaseDep) Display() string {
 	return ""
 }
 
+//type AzureDep string
+
+type AzureDep interface {
+	ResourceDisplay() string
+}
+
+type AzureDepServiceBus struct {
+	Queues []string
+	IsJms  bool
+}
+
+func (a AzureDepServiceBus) ResourceDisplay() string {
+	return "Azure Service Bus"
+}
+
+type AzureDepEventHubs struct {
+	Names             []string
+	UseKafka          bool
+	SpringBootVersion string
+}
+
+func (a AzureDepEventHubs) ResourceDisplay() string {
+	return "Azure Event Hubs"
+}
+
+type AzureDepStorageAccount struct {
+	ContainerNames []string
+}
+
+func (a AzureDepStorageAccount) ResourceDisplay() string {
+	return "Azure Storage Account"
+}
+
+type SpringCloudAzureDep struct {
+}
+
+func (a SpringCloudAzureDep) ResourceDisplay() string {
+	return "Spring Cloud Azure Starter"
+}
+
+const UnknownSpringBootVersion string = "unknownSpringBootVersion"
+
 type Project struct {
 	// The language associated with the project.
 	Language Language
@@ -141,6 +186,9 @@ type Project struct {
 	// Experimental: Database dependencies inferred through heuristics while scanning dependencies in the project.
 	DatabaseDeps []DatabaseDep
 
+	// Experimental: Azure dependencies inferred through heuristics while scanning dependencies in the project.
+	AzureDeps []AzureDep
+
 	// The path to the project directory.
 	Path string
 

cli/azd/internal/appdetect/appdetect_test.go

@@ -46,8 +46,10 @@ func TestDetect(t *testing.T) {
 					Path:          "java-multimodules/application",
 					DetectionRule: "Inferred by presence of: pom.xml",
 					DatabaseDeps: []DatabaseDep{
+						DbMongo,
 						DbMySql,
 						DbPostgres,
+						DbRedis,
 					},
 				},
 				{
@@ -130,8 +132,10 @@ func TestDetect(t *testing.T) {
 					Path:          "java-multimodules/application",
 					DetectionRule: "Inferred by presence of: pom.xml",
 					DatabaseDeps: []DatabaseDep{
+						DbMongo,
 						DbMySql,
 						DbPostgres,
+						DbRedis,
 					},
 				},
 				{
@@ -163,8 +167,10 @@ func TestDetect(t *testing.T) {
 					Path:          "java-multimodules/application",
 					DetectionRule: "Inferred by presence of: pom.xml",
 					DatabaseDeps: []DatabaseDep{
+						DbMongo,
 						DbMySql,
 						DbPostgres,
+						DbRedis,
 					},
 				},
 				{
@@ -199,8 +205,10 @@ func TestDetect(t *testing.T) {
 					Path:          "java-multimodules/application",
 					DetectionRule: "Inferred by presence of: pom.xml",
 					DatabaseDeps: []DatabaseDep{
+						DbMongo,
 						DbMySql,
 						DbPostgres,
+						DbRedis,
 					},
 				},
 				{

cli/azd/internal/appdetect/java.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"encoding/xml"
 	"fmt"
+	"github.com/azure/azure-dev/cli/azd/internal/tracing"
+	"github.com/azure/azure-dev/cli/azd/internal/tracing/fields"
 	"io/fs"
-	"maps"
+	"log"
 	"os"
 	"path/filepath"
-	"slices"
+	"regexp"
 	"strings"
 )
 
@@ -23,10 +25,13 @@ func (jd *javaDetector) Language() Language {
 func (jd *javaDetector) DetectProject(ctx context.Context, path string, entries []fs.DirEntry) (*Project, error) {
 	for _, entry := range entries {
 		if strings.ToLower(entry.Name()) == "pom.xml" {
+			tracing.SetUsageAttributes(fields.AppInitJavaDetect.String("start"))
 			pomFile := filepath.Join(path, entry.Name())
 			project, err := readMavenProject(pomFile)
 			if err != nil {
-				return nil, fmt.Errorf("error reading pom.xml: %w", err)
+				log.Printf("Please edit azure.yaml manually to satisfy your requirement. azd can not help you "+
+					"to that by detect your java project because error happened when reading pom.xml: %s. ", err)
+				return nil, nil
 			}
 
 			if len(project.Modules) > 0 {
@@ -45,15 +50,18 @@ func (jd *javaDetector) DetectProject(ctx context.Context, path string, entries
 			}
 
 			_ = currentRoot // use currentRoot here in the analysis
-			result, err := detectDependencies(project, &Project{
+			result, err := detectDependencies(currentRoot, project, &Project{
 				Language:      Java,
 				Path:          path,
 				DetectionRule: "Inferred by presence of: pom.xml",
 			})
 			if err != nil {
-				return nil, fmt.Errorf("detecting dependencies: %w", err)
+				log.Printf("Please edit azure.yaml manually to satisfy your requirement. azd can not help you "+
+					"to that by detect your java project because error happened when detecting dependencies: %s", err)
+				return nil, nil
 			}
 
+			tracing.SetUsageAttributes(fields.AppInitJavaDetect.String("finish"))
 			return result, nil
 		}
 	}
@@ -66,6 +74,7 @@ type mavenProject struct {
 	XmlName              xml.Name             `xml:"project"`
 	Parent               parent               `xml:"parent"`
 	Modules              []string             `xml:"modules>module"` // Capture the modules
+	Properties           Properties           `xml:"properties"`
 	Dependencies         []dependency         `xml:"dependencies>dependency"`
 	DependencyManagement dependencyManagement `xml:"dependencyManagement"`
 	Build                build                `xml:"build"`
@@ -79,6 +88,15 @@ type parent struct {
 	Version    string `xml:"version"`
 }
 
+type Properties struct {
+	Entries []Property `xml:",any"` // Capture all elements inside <properties>
+}
+
+type Property struct {
+	XMLName xml.Name
+	Value   string `xml:",chardata"`
+}
+
 // Dependency represents a single Maven dependency.
 type dependency struct {
 	GroupId    string `xml:"groupId"`
@@ -110,8 +128,16 @@ func readMavenProject(filePath string) (*mavenProject, error) {
 		return nil, err
 	}
 
+	var initialProject mavenProject
+	if err := xml.Unmarshal(bytes, &initialProject); err != nil {
+		return nil, fmt.Errorf("parsing xml: %w", err)
+	}
+
+	// replace all placeholders with properties
+	str := replaceAllPlaceholders(initialProject, string(bytes))
+
 	var project mavenProject
-	if err := xml.Unmarshal(bytes, &project); err != nil {
+	if err := xml.Unmarshal([]byte(str), &project); err != nil {
 		return nil, fmt.Errorf("parsing xml: %w", err)
 	}
 
@@ -120,24 +146,29 @@ func readMavenProject(filePath string) (*mavenProject, error) {
 	return &project, nil
 }
 
-func detectDependencies(mavenProject *mavenProject, project *Project) (*Project, error) {
-	databaseDepMap := map[DatabaseDep]struct{}{}
-	for _, dep := range mavenProject.Dependencies {
-		if dep.GroupId == "com.mysql" && dep.ArtifactId == "mysql-connector-j" {
-			databaseDepMap[DbMySql] = struct{}{}
-		}
+func replaceAllPlaceholders(project mavenProject, input string) string {
+	propsMap := parseProperties(project.Properties)
 
-		if dep.GroupId == "org.postgresql" && dep.ArtifactId == "postgresql" {
-			databaseDepMap[DbPostgres] = struct{}{}
+	re := regexp.MustCompile(`\$\{([A-Za-z0-9-_.]+)}`)
+	return re.ReplaceAllStringFunc(input, func(match string) string {
+		// Extract the key inside ${}
+		key := re.FindStringSubmatch(match)[1]
+		if value, exists := propsMap[key]; exists {
+			return value
 		}
-	}
+		return match
+	})
+}
 
-	if len(databaseDepMap) > 0 {
-		project.DatabaseDeps = slices.SortedFunc(maps.Keys(databaseDepMap),
-			func(a, b DatabaseDep) int {
-				return strings.Compare(string(a), string(b))
-			})
+func parseProperties(properties Properties) map[string]string {
+	result := make(map[string]string)
+	for _, entry := range properties.Entries {
+		result[entry.XMLName.Local] = entry.Value
 	}
+	return result
+}
 
+func detectDependencies(currentRoot *mavenProject, mavenProject *mavenProject, project *Project) (*Project, error) {
+	detectAzureDependenciesByAnalyzingSpringBootProject(currentRoot, mavenProject, project)
 	return project, nil
 }