graduate data protection

cli/azd/pkg/apphost/generate.go

@@ -160,7 +160,6 @@ func Containers(manifest *Manifest) map[string]genContainer {
 }
 
 type AppHostOptions struct {
-	AutoConfigureDataProtection bool
 }
 
 // ContainerAppManifestTemplateForProject returns the container app manifest template for a given project.
@@ -180,7 +179,6 @@ func ContainerAppManifestTemplateForProject(
 	var buf bytes.Buffer
 
 	tmplCtx := generator.containerAppTemplateContexts[projectName]
-	tmplCtx.AutoConfigureDataProtection = options.AutoConfigureDataProtection
 
 	err := genTemplates.ExecuteTemplate(&buf, "containerApp.tmpl.yaml", tmplCtx)
 	if err != nil {

cli/azd/pkg/apphost/generate_types.go

@@ -144,15 +144,14 @@ type genBicepTemplateContext struct {
 }
 
 type genContainerAppManifestTemplateContext struct {
-	Name                        string
-	Ingress                     *genContainerAppIngress
-	Env                         map[string]string
-	Secrets                     map[string]string
-	KeyVaultSecrets             map[string]string
-	Dapr                        *genContainerAppManifestTemplateContextDapr
-	AutoConfigureDataProtection bool
-	Args                        []string
-	Volumes                     []*Volume
+	Name            string
+	Ingress         *genContainerAppIngress
+	Env             map[string]string
+	Secrets         map[string]string
+	KeyVaultSecrets map[string]string
+	Dapr            *genContainerAppManifestTemplateContextDapr
+	Args            []string
+	Volumes         []*Volume
 }
 
 type genProjectFileContext struct {

cli/azd/pkg/apphost/testdata/TestAspireArgsGeneration.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: false
       targetPort: {{ targetPortOrDefault 8080 }}

cli/azd/pkg/apphost/testdata/TestAspireBicepGeneration-frontend.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: false
       targetPort: {{ targetPortOrDefault 8080 }}

cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-my-sql-abstract.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: false
       targetPort: {{ targetPortOrDefault 3306 }}

cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-mysqlabstract.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       additionalPortMappings:
         - targetPort: 3306

cli/azd/pkg/apphost/testdata/TestAspireContainerGeneration-noVolume.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: false
       targetPort: {{ targetPortOrDefault 3306 }}

cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-api.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: true
       targetPort: {{ targetPortOrDefault 8080 }}

cli/azd/pkg/apphost/testdata/TestAspireDockerGeneration-nodeapp.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: true
       targetPort: {{ targetPortOrDefault 3000 }}

cli/azd/pkg/apphost/testdata/TestAspireEscaping-api.snap

@@ -1,3 +1,4 @@
+api-version: 2024-02-02-preview
 location: {{ .Env.AZURE_LOCATION }}
 identity:
   type: UserAssigned
@@ -8,6 +9,9 @@ properties:
   environmentId: {{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}
   configuration:
     activeRevisionsMode: single
+    runtime:
+      dotnet:
+        autoConfigureDataProtection: true
     ingress:
       external: false
       targetPort: {{ targetPortOrDefault 8080 }}

cli/azd/pkg/project/dotnet_importer.go

@@ -275,8 +275,6 @@ func (ai *DotNetImporter) Services(
 	return services, nil
 }
 
-var autoConfigureDataProtectionFeature = alpha.MustFeatureKey("aspire.autoConfigureDataProtection")
-
 func (ai *DotNetImporter) SynthAllInfrastructure(
 	ctx context.Context, p *ProjectConfig, svcConfig *ServiceConfig,
 ) (fs.FS, error) {
@@ -339,9 +337,7 @@ func (ai *DotNetImporter) SynthAllInfrastructure(
 	// container we will deploy.
 	writeManifestForResource := func(name string) error {
 		containerAppManifest, err := apphost.ContainerAppManifestTemplateForProject(
-			manifest, name, apphost.AppHostOptions{
-				AutoConfigureDataProtection: ai.alphaFeatureManager.IsEnabled(autoConfigureDataProtectionFeature),
-			})
+			manifest, name, apphost.AppHostOptions{})
 		if err != nil {
 			return fmt.Errorf("generating containerApp.tmpl.yaml for resource %s: %w", name, err)
 		}

cli/azd/pkg/project/service_target_dotnet_containerapp.go

@@ -200,9 +200,7 @@ func (at *dotnetContainerAppTarget) Deploy(
 				generatedManifest, err := apphost.ContainerAppManifestTemplateForProject(
 					serviceConfig.DotNetContainerApp.Manifest,
 					serviceConfig.DotNetContainerApp.ProjectName,
-					apphost.AppHostOptions{
-						AutoConfigureDataProtection: at.alphaFeatureManager.IsEnabled(autoConfigureDataProtectionFeature),
-					},
+					apphost.AppHostOptions{},
 				)
 				if err != nil {
 					task.SetError(fmt.Errorf("generating container app manifest: %w", err))

cli/azd/resources/alpha_features.yaml

@@ -2,8 +2,6 @@
   description: "Support infrastructure deployments at resource group scope."
 - id: infraSynth
   description: "Enable the `infra synth` command to write generated infrastructure to disk."
-- id: aspire.autoConfigureDataProtection
-  description: "Automatically configure data protection for Aspire deployments. May not be supported in all regions."
 - id: aks.helm
   description: "Enable Helm support for AKS deployments."
 - id: aks.kustomize

cli/azd/resources/apphost/templates/containerApp.tmpl.yamlt

@@ -1,7 +1,5 @@
 {{define "containerApp.tmpl.yaml" -}}
-{{- if .AutoConfigureDataProtection -}}
 api-version: 2024-02-02-preview
-{{end -}}
 location: {{ "{{ .Env.AZURE_LOCATION }}" }}
 identity:
   type: UserAssigned
@@ -12,11 +10,9 @@ properties:
   environmentId: {{ "{{ .Env.AZURE_CONTAINER_APPS_ENVIRONMENT_ID }}" }}
   configuration:
     activeRevisionsMode: single
-{{- if .AutoConfigureDataProtection}}
     runtime:
       dotnet:
         autoConfigureDataProtection: true
-{{- end}}
 {{- if .Dapr}}
     dapr:
       appId: {{ .Dapr.AppId }}