delete/update-buildpack now accept [-s STACK] to disambiguate buildpacks with same name

[#153256959]

Signed-off-by: Sam Coward <[email protected]>
Signed-off-by: Jackson Feeny <[email protected]>
Signed-off-by: Victoria Henry <[email protected]>

Author: jfeeny

cf/api/apifakes/fake_buildpack_repository.go

@@ -1,6 +1,8 @@
 package apifakes
 
 import (
+	"fmt"
+
 	"code.cloudfoundry.org/cli/cf/errors"
 	"code.cloudfoundry.org/cli/cf/models"
 )
@@ -12,6 +14,12 @@ type OldFakeBuildpackRepository struct {
 	FindByNameName        string
 	FindByNameBuildpack   models.Buildpack
 	FindByNameAPIResponse error
+	FindByNameAmbiguous   bool
+
+	FindByNameAndStackNotFound  bool
+	FindByNameAndStackName      string
+	FindByNameAndStackStack     string
+	FindByNameAndStackBuildpack models.Buildpack
 
 	CreateBuildpackExists bool
 	CreateBuildpack       models.Buildpack
@@ -42,17 +50,34 @@ func (repo *OldFakeBuildpackRepository) FindByName(name string) (buildpack model
 
 	if repo.FindByNameNotFound {
 		apiErr = errors.NewModelNotFoundError("Buildpack", name)
+	} else if repo.FindByNameAmbiguous {
+		apiErr = errors.NewAmbiguousModelError("Buildpack", name)
+	}
+
+	return
+}
+
+func (repo *OldFakeBuildpackRepository) FindByNameAndStack(name, stack string) (buildpack models.Buildpack, apiErr error) {
+	repo.FindByNameAndStackName = name
+	repo.FindByNameAndStackStack = stack
+	buildpack = repo.FindByNameAndStackBuildpack
+
+	if repo.FindByNameAndStackNotFound {
+		apiErr = errors.NewModelNotFoundError("Buildpack", name)
 	}
 
 	return
 }
 
+var buildpackCreateCount int
+
 func (repo *OldFakeBuildpackRepository) Create(name string, position *int, enabled *bool, locked *bool) (createdBuildpack models.Buildpack, apiErr error) {
 	if repo.CreateBuildpackExists {
 		return repo.CreateBuildpack, errors.NewHTTPError(400, errors.BuildpackNameTaken, "Buildpack already exists")
 	}
 
-	repo.CreateBuildpack = models.Buildpack{Name: name, Position: position, Enabled: enabled, Locked: locked}
+	repo.CreateBuildpack = models.Buildpack{Name: name, Position: position, Enabled: enabled, Locked: locked, GUID: fmt.Sprintf("BUILDPACK-GUID-%d", buildpackCreateCount)}
+	buildpackCreateCount++
 	return repo.CreateBuildpack, repo.CreateAPIResponse
 }