Support detect Azure Event Hubs - 2

cli/azd/cmd/root.go

@@ -177,7 +177,7 @@ func NewRootCmd(
 		Command:        logout,
 		ActionResolver: newLogoutAction,
 	})
-
+	
 	root.Add("init", &actions.ActionDescriptorOptions{
 		Command:        newInitCmd(),
 		FlagsResolver:  newInitFlags,

cli/azd/internal/appdetect/appdetect.go

@@ -131,6 +131,36 @@ func (db DatabaseDep) Display() string {
 	return ""
 }
 
+//type AzureDep string
+
+type AzureDep interface {
+	ResourceDisplay() string
+}
+
+type AzureDepServiceBus struct {
+	Queues []string
+}
+
+func (a AzureDepServiceBus) ResourceDisplay() string {
+	return "Azure Service Bus"
+}
+
+type AzureDepEventHubs struct {
+	Names []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 Project struct {
 	// The language associated with the project.
 	Language Language
@@ -141,6 +171,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,
 					},
 				},
 				{
@@ -279,6 +287,24 @@ func TestDetectNested(t *testing.T) {
 	})
 }
 
+func TestAnalyzeJavaSpringProject(t *testing.T) {
+	var properties = readProperties(filepath.Join("testdata", "java-spring", "project-one"))
+	require.Equal(t, "", properties["not.exist"])
+	require.Equal(t, "jdbc:h2:mem:testdb", properties["spring.datasource.url"])
+
+	properties = readProperties(filepath.Join("testdata", "java-spring", "project-two"))
+	require.Equal(t, "", properties["not.exist"])
+	require.Equal(t, "jdbc:h2:mem:testdb", properties["spring.datasource.url"])
+
+	properties = readProperties(filepath.Join("testdata", "java-spring", "project-three"))
+	require.Equal(t, "", properties["not.exist"])
+	require.Equal(t, "HTML", properties["spring.thymeleaf.mode"])
+
+	properties = readProperties(filepath.Join("testdata", "java-spring", "project-four"))
+	require.Equal(t, "", properties["not.exist"])
+	require.Equal(t, "mysql", properties["database"])
+}
+
 func copyTestDataDir(glob string, dst string) error {
 	root := "testdata"
 	return fs.WalkDir(testDataFs, root, func(name string, d fs.DirEntry, err error) error {

cli/azd/internal/appdetect/java.go

@@ -1,10 +1,14 @@
 package appdetect
 
 import (
+	"bufio"
 	"context"
 	"encoding/xml"
 	"fmt"
+	"github.com/azure/azure-dev/cli/azd/pkg/osutil"
+	"github.com/braydonk/yaml"
 	"io/fs"
+	"log"
 	"maps"
 	"os"
 	"path/filepath"
@@ -121,6 +125,24 @@ func readMavenProject(filePath string) (*mavenProject, error) {
 }
 
 func detectDependencies(mavenProject *mavenProject, project *Project) (*Project, error) {
+	// how can we tell it's a Spring Boot project?
+	// 1. It has a parent with a groupId of org.springframework.boot and an artifactId of spring-boot-starter-parent
+	// 2. It has a dependency with a groupId of org.springframework.boot and an artifactId that starts with spring-boot-starter
+	isSpringBoot := false
+	if mavenProject.Parent.GroupId == "org.springframework.boot" && mavenProject.Parent.ArtifactId == "spring-boot-starter-parent" {
+		isSpringBoot = true
+	}
+	for _, dep := range mavenProject.Dependencies {
+		if dep.GroupId == "org.springframework.boot" && strings.HasPrefix(dep.ArtifactId, "spring-boot-starter") {
+			isSpringBoot = true
+			break
+		}
+	}
+	applicationProperties := make(map[string]string)
+	if isSpringBoot {
+		applicationProperties = readProperties(project.Path)
+	}
+
 	databaseDepMap := map[DatabaseDep]struct{}{}
 	for _, dep := range mavenProject.Dependencies {
 		if dep.GroupId == "com.mysql" && dep.ArtifactId == "mysql-connector-j" {
@@ -130,6 +152,55 @@ func detectDependencies(mavenProject *mavenProject, project *Project) (*Project,
 		if dep.GroupId == "org.postgresql" && dep.ArtifactId == "postgresql" {
 			databaseDepMap[DbPostgres] = struct{}{}
 		}
+
+		if dep.GroupId == "org.springframework.boot" && dep.ArtifactId == "spring-boot-starter-data-redis" {
+			databaseDepMap[DbRedis] = struct{}{}
+		}
+		if dep.GroupId == "org.springframework.boot" && dep.ArtifactId == "spring-boot-starter-data-redis-reactive" {
+			databaseDepMap[DbRedis] = struct{}{}
+		}
+
+		if dep.GroupId == "org.springframework.boot" && dep.ArtifactId == "spring-boot-starter-data-mongodb" {
+			databaseDepMap[DbMongo] = struct{}{}
+		}
+		if dep.GroupId == "org.springframework.boot" && dep.ArtifactId == "spring-boot-starter-data-mongodb-reactive" {
+			databaseDepMap[DbMongo] = struct{}{}
+		}
+
+		if dep.GroupId == "com.azure.spring" && dep.ArtifactId == "spring-cloud-azure-stream-binder-servicebus" {
+			bindingDestinations := findBindingDestinations(applicationProperties)
+			destinations := make([]string, 0, len(bindingDestinations))
+			for bindingName, destination := range bindingDestinations {
+				destinations = append(destinations, destination)
+				log.Printf("Service Bus queue [%s] found for binding [%s]", destination, bindingName)
+			}
+			project.AzureDeps = append(project.AzureDeps, AzureDepServiceBus{
+				Queues: destinations,
+			})
+		}
+
+		if dep.GroupId == "com.azure.spring" && dep.ArtifactId == "spring-cloud-azure-stream-binder-eventhubs" {
+			bindingDestinations := findBindingDestinations(applicationProperties)
+			var destinations []string
+			containsInBinding := false
+			for bindingName, destination := range bindingDestinations {
+				if strings.Contains(bindingName, "-in-") { // Example: consume-in-0
+					containsInBinding = true
+				}
+				if !contains(destinations, destination) {
+					destinations = append(destinations, destination)
+					log.Printf("Event Hubs [%s] found for binding [%s]", destination, bindingName)
+				}
+			}
+			project.AzureDeps = append(project.AzureDeps, AzureDepEventHubs{
+				Names: destinations,
+			})
+			if containsInBinding {
+				project.AzureDeps = append(project.AzureDeps, AzureDepStorageAccount{
+					ContainerNames: []string{applicationProperties["spring.cloud.azure.eventhubs.processor.checkpoint-store.container-name"]},
+				})
+			}
+		}
 	}
 
 	if len(databaseDepMap) > 0 {
@@ -141,3 +212,132 @@ func detectDependencies(mavenProject *mavenProject, project *Project) (*Project,
 
 	return project, nil
 }
+
+func readProperties(projectPath string) map[string]string {
+	// todo: do we need to consider the bootstrap.properties
+	result := make(map[string]string)
+	readPropertiesInPropertiesFile(filepath.Join(projectPath, "/src/main/resources/application.properties"), result)
+	readPropertiesInYamlFile(filepath.Join(projectPath, "/src/main/resources/application.yml"), result)
+	readPropertiesInYamlFile(filepath.Join(projectPath, "/src/main/resources/application.yaml"), result)
+	profile, profileSet := result["spring.profiles.active"]
+	if profileSet {
+		readPropertiesInPropertiesFile(filepath.Join(projectPath, "/src/main/resources/application-"+profile+".properties"), result)
+		readPropertiesInYamlFile(filepath.Join(projectPath, "/src/main/resources/application-"+profile+".yml"), result)
+		readPropertiesInYamlFile(filepath.Join(projectPath, "/src/main/resources/application-"+profile+".yaml"), result)
+	}
+	return result
+}
+
+func readPropertiesInYamlFile(yamlFilePath string, result map[string]string) {
+	if !osutil.FileExists(yamlFilePath) {
+		return
+	}
+	data, err := os.ReadFile(yamlFilePath)
+	if err != nil {
+		log.Fatalf("error reading YAML file: %v", err)
+		return
+	}
+
+	// Parse the YAML into a yaml.Node
+	var root yaml.Node
+	err = yaml.Unmarshal(data, &root)
+	if err != nil {
+		log.Fatalf("error unmarshalling YAML: %v", err)
+		return
+	}
+
+	parseYAML("", &root, result)
+}
+
+// Recursively parse the YAML and build dot-separated keys into a map
+func parseYAML(prefix string, node *yaml.Node, result map[string]string) {
+	switch node.Kind {
+	case yaml.DocumentNode:
+		// Process each document's content
+		for _, contentNode := range node.Content {
+			parseYAML(prefix, contentNode, result)
+		}
+	case yaml.MappingNode:
+		// Process key-value pairs in a map
+		for i := 0; i < len(node.Content); i += 2 {
+			keyNode := node.Content[i]
+			valueNode := node.Content[i+1]
+
+			// Ensure the key is a scalar
+			if keyNode.Kind != yaml.ScalarNode {
+				continue
+			}
+
+			keyStr := keyNode.Value
+			newPrefix := keyStr
+			if prefix != "" {
+				newPrefix = prefix + "." + keyStr
+			}
+			parseYAML(newPrefix, valueNode, result)
+		}
+	case yaml.SequenceNode:
+		// Process items in a sequence (list)
+		for i, item := range node.Content {
+			newPrefix := fmt.Sprintf("%s[%d]", prefix, i)
+			parseYAML(newPrefix, item, result)
+		}
+	case yaml.ScalarNode:
+		// If it's a scalar value, add it to the result map
+		result[prefix] = node.Value
+	default:
+		// Handle other node types if necessary
+	}
+}
+
+func readPropertiesInPropertiesFile(propertiesFilePath string, result map[string]string) {
+	if !osutil.FileExists(propertiesFilePath) {
+		return
+	}
+	file, err := os.Open(propertiesFilePath)
+	if err != nil {
+		log.Fatalf("error opening properties file: %v", err)
+		return
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.TrimSpace(line) == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+		parts := strings.SplitN(line, "=", 2)
+		if len(parts) == 2 {
+			key := strings.TrimSpace(parts[0])
+			value := strings.TrimSpace(parts[1])
+			result[key] = value
+		}
+	}
+}
+
+// Function to find all properties that match the pattern `spring.cloud.stream.bindings.<binding-name>.destination`
+func findBindingDestinations(properties map[string]string) map[string]string {
+	result := make(map[string]string)
+
+	// Iterate through the properties map and look for matching keys
+	for key, value := range properties {
+		// Check if the key matches the pattern `spring.cloud.stream.bindings.<binding-name>.destination`
+		if strings.HasPrefix(key, "spring.cloud.stream.bindings.") && strings.HasSuffix(key, ".destination") {
+			// Extract the binding name
+			bindingName := key[len("spring.cloud.stream.bindings.") : len(key)-len(".destination")]
+			// Store the binding name and destination value
+			result[bindingName] = fmt.Sprintf("%v", value)
+		}
+	}
+
+	return result
+}
+
+func contains(array []string, str string) bool {
+	for _, v := range array {
+		if v == str {
+			return true
+		}
+	}
+	return false
+}

cli/azd/internal/appdetect/testdata/java-multimodules/application/pom.xml

@@ -38,6 +38,16 @@
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
 		</dependency>
+		<dependency>
+
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.postgresql</groupId>

cli/azd/internal/appdetect/testdata/java-spring/project-four/src/main/resources/application-mysql.properties

@@ -0,0 +1,7 @@
+# database init, supports mysql too
+database=mysql
+spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:petclinic}
+spring.datasource.username=${MYSQL_USERNAME:petclinic}
+spring.datasource.password=${MYSQL_PASSWORD:}
+# SQL is written to be idempotent so this is safe
+spring.sql.init.mode=always

cli/azd/internal/appdetect/testdata/java-spring/project-four/src/main/resources/application-postgres.properties

@@ -0,0 +1,6 @@
+database=postgres
+spring.datasource.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:${POSTGRES_HOST:5432}/${POSTGRES_DATABASE:petclinic}
+spring.datasource.username=${POSTGRES_USERNAME:petclinic}
+spring.datasource.password=${POSTGRES_PASSWORD:}
+# SQL is written to be idempotent so this is safe
+spring.sql.init.mode=always