Feature/sjad

.github/workflows/cli-ci.yml

@@ -6,7 +6,7 @@ on:
       - "cli/**"
       - ".github/workflows/cli-ci.yml"
       - "go.mod"
-    branches: [main]
+    branches: [main, feature/sjad]
 
 permissions:
   contents: read
@@ -27,7 +27,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.60.1
-          args: -v --timeout 10m0s
+          args: --out-format=colored-line-number -v --timeout 10m0s
           working-directory: cli/azd
 
   cspell-lint:

.github/workflows/cspell-misc.yml

@@ -2,7 +2,7 @@ name: misc
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, feature/sjad]
     paths-ignore:
       # Changes here should be kept in-sync with projects listed in cspell.misc.yaml
       - 'eng/**' # Not required

.github/workflows/event.yml

@@ -12,7 +12,7 @@ on:
   # entirely of github actions won't trigger this action.
   workflow_run:
     types: [completed]
-    workflows: ["cli-ci", "templates-ci", "vscode-ci"]
+    workflows: ["cli-ci"]
 
 permissions: {}
 

.github/workflows/go-test-for-sjad-branch.yml

@@ -0,0 +1,42 @@
+name: Go Test
+
+on:
+  pull_request:
+    branches:
+      - feature/sjad
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.23.1
+
+      - name: Cache Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Run tests
+        run: |
+          cd ./cli/azd
+          go test $(go list ./... | grep -v github.com/azure/azure-dev/cli/azd/test/functional | grep -v github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning/terraform) -cover -v

.vscode/cspell.misc.yaml

@@ -41,3 +41,5 @@ overrides:
           - myimage
           - azureai
           - entra
+          - servicebus
+          - eventhubs

cli/azd/.vscode/cspell.yaml

@@ -16,6 +16,17 @@ words:
   - runcontext
   - unmarshals
   - usgovcloudapi
+  - springframework
+  - eventhubs
+  - jdbc
+  - datasource
+  - passwordless
+  - postgre
+  - mysqladmin
+  - sjad
+  - configserver
+  - chardata
+  - webflux
 languageSettings:
   - languageId: go
     ignoreRegExpList:
@@ -38,6 +49,9 @@ overrides:
       - cloudapp
       - mediaservices
       - msecnd
+  - filename: internal/tracing/fields/fields.go
+    words:
+      - azuredeps
   - filename: docs/docgen.go
     words:
       - alexwolf
@@ -119,6 +133,9 @@ overrides:
   - filename: internal/vsrpc/handler.go
     words:
       - arity
+  - filename: internal/appdetect/spring_boot.go
+    words:
+      - eirslett
   - filename: test/internal/tfoidc/main.go
     words:
       - tfoidc

cli/azd/internal/appdetect/appdetect.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/azure/azure-dev/cli/azd/pkg/exec"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools/dotnet"
+	"github.com/azure/azure-dev/cli/azd/pkg/tools/maven"
 	"github.com/bmatcuk/doublestar/v4"
 )
 
@@ -59,13 +60,16 @@ const (
 	PyFlask   Dependency = "flask"
 	PyDjango  Dependency = "django"
 	PyFastApi Dependency = "fastapi"
+
+	SpringFrontend Dependency = "springFrontend"
 )
 
 var WebUIFrameworks = map[Dependency]struct{}{
-	JsReact:   {},
-	JsAngular: {},
-	JsJQuery:  {},
-	JsVite:    {},
+	JsReact:        {},
+	JsAngular:      {},
+	JsJQuery:       {},
+	JsVite:         {},
+	SpringFrontend: {},
 }
 
 func (f Dependency) Language() Language {
@@ -89,6 +93,8 @@ func (f Dependency) Display() string {
 		return "Vite"
 	case JsNext:
 		return "Next.js"
+	case SpringFrontend:
+		return "Spring Frontend"
 	}
 
 	return ""
@@ -110,6 +116,7 @@ const (
 	DbPostgres  DatabaseDep = "postgres"
 	DbMongo     DatabaseDep = "mongo"
 	DbMySql     DatabaseDep = "mysql"
+	DbCosmos    DatabaseDep = "cosmos"
 	DbSqlServer DatabaseDep = "sqlserver"
 	DbRedis     DatabaseDep = "redis"
 )
@@ -122,6 +129,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 +140,73 @@ 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 {
+	EventHubsNamePropertyMap map[string]string
+	DependencyTypes          []DependencyType
+	SpringBootVersion        string
+}
+
+type DependencyType string
+
+const (
+	SpringCloudStreamEventHubs  DependencyType = "spring-cloud-azure-stream-binder-eventhubs"
+	SpringCloudEventHubsStarter DependencyType = "spring-cloud-azure-starter-eventhubs"
+	SpringIntegrationEventHubs  DependencyType = "spring-cloud-azure-starter-integration-eventhubs"
+	SpringMessagingEventHubs    DependencyType = "spring-messaging-azure-eventhubs"
+	SpringCloudStreamKafka      DependencyType = "spring-cloud-starter-stream-kafka"
+	SpringKafka                 DependencyType = "spring-kafka"
+)
+
+func (a AzureDepEventHubs) UseKafka() bool {
+	for _, dependencyType := range a.DependencyTypes {
+		if dependencyType == SpringCloudStreamKafka || dependencyType == SpringKafka {
+			return true
+		}
+	}
+	return false
+}
+
+func (a AzureDepEventHubs) ResourceDisplay() string {
+	return "Azure Event Hubs"
+}
+
+type AzureDepStorageAccount struct {
+	ContainerNamePropertyMap map[string]string
+}
+
+func (a AzureDepStorageAccount) ResourceDisplay() string {
+	return "Azure Storage Account"
+}
+
+type Metadata struct {
+	ApplicationName                                         string
+	ServerPort                                              int
+	DatabaseNameInPropertySpringDatasourceUrl               map[DatabaseDep]string
+	ContainsDependencySpringCloudAzureStarter               bool
+	ContainsDependencySpringCloudAzureStarterJdbcPostgresql bool
+	ContainsDependencySpringCloudAzureStarterJdbcMysql      bool
+	ContainsDependencySpringCloudEurekaServer               bool
+	ContainsDependencySpringCloudEurekaClient               bool
+	ContainsDependencySpringCloudConfigServer               bool
+	ContainsDependencySpringCloudConfigClient               bool
+	ContainsDependencyAboutEmbeddedWebServer                bool
+}
+
 type Project struct {
 	// The language associated with the project.
 	Language Language
@@ -141,9 +217,17 @@ 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
+
+	// Experimental: Metadata inferred through heuristics while scanning the project.
+	Metadata Metadata
+
 	// The path to the project directory.
 	Path string
 
+	Options map[string]interface{}
+
 	// A short description of the detection rule applied.
 	DetectionRule string
 
@@ -179,7 +263,10 @@ type projectDetector interface {
 var allDetectors = []projectDetector{
 	// Order here determines precedence when two projects are in the same directory.
 	// This is unlikely to occur in practice, but reordering could help to break the tie in these cases.
-	&javaDetector{},
+	&javaDetector{
+		mvnCli:     maven.NewCli(exec.NewCommandRunner(nil)),
+		modulePoms: make(map[string]pom),
+	},
 	&dotNetAppHostDetector{
 		// TODO(ellismg): Remove ambient authority.
 		dotnetCli: dotnet.NewCli(exec.NewCommandRunner(nil)),
@@ -264,7 +351,7 @@ func detectAny(ctx context.Context, detectors []projectDetector, path string, en
 		if project != nil {
 			log.Printf("Found project %s at %s", project.Language, path)
 
-			// docker is an optional property of a project, and thus is different than other detectors
+			// docker is an optional property of a project, and thus is different from other detectors
 			docker, err := detectDockerInDirectory(path, entries)
 			if err != nil {
 				return nil, fmt.Errorf("detecting docker project: %w", err)