test: address PR feedback for layer hooks

Remove the local schema directive from the hooks sample, reject duplicate layer names and mutually exclusive --service/--layer usage, and clean up schema definitions used by docs generation. Keep the HOOK_TRACE_FILE env handling unchanged and document the Go exec.Cmd.Env behavior in PR discussion.

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

Author: weikanglim

cli/azd/cmd/hooks.go

@@ -145,8 +145,17 @@ var knownHookNames = map[string]bool{
 func (hra *hooksRunAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 	hookName := hra.args[0]
 
+	if hra.flags.service != "" && hra.flags.layer != "" {
+		return nil, &internal.ErrorWithSuggestion{
+			Err:        fmt.Errorf("--service and --layer cannot be used together"),
+			Suggestion: "Choose either '--service' to run service hooks or '--layer' to run provisioning layer hooks.",
+		}
+	}
+
 	hookType := "project"
-	if hra.flags.service != "" {
+	if hra.flags.layer != "" {
+		hookType = "layer"
+	} else if hra.flags.service != "" {
 		hookType = "service"
 	}
 

cli/azd/cmd/hooks_test.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/azure/azure-dev/cli/azd/internal/tracing"
+	"github.com/azure/azure-dev/cli/azd/internal/tracing/fields"
 	"github.com/azure/azure-dev/cli/azd/pkg/environment"
 	"github.com/azure/azure-dev/cli/azd/pkg/exec"
 	"github.com/azure/azure-dev/cli/azd/pkg/ext"
@@ -152,3 +154,76 @@ func Test_HooksRunAction_FiltersLayerHooks(t *testing.T) {
 		filepath.Join(projectPath, "infra/shared"),
 	}, gotCwds)
 }
+
+func Test_HooksRunAction_SetsTelemetryTypeForLayer(t *testing.T) {
+	mockContext := mocks.NewMockContext(context.Background())
+	env := environment.NewWithValues("test", nil)
+	envManager := &mockenv.MockEnvManager{}
+	envManager.On("Reload", mock.Anything, mock.Anything).Return(nil)
+
+	t.Cleanup(func() {
+		tracing.SetUsageAttributes()
+	})
+	tracing.SetUsageAttributes()
+
+	projectConfig := &project.ProjectConfig{
+		Name:     "test",
+		Path:     t.TempDir(),
+		Services: map[string]*project.ServiceConfig{},
+		Infra: provisioning.Options{
+			Layers: []provisioning.Options{
+				{
+					Name: "core",
+					Path: "infra/core",
+					Hooks: provisioning.HooksConfig{
+						"preprovision": {{
+							Shell: ext.ShellTypeBash,
+							Run:   "echo core",
+						}},
+					},
+				},
+			},
+		},
+	}
+
+	mockContext.CommandRunner.When(func(args exec.RunArgs, command string) bool {
+		return true
+	}).Respond(exec.NewRunResult(0, "", ""))
+
+	action := &hooksRunAction{
+		projectConfig:  projectConfig,
+		env:            env,
+		envManager:     envManager,
+		importManager:  project.NewImportManager(nil),
+		commandRunner:  mockContext.CommandRunner,
+		console:        mockContext.Console,
+		flags:          &hooksRunFlags{layer: "core"},
+		args:           []string{"preprovision"},
+		serviceLocator: mockContext.Container,
+	}
+
+	_, err := action.Run(*mockContext.Context)
+	require.NoError(t, err)
+
+	var hookType string
+	for _, attr := range tracing.GetUsageAttributes() {
+		if attr.Key == fields.HooksTypeKey.Key {
+			hookType = attr.Value.AsString()
+			break
+		}
+	}
+
+	require.Equal(t, "layer", hookType)
+}
+
+func Test_HooksRunAction_RejectsServiceAndLayerTogether(t *testing.T) {
+	action := &hooksRunAction{
+		env:   environment.NewWithValues("test", nil),
+		flags: &hooksRunFlags{service: "api", layer: "core"},
+		args:  []string{"preprovision"},
+	}
+
+	_, err := action.Run(context.Background())
+	require.Error(t, err)
+	require.ErrorContains(t, err, "--service and --layer cannot be used together")
+}

cli/azd/internal/tracing/fields/fields.go

@@ -345,7 +345,7 @@ var (
 		Classification: SystemMetadata,
 		Purpose:        FeatureInsight,
 	}
-	// The type of the hook (project or service).
+	// The type of the hook run scope (project, layer, or service).
 	HooksTypeKey = AttributeKey{
 		Key:            attribute.Key("hooks.type"),
 		Classification: SystemMetadata,

cli/azd/pkg/infra/provisioning/provider.go

@@ -161,11 +161,18 @@ func (o *Options) Validate() error {
 			"properties on 'infra' cannot be declared when 'infra.layers' is declared")
 	}
 
+	seenLayers := map[string]struct{}{}
 	for _, layer := range o.Layers {
 		if layer.Name == "" {
 			return errWrap("name must be specified for each provisioning layer")
 		}
 
+		if _, has := seenLayers[layer.Name]; has {
+			return errWrap(fmt.Sprintf("duplicate layer name '%s' is not allowed", layer.Name))
+		}
+
+		seenLayers[layer.Name] = struct{}{}
+
 		if layer.Path == "" {
 			return errWrap(fmt.Sprintf("%s: path must be specified", layer.Name))
 		}

cli/azd/pkg/infra/provisioning/provider_test.go

@@ -429,6 +429,24 @@ func TestOptions_Validate_Hooks(t *testing.T) {
 		require.ErrorContains(t, err, "only 'preprovision' and 'postprovision' hooks are supported")
 	})
 
+	t.Run("duplicate layer names are not allowed", func(t *testing.T) {
+		err := (&Options{
+			Layers: []Options{
+				{
+					Name: "infra-core",
+					Path: "infra/core",
+				},
+				{
+					Name: "infra-core",
+					Path: "infra/shared",
+				},
+			},
+		}).Validate()
+
+		require.Error(t, err)
+		require.ErrorContains(t, err, "duplicate layer name 'infra-core' is not allowed")
+	})
+
 	t.Run("layers cannot be mixed with root hooks", func(t *testing.T) {
 		err := (&Options{
 			Path: "infra",

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

@@ -1,5 +1,3 @@
-# yaml-language-server: $schema=/Users/weilim/repos/azd2/schemas/v1.0/azure.yaml.json
-
 name: hooks
 
 infra:

schemas/alpha/azure.yaml.json

@@ -67,7 +67,6 @@
                     "type": "array",
                     "title": "Provisioning layers.",
                     "description": "Optional. Layers for Azure infrastructure provisioning.",
-                    "additionalProperties": false,
                     "uniqueItems": true,
                     "items": {
                         "type": "object",

schemas/v1.0/azure.yaml.json

@@ -64,7 +64,6 @@
                     "type": "array",
                     "title": "Provisioning layers.",
                     "description": "Optional. Layers for Azure infrastructure provisioning.",
-                    "additionalProperties": false,
                     "uniqueItems": true,
                     "items": {
                         "type": "object",