Delete password check when using managed identity as auth type. Becau…

…se the configured password will be ignored without and error. (#65)
azure-javaee · Dec 4, 2024 · 6d96a35 · 6d96a35
1 parent 529e450
commit 6d96a35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/cli/azd/internal/appdetect/appdetect.go b/cli/azd/internal/appdetect/appdetect.go
@@ -175,7 +175,6 @@ type Metadata struct {
 	ContainsDependencySpringCloudAzureStarter               bool
 	ContainsDependencySpringCloudAzureStarterJdbcPostgresql bool
 	ContainsDependencySpringCloudAzureStarterJdbcMysql      bool
-	ContainsPropertySpringDatasourcePassword                bool
 	ContainsDependencySpringCloudEurekaServer               bool
 	ContainsDependencySpringCloudEurekaClient               bool
 	ContainsDependencySpringCloudConfigServer               bool

diff --git a/cli/azd/internal/appdetect/spring_boot.go b/cli/azd/internal/appdetect/spring_boot.go
@@ -255,7 +255,6 @@ func detectMetadata(azdProject *Project, springBootProject *SpringBootProject) {
 	detectDependencySpringCloudAzureStarterJdbcMysql(azdProject, springBootProject)
 	detectDependencySpringCloudEureka(azdProject, springBootProject)
 	detectDependencySpringCloudConfig(azdProject, springBootProject)
-	detectPropertySpringDatasourcePassword(azdProject, springBootProject)
 	detectPropertySpringApplicationName(azdProject, springBootProject)
 }
 
@@ -286,14 +285,6 @@ func detectDependencySpringCloudAzureStarterJdbcMysql(azdProject *Project, sprin
 	}
 }
 
-func detectPropertySpringDatasourcePassword(azdProject *Project, springBootProject *SpringBootProject) {
-	var targetProperty = "spring.datasource.password"
-	if _, ok := springBootProject.applicationProperties[targetProperty]; ok {
-		azdProject.Metadata.ContainsPropertySpringDatasourcePassword = true
-		logMetadataUpdated("ContainsPropertySpringDatasourcePassword = true")
-	}
-}
-
 func detectPropertySpringApplicationName(azdProject *Project, springBootProject *SpringBootProject) {
 	var targetSpringAppName = "spring.application.name"
 	if appName, ok := springBootProject.applicationProperties[targetSpringAppName]; ok {

diff --git a/cli/azd/internal/repository/app_init.go b/cli/azd/internal/repository/app_init.go
@@ -807,9 +807,7 @@ func checkPasswordlessConfigurationAndContinueProvision(database appdetect.Datab
 		return true, nil
 	}
 	for i, prj := range detect.Services {
-		if prj.Language == appdetect.Java &&
-			(!prj.Metadata.ContainsDependencySpringCloudAzureStarter ||
-				prj.Metadata.ContainsPropertySpringDatasourcePassword) {
+		if prj.Language == appdetect.Java && !prj.Metadata.ContainsDependencySpringCloudAzureStarter {
 			message := fmt.Sprintf("You selected %s as auth type for %s.",
 				internal.AuthTypeUserAssignedManagedIdentity, database)
 			if database == appdetect.DbPostgres && !prj.Metadata.ContainsDependencySpringCloudAzureStarterJdbcPostgresql {
@@ -822,11 +820,6 @@ func checkPasswordlessConfigurationAndContinueProvision(database appdetect.Datab
 					"'com.azure.spring:spring-cloud-azure-starter-jdbc-mysql'. "+
 					"But this dependency is not found in your project: %s.", message, prj.Path)
 			}
-			if prj.Metadata.ContainsPropertySpringDatasourcePassword {
-				message = fmt.Sprintf("%s This property should be deleted: "+
-					"'spring.datasource.password'. "+
-					"But this property is found in your project: %s.", message, prj.Path)
-			}
 			continueOption, err := console.Select(ctx, input.ConsoleOptions{
 				Message: fmt.Sprintf("%s Select an option:", message),
 				Options: []string{