diff --git a/cli/azd/internal/appdetect/appdetect.go b/cli/azd/internal/appdetect/appdetect.go index 5436eb2d2ea..c27b073bcb5 100644 --- 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 index bbde48a5045..fca3c6d94aa 100644 --- 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 index 24f6170a8a8..a67b6475293 100644 --- 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{