test: refine layer hooks functional smoke tests

Switch the hooks sample to a lightweight App Service app, verify deploy via
command and prerestore hooks, and keep `azd hooks run` coverage in local-only
subtests so the smoke stays fast.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: weikanglim

cli/azd/test/functional/hooks_test.go

@@ -33,65 +33,143 @@ func Test_CLI_Hooks_RegistrationAndRun(t *testing.T) {
 	require.NotEmpty(t, subscriptionId, "hooks smoke test requires a subscription id")
 
 	location := cfg.Location
-	if session != nil && session.Playback {
-		location = "eastus2"
-	}
 	require.NotEmpty(t, location, "hooks smoke test requires a location")
 
-	predeployTracePath := filepath.Join(dir, "predeploy-trace.log")
+	deployTracePath := filepath.Join(dir, "deploy-trace.log")
 	provisionTracePath := filepath.Join(dir, "provision-trace.log")
 
 	cli := azdcli.NewCLI(t, azdcli.WithSession(session))
 	cli.WorkingDirectory = dir
-	baseEnv := append(os.Environ(),
-		fmt.Sprintf("AZURE_SUBSCRIPTION_ID=%s", subscriptionId),
-		fmt.Sprintf("AZURE_LOCATION=%s", location),
-		"AZD_ALPHA_ENABLE_LLM=false",
-	)
-	setHookTraceEnv := func(tracePath string) {
-		cli.Env = append([]string{}, baseEnv...)
-		cli.Env = append(cli.Env, fmt.Sprintf("HOOK_TRACE_FILE=%s", tracePath))
-	}
+	baseEnv := hooksTestEnv(subscriptionId, location)
+	cli.Env = append(os.Environ(), baseEnv...)
+
+	err := copySample(dir, "hooks")
+	require.NoError(t, err, "failed expanding sample")
+
+	_, err = cli.RunCommandWithStdIn(ctx, stdinForInit(envName), "init")
+	require.NoError(t, err)
+
+	setHookTraceEnv(cli, baseEnv, deployTracePath)
+	_, err = cli.RunCommand(ctx, "deploy")
+	require.Error(t, err, "deploy should fail for this hooks sample")
+
+	setHookTraceEnv(cli, baseEnv, provisionTracePath)
+	_, err = cli.RunCommand(ctx, "provision")
+	require.Error(t, err, "provision should fail for this hooks sample")
+
+	require.Equal(t, []string{
+		"command-predeploy",
+		"service-prerestore",
+	}, readTraceEntries(t, deployTracePath))
+
+	require.Equal(t, []string{
+		"command-preprovision",
+		"layer-preprovision",
+	}, readTraceEntries(t, provisionTracePath))
+}
+
+func Test_CLI_Hooks_Run_RegistrationAndRun(t *testing.T) {
+	t.Parallel()
 
-	readTraceEntries := func(tracePath string) []string {
-		traceBytes, err := os.ReadFile(tracePath)
+	t.Run("RunAll", func(t *testing.T) {
+		traceEntries, err := runLocalHooksCommand(t, "predeploy")
 		require.NoError(t, err)
 
-		var traceEntries []string
-		for _, line := range strings.Split(string(traceBytes), "\n") {
-			line = strings.TrimSpace(line)
-			if line == "" {
-				continue
-			}
+		require.Equal(t, []string{
+			"command-predeploy",
+			"service-predeploy",
+		}, traceEntries)
+	})
+
+	t.Run("RunSpecific", func(t *testing.T) {
+		t.Run("Service", func(t *testing.T) {
+			traceEntries, err := runLocalHooksCommand(t, "predeploy", "--service", "app")
+			require.NoError(t, err)
+
+			require.Equal(t, []string{
+				"command-predeploy",
+				"service-predeploy",
+			}, traceEntries)
+		})
+
+		t.Run("Layer", func(t *testing.T) {
+			traceEntries, err := runLocalHooksCommand(t, "preprovision", "--layer", "core")
+			require.Error(t, err)
+
+			require.Equal(t, []string{
+				"command-preprovision",
+				"layer-preprovision",
+			}, traceEntries)
+		})
+	})
+}
 
-			traceEntries = append(traceEntries, line)
-		}
+func hooksTestEnv(subscriptionId string, location string) []string {
+	baseEnv := append(os.Environ(), "AZD_ALPHA_ENABLE_LLM=false")
+	if subscriptionId != "" {
+		baseEnv = append(baseEnv, fmt.Sprintf("AZURE_SUBSCRIPTION_ID=%s", subscriptionId))
+	}
 
-		return traceEntries
+	if location != "" {
+		baseEnv = append(baseEnv, fmt.Sprintf("AZURE_LOCATION=%s", location))
 	}
 
+	return baseEnv
+}
+
+func setHookTraceEnv(cli *azdcli.CLI, baseEnv []string, tracePath string) {
+	cli.Env = append([]string{}, baseEnv...)
+	cli.Env = append(cli.Env, fmt.Sprintf("HOOK_TRACE_FILE=%s", tracePath))
+}
+
+func runLocalHooksCommand(t *testing.T, args ...string) ([]string, error) {
+	t.Helper()
+
+	ctx, cancel := newTestContext(t)
+	defer cancel()
+
+	dir := tempDirWithDiagnostics(t)
+	t.Logf("DIR: %s", dir)
+
+	envName := randomOrStoredEnvName(nil)
+	t.Logf("AZURE_ENV_NAME: %s", envName)
+
+	cli := azdcli.NewCLI(t)
+	cli.WorkingDirectory = dir
+
+	baseEnv := hooksTestEnv("", "")
+	tracePath := filepath.Join(dir, "hooks-run-trace.log")
+
 	err := copySample(dir, "hooks")
 	require.NoError(t, err, "failed expanding sample")
 
 	cli.Env = append([]string{}, baseEnv...)
 	_, err = cli.RunCommandWithStdIn(ctx, stdinForInit(envName), "init")
 	require.NoError(t, err)
 
-	setHookTraceEnv(predeployTracePath)
-	_, err = cli.RunCommand(ctx, "hooks", "run", "predeploy", "--service", "app")
+	setHookTraceEnv(cli, baseEnv, tracePath)
+
+	command := append([]string{"hooks", "run"}, args...)
+	_, err = cli.RunCommand(ctx, command...)
+
+	return readTraceEntries(t, tracePath), err
+}
+
+func readTraceEntries(t *testing.T, tracePath string) []string {
+	t.Helper()
+
+	traceBytes, err := os.ReadFile(tracePath)
 	require.NoError(t, err)
 
-	setHookTraceEnv(provisionTracePath)
-	_, err = cli.RunCommand(ctx, "provision")
-	require.Error(t, err, "provision should fail for this hooks sample")
+	var traceEntries []string
+	for _, line := range strings.Split(string(traceBytes), "\n") {
+		line = strings.TrimSpace(line)
+		if line == "" {
+			continue
+		}
 
-	require.Equal(t, []string{
-		"command-predeploy",
-		"service-predeploy",
-	}, readTraceEntries(predeployTracePath))
+		traceEntries = append(traceEntries, line)
+	}
 
-	require.Equal(t, []string{
-		"command-preprovision",
-		"layer-preprovision",
-	}, readTraceEntries(provisionTracePath))
+	return traceEntries
 }

cli/azd/test/functional/testdata/samples/hooks/azure.yaml

@@ -32,11 +32,9 @@ hooks:
 
 services:
   app:
-    project: src/app
-    host: containerapp
-    language: docker
-    docker:
-      remoteBuild: true
+    project: .
+    host: appservice
+    language: js
     hooks:
       predeploy:
         windows:
@@ -45,3 +43,10 @@ services:
         posix:
           run: 'echo service-predeploy >> "$HOOK_TRACE_FILE"'
           shell: sh
+      prerestore:
+        windows:
+          run: 'Add-Content -Path $env:HOOK_TRACE_FILE -Value "service-prerestore"'
+          shell: pwsh
+        posix:
+          run: 'echo service-prerestore >> "$HOOK_TRACE_FILE"'
+          shell: sh