easy-init: Switch to avm (Azure Verified Modules)

cli/azd/internal/repository/infra_confirm.go

@@ -24,7 +24,9 @@ func (i *Initializer) infraSpecFromDetect(
 	detect detectConfirm) (scaffold.InfraSpec, error) {
 	spec := scaffold.InfraSpec{}
 	for database := range detect.Databases {
-		if database == appdetect.DbRedis { // no configuration needed for redis
+		if database == appdetect.DbRedis {
+			spec.DbRedis = &scaffold.DatabaseRedis{}
+			// no further configuration needed for redis
 			continue
 		}
 

cli/azd/internal/scaffold/scaffold.go

@@ -115,32 +115,16 @@ func ExecInfra(
 		return err
 	}
 
-	if spec.DbCosmosMongo != nil {
-		err = Execute(t, "db-cosmos-mongo.bicep", spec.DbCosmosMongo, filepath.Join(infraApp, "db-cosmos-mongo.bicep"))
-		if err != nil {
-			return fmt.Errorf("scaffolding cosmos mongodb: %w", err)
-		}
-	}
-
-	if spec.DbPostgres != nil {
-		err = Execute(t, "db-postgres.bicep", spec.DbPostgres, filepath.Join(infraApp, "db-postgres.bicep"))
-		if err != nil {
-			return fmt.Errorf("scaffolding postgres: %w", err)
-		}
-	}
-
-	for _, svc := range spec.Services {
-		err = Execute(t, "host-containerapp.bicep", svc, filepath.Join(infraApp, svc.Name+".bicep"))
-		if err != nil {
-			return fmt.Errorf("scaffolding containerapp: %w", err)
-		}
-	}
-
 	err = Execute(t, "main.bicep", spec, filepath.Join(infraRoot, "main.bicep"))
 	if err != nil {
 		return fmt.Errorf("scaffolding main.bicep: %w", err)
 	}
 
+	err = Execute(t, "resources.bicep", spec, filepath.Join(infraRoot, "resources.bicep"))
+	if err != nil {
+		return fmt.Errorf("scaffolding resources.bicep: %w", err)
+	}
+
 	err = Execute(t, "main.parameters.json", spec, filepath.Join(infraRoot, "main.parameters.json"))
 	if err != nil {
 		return fmt.Errorf("scaffolding main.parameters.json: %w", err)

cli/azd/internal/scaffold/scaffold_test.go

@@ -76,6 +76,51 @@ func TestExecInfra(t *testing.T) {
 				},
 			},
 		},
+		{
+			"All",
+			InfraSpec{
+				DbPostgres: &DatabasePostgres{
+					DatabaseName: "appdb",
+				},
+				DbCosmosMongo: &DatabaseCosmosMongo{
+					DatabaseName: "appdb",
+				},
+				DbRedis: &DatabaseRedis{},
+				Services: []ServiceSpec{
+					{
+						Name: "api",
+						Port: 3100,
+						Backend: &Backend{
+							Frontends: []ServiceReference{
+								{
+									Name: "web",
+								},
+							},
+						},
+						DbCosmosMongo: &DatabaseReference{
+							DatabaseName: "appdb",
+						},
+						DbRedis: &DatabaseReference{
+							DatabaseName: "redis",
+						},
+						DbPostgres: &DatabaseReference{
+							DatabaseName: "appdb",
+						},
+					},
+					{
+						Name: "web",
+						Port: 3101,
+						Frontend: &Frontend{
+							Backends: []ServiceReference{
+								{
+									Name: "api",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			"API with Postgres",
 			InfraSpec{
@@ -114,6 +159,7 @@ func TestExecInfra(t *testing.T) {
 		{
 			"API with Redis",
 			InfraSpec{
+				DbRedis: &DatabaseRedis{},
 				Services: []ServiceSpec{
 					{
 						Name: "api",

cli/azd/internal/scaffold/spec.go

@@ -12,6 +12,7 @@ type InfraSpec struct {
 	// Databases to create
 	DbPostgres    *DatabasePostgres
 	DbCosmosMongo *DatabaseCosmosMongo
+	DbRedis       *DatabaseRedis
 }
 
 type Parameter struct {
@@ -30,6 +31,9 @@ type DatabaseCosmosMongo struct {
 	DatabaseName string
 }
 
+type DatabaseRedis struct {
+}
+
 type ServiceSpec struct {
 	Name string
 	Port int

cli/azd/resources/scaffold/base/modules/set-redis-conn.bicep

@@ -0,0 +1,29 @@
+param name string
+param keyVaultName string
+param passwordSecretName string
+param urlSecretName string
+
+resource redisConn 'Microsoft.Cache/redis@2024-03-01' existing = {
+  name: name
+}
+
+resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
+  name: keyVaultName
+}
+
+resource passwordSecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
+  name: passwordSecretName
+  parent: keyVault
+  properties: {
+    value: redisConn.listKeys().primaryKey
+  }
+}
+
+resource urlSecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
+  name: urlSecretName
+  parent: keyVault
+  properties: {
+    value: 'rediss://:${redisConn.listKeys().primaryKey}@${redisConn.properties.hostName}:${redisConn.properties.sslPort}'
+  }
+}
+