From 71fc3024e81e7ccc5cce3f790ffef17062c19d2d Mon Sep 17 00:00:00 2001
From: Wallace Breza <wallace.breza@microsoft.com>
Date: Wed, 24 Jan 2024 15:03:17 -0800
Subject: [PATCH] Addresses PR feedback

---
 cli/azd/cmd/container.go              | 3 +--
 cli/azd/pkg/helm/cli.go               | 4 ++--
 cli/azd/pkg/kustomize/cli.go          | 4 ++--
 cli/azd/pkg/project/service_target.go | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cli/azd/cmd/container.go b/cli/azd/cmd/container.go
index 1a150e9a2e7..90689031ddd 100644
--- a/cli/azd/cmd/container.go
+++ b/cli/azd/cmd/container.go
@@ -468,7 +468,6 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 	container.MustRegisterSingleton(maven.NewMavenCli)
 	container.MustRegisterSingleton(helm.NewCli)
 	container.MustRegisterSingleton(kustomize.NewCli)
-	container.MustRegisterSingleton(kustomize.NewKustomize)
 	container.MustRegisterSingleton(npm.NewNpmCli)
 	container.MustRegisterSingleton(python.NewPythonCli)
 	container.MustRegisterSingleton(swa.NewSwaCli)
@@ -484,7 +483,7 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 
 	// Service Targets
 	serviceTargetMap := map[project.ServiceTargetKind]any{
-		"":                               project.NewAppServiceTarget,
+		project.NonSpecifiedTarget:       project.NewAppServiceTarget,
 		project.AppServiceTarget:         project.NewAppServiceTarget,
 		project.AzureFunctionTarget:      project.NewFunctionAppTarget,
 		project.ContainerAppTarget:       project.NewContainerAppTarget,
diff --git a/cli/azd/pkg/helm/cli.go b/cli/azd/pkg/helm/cli.go
index ebbf70b7259..cd0f74a5bd4 100644
--- a/cli/azd/pkg/helm/cli.go
+++ b/cli/azd/pkg/helm/cli.go
@@ -26,12 +26,12 @@ func (cli *Cli) Name() string {
 	return "helm"
 }
 
-// Returns the installation URL to install the K8s CLI
+// Returns the installation URL to install the Helm CLI
 func (cli *Cli) InstallUrl() string {
 	return "https://aka.ms/azure-dev/helm-install"
 }
 
-// Checks whether or not the K8s CLI is installed and available within the PATH
+// Checks whether or not the Helm CLI is installed and available within the PATH
 func (cli *Cli) CheckInstalled(ctx context.Context) error {
 	if err := tools.ToolInPath("helm"); err != nil {
 		return err
diff --git a/cli/azd/pkg/kustomize/cli.go b/cli/azd/pkg/kustomize/cli.go
index 10d886a3c5e..dd17b7660c8 100644
--- a/cli/azd/pkg/kustomize/cli.go
+++ b/cli/azd/pkg/kustomize/cli.go
@@ -26,12 +26,12 @@ func (cli *Cli) Name() string {
 	return "kustomize"
 }
 
-// Returns the installation URL to install the K8s CLI
+// Returns the installation URL to install the Kustomize CLI
 func (cli *Cli) InstallUrl() string {
 	return "https://aka.ms/azure-dev/kustomize-install"
 }
 
-// Checks whether or not the K8s CLI is installed and available within the PATH
+// Checks whether or not the Kustomize CLI is installed and available within the PATH
 func (cli *Cli) CheckInstalled(ctx context.Context) error {
 	if err := tools.ToolInPath("kustomize"); err != nil {
 		return err
diff --git a/cli/azd/pkg/project/service_target.go b/cli/azd/pkg/project/service_target.go
index 63d67dfe596..2c99a945e68 100644
--- a/cli/azd/pkg/project/service_target.go
+++ b/cli/azd/pkg/project/service_target.go
@@ -18,6 +18,7 @@ import (
 type ServiceTargetKind string
 
 const (
+	NonSpecifiedTarget       ServiceTargetKind = ""
 	AppServiceTarget         ServiceTargetKind = "appservice"
 	ContainerAppTarget       ServiceTargetKind = "containerapp"
 	AzureFunctionTarget      ServiceTargetKind = "function"