add tests and fix ci

Azure · Jan 2, 2025 · d56aa1f · d56aa1f
1 parent 48559e1
commit d56aa1f
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 17 deletions.
diff --git a/cli/azd/.vscode/cspell.yaml b/cli/azd/.vscode/cspell.yaml
@@ -16,6 +16,10 @@ words:
   - runcontext
   - unmarshals
   - usgovcloudapi
+  - datasource
+  - jdbc
+  - passwordless
+  - postgre
 languageSettings:
   - languageId: go
     ignoreRegExpList:

diff --git a/cli/azd/internal/repository/app_init_test.go b/cli/azd/internal/repository/app_init_test.go
@@ -126,6 +126,56 @@ func TestInitializer_prjConfigFromDetect(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "api with postgresql",
+			detect: detectConfirm{
+				Services: []appdetect.Project{
+					{
+						Language: appdetect.Java,
+						Path:     "java",
+						DatabaseDeps: []appdetect.DatabaseDep{
+							appdetect.DbPostgres,
+						},
+					},
+				},
+				Databases: map[appdetect.DatabaseDep]EntryKind{
+					appdetect.DbPostgres: EntryKindDetected,
+				},
+			},
+			interactions: []string{
+				"postgresql-db",
+				// prompt for auth type
+				// todo cannot use umi here for it will check the source code
+				"Username and password",
+			},
+			want: project.ProjectConfig{
+				Services: map[string]*project.ServiceConfig{
+					"java": {
+						Language:     project.ServiceLanguageJava,
+						Host:         project.ContainerAppTarget,
+						RelativePath: "java",
+					},
+				},
+				Resources: map[string]*project.ResourceConfig{
+					"java": {
+						Type: project.ResourceTypeHostContainerApp,
+						Name: "java",
+						Props: project.ContainerAppProps{
+							Port: 8080,
+						},
+						Uses: []string{"postgresql"},
+					},
+					"postgresql": {
+						Type: project.ResourceTypeDbPostgres,
+						Name: "postgresql",
+						Props: project.PostgresProps{
+							DatabaseName: "postgresql-db",
+							AuthType:     internal.AuthTypePassword,
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "api and web",
 			detect: detectConfirm{

diff --git a/cli/azd/internal/repository/detect_confirm_test.go b/cli/azd/internal/repository/detect_confirm_test.go
@@ -75,6 +75,30 @@ func Test_detectConfirm_confirm(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "confirm single with postgresql resource",
+			detection: []appdetect.Project{
+				{
+					Language: appdetect.Java,
+					Path:     javaDir,
+					DatabaseDeps: []appdetect.DatabaseDep{
+						appdetect.DbPostgres,
+					},
+				},
+			},
+			interactions: []string{
+				"Confirm and continue initializing my app",
+			},
+			want: []appdetect.Project{
+				{
+					Language: appdetect.Java,
+					Path:     javaDir,
+					DatabaseDeps: []appdetect.DatabaseDep{
+						appdetect.DbPostgres,
+					},
+				},
+			},
+		},
 		{
 			name: "add a language",
 			detection: []appdetect.Project{

diff --git a/cli/azd/internal/repository/infra_confirm.go b/cli/azd/internal/repository/infra_confirm.go
@@ -60,21 +60,16 @@ func (i *Initializer) infraSpecFromDetect(
 			continue
 		}
 
-	dbPrompt:
-		for {
-			dbName, err := promptDbName(i.console, ctx, database)
-			if err != nil {
-				return scaffold.InfraSpec{}, err
-			}
+		dbName, err := promptDbName(i.console, ctx, database)
+		if err != nil {
+			return scaffold.InfraSpec{}, err
+		}
 
-			switch database {
-			case appdetect.DbMongo:
-				spec.DbCosmosMongo = &scaffold.DatabaseCosmosMongo{
-					DatabaseName: dbName,
-				}
-				break dbPrompt
+		switch database {
+		case appdetect.DbMongo:
+			spec.DbCosmosMongo = &scaffold.DatabaseCosmosMongo{
+				DatabaseName: dbName,
 			}
-			break dbPrompt
 		}
 	}
 

diff --git a/cli/azd/internal/scaffold/scaffold_test.go b/cli/azd/internal/scaffold/scaffold_test.go
@@ -2,6 +2,7 @@ package scaffold
 
 import (
 	"context"
+	"github.com/azure/azure-dev/cli/azd/internal"
 	"os"
 	"path/filepath"
 	"strings"
@@ -126,13 +127,15 @@ func TestExecInfra(t *testing.T) {
 				DbPostgres: &DatabasePostgres{
 					DatabaseName: "appdb",
 					DatabaseUser: "appuser",
+					AuthType:     internal.AuthTypeUserAssignedManagedIdentity,
 				},
 				Services: []ServiceSpec{
 					{
 						Name: "api",
 						Port: 3100,
 						DbPostgres: &DatabasePostgres{
 							DatabaseName: "appdb",
+							AuthType:     internal.AuthTypeUserAssignedManagedIdentity,
 						},
 					},
 				},

diff --git a/cli/azd/resources/scaffold/base/abbreviations.json b/cli/azd/resources/scaffold/base/abbreviations.json
@@ -33,6 +33,7 @@
     "dataMigrationServices": "dms-",
     "dBforMySQLServers": "mysql-",
     "dBforPostgreSQLServers": "psql-",
+    "deploymentScript": "dc-",
     "devicesIotHubs": "iot-",
     "devicesProvisioningServices": "provs-",
     "devicesProvisioningServicesCertificates": "pcert-",
@@ -132,4 +133,4 @@
     "webSitesAppServiceEnvironment": "ase-",
     "webSitesFunctions": "func-",
     "webStaticSites": "stapp-"
-}
+}
diff --git a/cli/azd/resources/scaffold/templates/resources.bicept b/cli/azd/resources/scaffold/templates/resources.bicept
@@ -110,7 +110,6 @@ module cosmos 'br/public:avm/res/document-db/database-account:0.8.1' = {
 {{- end}}
 
 {{- if .DbPostgres}}
-
 var postgreSqlDatabaseName = '{{ .DbPostgres.DatabaseName }}'
 var postgreSqlDatabaseUser = '{{ .DbPostgres.DatabaseUser }}'
 module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4' = {
@@ -137,12 +136,21 @@ module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4
         name: postgreSqlDatabaseName
       }
     ]
+    location: location
+    {{- if (and .DbPostgres (eq .DbPostgres.AuthType "userAssignedManagedIdentity")) }}
+    roleAssignments: [
+      {
+        principalId: connectionCreatorIdentity.outputs.principalId
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c'
+      }
+    ]
+    {{- end}}
   }
 }
 {{- end}}
 
 {{- if (and .DbPostgres (eq .DbPostgres.AuthType "userAssignedManagedIdentity"))}}
-
 module connectionCreatorIdentity 'br/public:avm/res/managed-identity/user-assigned-identity:0.2.1' = {
   name: 'connectionCreatorIdentity'
   params: {
@@ -151,9 +159,9 @@ module connectionCreatorIdentity 'br/public:avm/res/managed-identity/user-assign
   }
 }
 {{- end}}
+
 {{- range .Services}}
 {{- if (and .DbPostgres (eq .DbPostgres.AuthType "userAssignedManagedIdentity")) }}
-var {{bicepName .Name}}PostgresConnectionName = 'connection_${uniqueString(subscription().id, resourceGroup().id, location, '{{bicepName .Name}}', 'Postgres')}'
 module {{bicepName .Name}}CreateConnectionToPostgreSql 'br/public:avm/res/resources/deployment-script:0.4.0' = {
   name: '{{bicepName .Name}}CreateConnectionToPostgreSql'
   params: {