fix bug where windows logic app passed isLinuxWebApp (#4073)

* logic app windows has "" in LinuxFxVersion

* make sure app service kind is linux web app only, add test

* add check if response is empty, fall to original deployment

* add 404 resource not found case

Author: hemarina

cli/azd/pkg/azsdk/zip_deploy_client.go

@@ -187,6 +187,11 @@ func logWebAppDeploymentStatus(
 	traceId string,
 	progressLog func(string),
 ) error {
+	if (res == armappservice.WebAppsClientGetProductionSiteDeploymentStatusResponse{} ||
+		res.CsmDeploymentStatus == armappservice.CsmDeploymentStatus{} ||
+		res.CsmDeploymentStatus.Properties == nil) {
+		return fmt.Errorf("response or its properties are empty")
+	}
 	properties := res.CsmDeploymentStatus.Properties
 	inProgressNumber := int(*properties.NumberOfInstancesInProgress)
 	successNumber := int(*properties.NumberOfInstancesSuccessful)

cli/azd/pkg/tools/azcli/azcli_linuxwebapp_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2"
+	"github.com/azure/azure-dev/cli/azd/pkg/azsdk"
 	"github.com/azure/azure-dev/cli/azd/pkg/convert"
 	"github.com/azure/azure-dev/cli/azd/test/mocks"
 	"github.com/stretchr/testify/require"
@@ -67,6 +68,31 @@ func Test_DeployTrackLinuxWebAppStatus(t *testing.T) {
 		require.True(t, ran)
 		require.Error(t, err)
 	})
+
+	t.Run("Error", func(t *testing.T) {
+		ran := false
+		mockContext := mocks.NewMockContext(context.Background())
+		azCli := newAzCliFromMockContext(mockContext)
+
+		registerLogicAppMocks(mockContext, &ran)
+		registerLogicAppZipDeployMocks(mockContext, &ran)
+		registerLogicAppPollingMocks(mockContext, &ran)
+
+		zipFile := bytes.NewReader([]byte{})
+
+		res, err := azCli.DeployAppServiceZip(
+			*mockContext.Context,
+			"SUBSCRIPTION_ID",
+			"RESOURCE_GROUP_ID",
+			"WINDOWS_LOGIC_APP_NAME",
+			zipFile,
+			func(s string) {},
+		)
+
+		require.NoError(t, err)
+		require.True(t, ran)
+		require.NotNil(t, res)
+	})
 }
 
 func registerIsLinuxWebAppMocks(mockContext *mocks.MockContext, ran *bool) {
@@ -79,7 +105,7 @@ func registerIsLinuxWebAppMocks(mockContext *mocks.MockContext, ran *bool) {
 		response := armappservice.WebAppsClientGetResponse{
 			Site: armappservice.Site{
 				Location: convert.RefOf("eastus2"),
-				Kind:     convert.RefOf("appserivce"),
+				Kind:     convert.RefOf("app,linux"),
 				Name:     convert.RefOf("LINUX_WEB_APP_NAME"),
 				Properties: &armappservice.SiteProperties{
 					DefaultHostName: convert.RefOf("LINUX_WEB_APP_NAME.azurewebsites.net"),
@@ -100,6 +126,61 @@ func registerIsLinuxWebAppMocks(mockContext *mocks.MockContext, ran *bool) {
 	})
 }
 
+func registerLogicAppMocks(mockContext *mocks.MockContext, ran *bool) {
+	mockContext.HttpClient.When(func(request *http.Request) bool {
+		return request.Method == http.MethodGet &&
+			strings.Contains(request.URL.Path,
+				"/subscriptions/SUBSCRIPTION_ID/resourceGroups/RESOURCE_GROUP_ID/providers/Microsoft.Web/sites/WINDOWS_LOGIC_APP_NAME")
+	}).RespondFn(func(request *http.Request) (*http.Response, error) {
+		*ran = true
+		response := armappservice.WebAppsClientGetResponse{
+			Site: armappservice.Site{
+				Location: convert.RefOf("eastus2"),
+				Kind:     convert.RefOf("functionapp"),
+				Name:     convert.RefOf("WINDOWS_LOGIC_APP_NAME"),
+				Properties: &armappservice.SiteProperties{
+					DefaultHostName: convert.RefOf("WINDOWS_LOGIC_APP_NAME.azurewebsites.net"),
+					SiteConfig: &armappservice.SiteConfig{
+						LinuxFxVersion: convert.RefOf(""),
+					},
+					HostNameSSLStates: []*armappservice.HostNameSSLState{
+						{
+							HostType: convert.RefOf(armappservice.HostTypeRepository),
+							Name:     convert.RefOf("WINDOWS_LOGIC_APP_SCM_HOST"),
+						},
+					},
+				},
+			},
+		}
+
+		return mocks.CreateHttpResponseWithBody(request, http.StatusOK, response)
+	})
+}
+
+func registerLogicAppPollingMocks(mockContext *mocks.MockContext, ran *bool) {
+	// Polling call to check on the deployment status
+	mockContext.HttpClient.When(func(request *http.Request) bool {
+		return request.Method == http.MethodGet && strings.Contains(request.URL.Path, "/deployments/latest")
+	}).RespondFn(func(request *http.Request) (*http.Response, error) {
+		*ran = true
+		completeStatus := azsdk.DeployStatusResponse{
+			DeployStatus: azsdk.DeployStatus{
+				Id:         "ID",
+				Status:     http.StatusOK,
+				StatusText: "OK",
+				Message:    "Deployment Complete",
+				Progress:   nil,
+				Complete:   true,
+				Active:     true,
+				SiteName:   "WINDOWS_LOGIC_APP_NAME",
+				LogUrl:     "https://log.url",
+			},
+		}
+
+		return mocks.CreateHttpResponseWithBody(request, http.StatusOK, completeStatus)
+	})
+}
+
 func registerLinuxWebAppDeployRuntimeSuccessfulMocks(mockContext *mocks.MockContext, ran *bool) {
 	mockContext.HttpClient.When(func(request *http.Request) bool {
 		//nolint:lll
@@ -158,6 +239,21 @@ func registerLinuxWebAppDeployRuntimeFailedMocks(mockContext *mocks.MockContext,
 	})
 }
 
+func registerLogicAppZipDeployMocks(mockContext *mocks.MockContext, ran *bool) {
+	// Original call to start the deployment operation
+	mockContext.HttpClient.When(func(request *http.Request) bool {
+		return request.Method == http.MethodPost &&
+			request.URL.Host == "WINDOWS_LOGIC_APP_SCM_HOST" &&
+			strings.Contains(request.URL.Path, "/api/zipdeploy")
+	}).RespondFn(func(request *http.Request) (*http.Response, error) {
+		*ran = true
+		response, _ := mocks.CreateEmptyHttpResponse(request, http.StatusAccepted)
+		response.Header.Set("Location", "https://WINDOWS_LOGIC_APP_SCM_HOST/deployments/latest")
+
+		return response, nil
+	})
+}
+
 func registerLinuxWebAppZipDeployMocks(mockContext *mocks.MockContext, ran *bool) {
 	mockContext.HttpClient.When(func(request *http.Request) bool {
 		return request.Method == http.MethodPost &&

cli/azd/pkg/tools/azcli/webapp.go

@@ -2,9 +2,12 @@ package azcli
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"strings"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2"
 	"github.com/azure/azure-dev/cli/azd/pkg/azsdk"
 	"github.com/azure/azure-dev/cli/azd/pkg/convert"
@@ -50,8 +53,9 @@ func (cli *azCli) appService(
 }
 
 func isLinuxWebApp(response *armappservice.WebAppsClientGetResponse) bool {
-	if response.Properties != nil && response.Properties.SiteConfig != nil &&
-		response.Properties.SiteConfig.LinuxFxVersion != nil {
+	if *response.Kind == "app,linux" && response.Properties != nil && response.Properties.SiteConfig != nil &&
+		response.Properties.SiteConfig.LinuxFxVersion != nil &&
+		*response.Properties.SiteConfig.LinuxFxVersion != "" {
 		return true
 	}
 	return false
@@ -76,6 +80,28 @@ func appServiceRepositoryHost(
 	return hostName, nil
 }
 
+func resumeDeployment(err error, progressLog func(msg string)) bool {
+	if strings.Contains(err.Error(), "empty deployment status id") {
+		progressLog("Deployment status id is empty. Failed to enable tracking runtime status." +
+			"Resuming deployment without tracking status.")
+		return true
+	}
+
+	if strings.Contains(err.Error(), "response or its properties are empty") {
+		progressLog("Response or its properties are empty. Failed to enable tracking runtime status." +
+			"Resuming deployment without tracking status.")
+		return true
+	}
+
+	var httpErr *azcore.ResponseError
+	if errors.As(err, &httpErr) && httpErr.StatusCode == 404 {
+		progressLog("Resource not found. Failed to enable tracking runtime status." +
+			"Resuming deployment without tracking status.")
+		return true
+	}
+	return false
+}
+
 func (cli *azCli) DeployAppServiceZip(
 	ctx context.Context,
 	subscriptionId string,
@@ -102,12 +128,14 @@ func (cli *azCli) DeployAppServiceZip(
 	// Deployment Status API only support linux web app for now
 	if isLinuxWebApp(app) {
 		if err := client.DeployTrackStatus(ctx, deployZipFile, subscriptionId, resourceGroup, appName, progressLog); err != nil {
-			return nil, err
+			if !resumeDeployment(err, progressLog) {
+				return nil, err
+			}
+		} else {
+			// Deployment is successful
+			statusText := "OK"
+			return convert.RefOf(statusText), nil
 		}
-
-		// Deployment is successful
-		statusText := "OK"
-		return convert.RefOf(statusText), nil
 	}
 
 	response, err := client.Deploy(ctx, deployZipFile)