AI Builder Extension - App Service support

cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go

@@ -55,12 +55,17 @@ type resourceTypeConfig struct {
 	Kinds                   []string
 }
 
+type appServiceRuntime struct {
+	Stack   string `json:"stack,omitempty"`
+	Version string `json:"version,omitempty"`
+}
+
 var (
 	appResourceMap = map[string]resourceTypeConfig{
-		"host.webapp": {
+		"host.appservice": {
 			ResourceType:            "Microsoft.Web/sites",
 			ResourceTypeDisplayName: "Web App",
-			Kinds:                   []string{"app"},
+			Kinds:                   []string{"app", "app,linux"},
 		},
 		"host.containerapp": {
 			ResourceType:            "Microsoft.App/containerApps",
@@ -77,6 +82,21 @@ var (
 		},
 	}
 
+	appServiceStackMap = map[string]appServiceRuntime{
+		"python": {
+			Stack:   "python",
+			Version: "3.13",
+		},
+		"js": {
+			Stack:   "node",
+			Version: "22-lts",
+		},
+		"ts": {
+			Stack:   "node",
+			Version: "22-lts",
+		},
+	}
+
 	defaultModelMap = map[string]string{
 		"chatCompletion":   "gpt-4o",
 		"embeddings":       "text-embedding-3-small",
@@ -336,6 +356,14 @@ func (a *startAction) Run(ctx context.Context, args []string) error {
 			"port": 8080,
 		}
 
+		if appType == "host.appservice" {
+			runtime, ok := appServiceStackMap[languageType]
+			if !ok {
+				return fmt.Errorf("unsupported language type: %s", languageType)
+			}
+			appConfig["runtime"] = runtime
+		}
+
 		appConfigJson, err := json.Marshal(appConfig)
 		if err != nil {
 			return fmt.Errorf("failed to marshal app config: %w", err)
@@ -1188,14 +1216,15 @@ func (a *startAction) createQuestions(ctx context.Context) (map[string]qna.Quest
 				Choices: []qna.Choice{
 					{Label: "Choose for me", Value: "choose-app"},
 					{Label: "Container App", Value: "host.containerapp"},
-					{Label: "App Service (Coming Soon)", Value: "host.webapp"},
+					{Label: "App Service", Value: "host.appservice"},
 					{Label: "Function App (Coming Soon)", Value: "host.functionapp"},
 					{Label: "Static Web App (Coming Soon)", Value: "host.staticwebapp"},
 					{Label: "Other", Value: "other-app"},
 				},
 			},
 			Branches: map[any][]qna.QuestionReference{
 				"host.containerapp": {{Key: "choose-app-resource"}},
+				"host.appservice":   {{Key: "choose-app-resource"}},
 			},
 			Next: []qna.QuestionReference{
 				{Key: "choose-app-language"},
@@ -1219,7 +1248,6 @@ func (a *startAction) createQuestions(ctx context.Context) (map[string]qna.Quest
 			},
 			AfterAsk: func(ctx context.Context, q *qna.Question, value any) error {
 				selectedLanguage := value.(string)
-
 				// Find the default language for the selected interaction type if available.
 				if selectedLanguage == "default" {
 					interactionType := q.State["interactionType"].(string)
@@ -1231,6 +1259,22 @@ func (a *startAction) createQuestions(ctx context.Context) (map[string]qna.Quest
 					}
 				}
 
+				// App Service in composability supports a limited set of runtimes, so re-prompt
+				// if the user selects an unsupported language
+				isAppService := len(a.scenarioData.AppHostTypes) > 0 &&
+					a.scenarioData.AppHostTypes[len(a.scenarioData.AppHostTypes)-1] == "host.appservice"
+				if isAppService {
+					if _, ok := appServiceStackMap[selectedLanguage]; !ok {
+						q.Branches = map[any][]qna.QuestionReference{
+							selectedLanguage: {{Key: "choose-app-language"}},
+						}
+						fmt.Println(output.WithErrorFormat(
+							"%s is not a supported language for App Service. Please choose another language.",
+							selectedLanguage))
+						return nil
+					}
+				}
+
 				a.scenarioData.AppLanguages = append(a.scenarioData.AppLanguages, selectedLanguage)
 				return nil
 			},

cli/azd/internal/grpcserver/compose_service.go

@@ -180,6 +180,15 @@ func (c *composeService) ListResources(
 // In the future we will converge this into a common component.
 func createResourceProps(resourceType string, config []byte) (any, error) {
 	switch project.ResourceType(resourceType) {
+	case project.ResourceTypeHostAppService:
+		props := project.AppServiceProps{}
+		if len(config) == 0 {
+			return props, nil
+		}
+		if err := json.Unmarshal(config, &props); err != nil {
+			return nil, err
+		}
+		return props, nil
 	case project.ResourceTypeHostContainerApp:
 		props := project.ContainerAppProps{}
 		if len(config) == 0 {