Add lifecycle flag to update-buildpack and delete-buildpack

Signed-off-by: Tom Kennedy <[email protected]>

Author: tomkennedy513

actor/actionerror/buildpack_not_found_error.go

@@ -6,8 +6,9 @@ import "fmt"
 type BuildpackNotFoundError struct {
 	BuildpackName string
 	StackName     string
+	Lifecycle     string
 }
 
 func (e BuildpackNotFoundError) Error() string {
-	return fmt.Sprintf("Buildpack not found - Name: '%s'; Stack: '%s'", e.BuildpackName, e.StackName)
+	return fmt.Sprintf("Buildpack not found - Name: '%s'; Stack: '%s', Lifecyle: '%s'", e.BuildpackName, e.StackName, e.Lifecycle)
 }

actor/v7action/buildpack.go

@@ -36,41 +36,45 @@ func (actor Actor) GetBuildpacks(labelSelector string, lifecycle string) ([]reso
 	return buildpacks, Warnings(warnings), err
 }
 
-// GetBuildpackByNameAndStack returns a buildpack with the provided name and
-// stack. If `buildpackStack` is not specified, and there are multiple
+// GetBuildpackByNameAndStackAndLifecycle returns a buildpack with the provided name, stack,
+// and lifecycle. If `buildpackStack` is not specified, and there are multiple
 // buildpacks with the same name, it will return the one with no stack, if
-// present.
-func (actor Actor) GetBuildpackByNameAndStack(buildpackName string, buildpackStack string) (resources.Buildpack, Warnings, error) {
+// present. If `buildpackLifecycle` is not specified and there are multiple buildpacks with
+// the same name, it will return the one with the default_app_lifecycle, if present.
+func (actor Actor) GetBuildpackByNameAndStackAndLifecycle(buildpackName string, buildpackStack string, buildpackLifecycle string) (resources.Buildpack, Warnings, error) {
 	var (
 		buildpacks []resources.Buildpack
 		warnings   ccv3.Warnings
 		err        error
 	)
 
-	if buildpackStack == "" {
-		buildpacks, warnings, err = actor.CloudControllerClient.GetBuildpacks(ccv3.Query{
-			Key:    ccv3.NameFilter,
-			Values: []string{buildpackName},
+	queries := []ccv3.Query{{
+		Key:    ccv3.NameFilter,
+		Values: []string{buildpackName},
+	}}
+
+	if buildpackStack != "" {
+		queries = append(queries, ccv3.Query{
+			Key:    ccv3.StackFilter,
+			Values: []string{buildpackStack},
 		})
-	} else {
-		buildpacks, warnings, err = actor.CloudControllerClient.GetBuildpacks(
-			ccv3.Query{
-				Key:    ccv3.NameFilter,
-				Values: []string{buildpackName},
-			},
-			ccv3.Query{
-				Key:    ccv3.StackFilter,
-				Values: []string{buildpackStack},
-			},
-		)
 	}
 
+	if buildpackLifecycle != "" {
+		queries = append(queries, ccv3.Query{
+			Key:    ccv3.LifecycleFilter,
+			Values: []string{buildpackLifecycle},
+		})
+	}
+
+	buildpacks, warnings, err = actor.CloudControllerClient.GetBuildpacks(queries...)
+
 	if err != nil {
 		return resources.Buildpack{}, Warnings(warnings), err
 	}
 
 	if len(buildpacks) == 0 {
-		return resources.Buildpack{}, Warnings(warnings), actionerror.BuildpackNotFoundError{BuildpackName: buildpackName, StackName: buildpackStack}
+		return resources.Buildpack{}, Warnings(warnings), actionerror.BuildpackNotFoundError{BuildpackName: buildpackName, StackName: buildpackStack, Lifecycle: buildpackLifecycle}
 	}
 
 	if len(buildpacks) > 1 {
@@ -91,9 +95,9 @@ func (actor Actor) CreateBuildpack(buildpack resources.Buildpack) (resources.Bui
 	return buildpack, Warnings(warnings), err
 }
 
-func (actor Actor) UpdateBuildpackByNameAndStack(buildpackName string, buildpackStack string, buildpack resources.Buildpack) (resources.Buildpack, Warnings, error) {
+func (actor Actor) UpdateBuildpackByNameAndStackAndLifecycle(buildpackName string, buildpackStack string, buildpackLifecycle string, buildpack resources.Buildpack) (resources.Buildpack, Warnings, error) {
 	var warnings Warnings
-	foundBuildpack, getWarnings, err := actor.GetBuildpackByNameAndStack(buildpackName, buildpackStack)
+	foundBuildpack, getWarnings, err := actor.GetBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle)
 	warnings = append(warnings, getWarnings...)
 
 	if err != nil {
@@ -254,9 +258,9 @@ func Zipit(source, target, prefix string) error {
 	return err
 }
 
-func (actor Actor) DeleteBuildpackByNameAndStack(buildpackName string, buildpackStack string) (Warnings, error) {
+func (actor Actor) DeleteBuildpackByNameAndStackAndLifecycle(buildpackName string, buildpackStack string, buildpackLifecycle string) (Warnings, error) {
 	var allWarnings Warnings
-	buildpack, getBuildpackWarnings, err := actor.GetBuildpackByNameAndStack(buildpackName, buildpackStack)
+	buildpack, getBuildpackWarnings, err := actor.GetBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle)
 	allWarnings = append(allWarnings, getBuildpackWarnings...)
 	if err != nil {
 		return allWarnings, err

actor/v7action/buildpack_test.go

@@ -28,23 +28,24 @@ var _ = Describe("Buildpack", func() {
 		actor, fakeCloudControllerClient, _, _, _, _, _ = NewTestActor()
 	})
 
-	Describe("GetBuildpackByNameAndStack", func() {
+	Describe("GetBuildpackByNameAndStackAndLifecycle", func() {
 		var (
-			buildpackName  = "buildpack-1"
-			buildpackStack = "stack-name"
-			buildpack      resources.Buildpack
-			warnings       Warnings
-			executeErr     error
+			buildpackName      = "buildpack-1"
+			buildpackStack     = "stack-name"
+			buildpackLifecycle = "buildpack"
+			buildpack          resources.Buildpack
+			warnings           Warnings
+			executeErr         error
 		)
 
 		JustBeforeEach(func() {
-			buildpack, warnings, executeErr = actor.GetBuildpackByNameAndStack(buildpackName, buildpackStack)
+			buildpack, warnings, executeErr = actor.GetBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle)
 		})
 
 		When("getting buildpacks fails", func() {
 			BeforeEach(func() {
-
 				buildpackStack = "real-good-stack"
+				buildpackLifecycle = "some-lifecycle"
 				fakeCloudControllerClient.GetBuildpacksReturns(
 					nil,
 					ccv3.Warnings{"some-warning-1", "some-warning-2"},
@@ -65,6 +66,10 @@ var _ = Describe("Buildpack", func() {
 						Key:    ccv3.StackFilter,
 						Values: []string{buildpackStack},
 					},
+					ccv3.Query{
+						Key:    ccv3.LifecycleFilter,
+						Values: []string{buildpackLifecycle},
+					},
 				))
 			})
 		})
@@ -120,15 +125,16 @@ var _ = Describe("Buildpack", func() {
 			})
 
 			It("returns warnings and a BuildpackNotFoundError", func() {
-				Expect(executeErr).To(MatchError(actionerror.BuildpackNotFoundError{BuildpackName: buildpackName, StackName: buildpackStack}))
+				Expect(executeErr).To(MatchError(actionerror.BuildpackNotFoundError{BuildpackName: buildpackName, StackName: buildpackStack, Lifecycle: buildpackLifecycle}))
 				Expect(warnings).To(ConsistOf("some-warning-1", "some-warning-2"))
 			})
 		})
 
 		When("getting buildpacks is successful", func() {
-			When("No stack is specified", func() {
+			When("No stack or lifecycle is specified", func() {
 				BeforeEach(func() {
 					buildpackStack = ""
+					buildpackLifecycle = ""
 					buildpackName = "my-buildpack"
 
 					ccBuildpack := resources.Buildpack{Name: "my-buildpack", GUID: "some-guid"}
@@ -144,7 +150,7 @@ var _ = Describe("Buildpack", func() {
 					Expect(buildpack).To(Equal(resources.Buildpack{Name: "my-buildpack", GUID: "some-guid"}))
 				})
 
-				It("Does not pass a stack query to the client", func() {
+				It("Does not pass a stack or lifecycle query to the client", func() {
 					Expect(fakeCloudControllerClient.GetBuildpacksCallCount()).To(Equal(1))
 					queries := fakeCloudControllerClient.GetBuildpacksArgsForCall(0)
 					Expect(queries).To(ConsistOf(
@@ -156,10 +162,11 @@ var _ = Describe("Buildpack", func() {
 				})
 			})
 
-			When("A stack is specified", func() {
+			When("only a stack is specified", func() {
 				BeforeEach(func() {
 					buildpackStack = "good-stack"
 					buildpackName = "my-buildpack"
+					buildpackLifecycle = ""
 
 					ccBuildpack := resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Stack: "good-stack"}
 					fakeCloudControllerClient.GetBuildpacksReturns(
@@ -174,7 +181,7 @@ var _ = Describe("Buildpack", func() {
 					Expect(buildpack).To(Equal(resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Stack: "good-stack"}))
 				})
 
-				It("Does pass a stack query to the client", func() {
+				It("Only passes a stack query to the client", func() {
 					Expect(fakeCloudControllerClient.GetBuildpacksCallCount()).To(Equal(1))
 					queries := fakeCloudControllerClient.GetBuildpacksArgsForCall(0)
 					Expect(queries).To(ConsistOf(
@@ -189,6 +196,78 @@ var _ = Describe("Buildpack", func() {
 					))
 				})
 			})
+			When("only a lifecycle is specified", func() {
+				BeforeEach(func() {
+					buildpackLifecycle = "good-lifecycle"
+					buildpackStack = ""
+					buildpackName = "my-buildpack"
+
+					ccBuildpack := resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Lifecycle: "good-lifecycle"}
+					fakeCloudControllerClient.GetBuildpacksReturns(
+						[]resources.Buildpack{ccBuildpack},
+						ccv3.Warnings{"some-warning-1", "some-warning-2"},
+						nil)
+				})
+
+				It("Returns the proper buildpack", func() {
+					Expect(executeErr).ToNot(HaveOccurred())
+					Expect(warnings).To(ConsistOf("some-warning-1", "some-warning-2"))
+					Expect(buildpack).To(Equal(resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Lifecycle: "good-lifecycle"}))
+				})
+
+				It("Only passes a lifecycle query to the client", func() {
+					Expect(fakeCloudControllerClient.GetBuildpacksCallCount()).To(Equal(1))
+					queries := fakeCloudControllerClient.GetBuildpacksArgsForCall(0)
+					Expect(queries).To(ConsistOf(
+						ccv3.Query{
+							Key:    ccv3.NameFilter,
+							Values: []string{buildpackName},
+						},
+						ccv3.Query{
+							Key:    ccv3.LifecycleFilter,
+							Values: []string{buildpackLifecycle},
+						},
+					))
+				})
+			})
+			When("When stack and lifecycle are specified", func() {
+				BeforeEach(func() {
+					buildpackLifecycle = "good-lifecycle"
+					buildpackStack = "good-stack"
+					buildpackName = "my-buildpack"
+
+					ccBuildpack := resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Lifecycle: "good-lifecycle", Stack: "good-stack"}
+					fakeCloudControllerClient.GetBuildpacksReturns(
+						[]resources.Buildpack{ccBuildpack},
+						ccv3.Warnings{"some-warning-1", "some-warning-2"},
+						nil)
+				})
+
+				It("Returns the proper buildpack", func() {
+					Expect(executeErr).ToNot(HaveOccurred())
+					Expect(warnings).To(ConsistOf("some-warning-1", "some-warning-2"))
+					Expect(buildpack).To(Equal(resources.Buildpack{Name: "my-buildpack", GUID: "some-guid", Lifecycle: "good-lifecycle", Stack: "good-stack"}))
+				})
+
+				It("Only passes a lifecycle query to the client", func() {
+					Expect(fakeCloudControllerClient.GetBuildpacksCallCount()).To(Equal(1))
+					queries := fakeCloudControllerClient.GetBuildpacksArgsForCall(0)
+					Expect(queries).To(ConsistOf(
+						ccv3.Query{
+							Key:    ccv3.NameFilter,
+							Values: []string{buildpackName},
+						},
+						ccv3.Query{
+							Key:    ccv3.LifecycleFilter,
+							Values: []string{buildpackLifecycle},
+						},
+						ccv3.Query{
+							Key:    ccv3.StackFilter,
+							Values: []string{buildpackStack},
+						},
+					))
+				})
+			})
 		})
 	})
 
@@ -338,9 +417,10 @@ var _ = Describe("Buildpack", func() {
 
 	Describe("UpdateBuildpackByNameAndStack", func() {
 		var (
-			buildpackName  = "my-buildpack"
-			buildpackStack = "my-stack"
-			buildpack      = resources.Buildpack{
+			buildpackName      = "my-buildpack"
+			buildpackStack     = "my-stack"
+			buildpackLifecycle = "cnb"
+			buildpack          = resources.Buildpack{
 				Stack: "new-stack",
 			}
 
@@ -350,7 +430,7 @@ var _ = Describe("Buildpack", func() {
 		)
 
 		JustBeforeEach(func() {
-			retBuildpack, warnings, executeErr = actor.UpdateBuildpackByNameAndStack(buildpackName, buildpackStack, buildpack)
+			retBuildpack, warnings, executeErr = actor.UpdateBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle, buildpack)
 		})
 
 		When("it is successful", func() {
@@ -377,6 +457,10 @@ var _ = Describe("Buildpack", func() {
 						Key:    ccv3.StackFilter,
 						Values: []string{buildpackStack},
 					},
+					ccv3.Query{
+						Key:    ccv3.LifecycleFilter,
+						Values: []string{buildpackLifecycle},
+					},
 				))
 
 				paramBuildpack := fakeCloudControllerClient.UpdateBuildpackArgsForCall(0)
@@ -651,18 +735,19 @@ var _ = Describe("Buildpack", func() {
 		})
 	})
 
-	Describe("DeleteBuildpackByNameAndStack", func() {
+	Describe("DeleteBuildpackByNameAndStackAndLifecycle", func() {
 		var (
-			buildpackName  = "buildpack-name"
-			buildpackStack = "buildpack-stack"
-			buildpackGUID  = "buildpack-guid"
-			jobURL         = "buildpack-delete-job-url"
-			warnings       Warnings
-			executeErr     error
+			buildpackName      = "buildpack-name"
+			buildpackStack     = "buildpack-stack"
+			buildpackLifecycle = "buildpack-stack"
+			buildpackGUID      = "buildpack-guid"
+			jobURL             = "buildpack-delete-job-url"
+			warnings           Warnings
+			executeErr         error
 		)
 
 		JustBeforeEach(func() {
-			warnings, executeErr = actor.DeleteBuildpackByNameAndStack(buildpackName, buildpackStack)
+			warnings, executeErr = actor.DeleteBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle)
 		})
 
 		When("getting the buildpack fails", func() {
@@ -686,6 +771,10 @@ var _ = Describe("Buildpack", func() {
 						Key:    ccv3.StackFilter,
 						Values: []string{buildpackStack},
 					},
+					ccv3.Query{
+						Key:    ccv3.LifecycleFilter,
+						Values: []string{buildpackLifecycle},
+					},
 				))
 			})
 		})

actor/v7action/label.go

@@ -56,8 +56,8 @@ func (actor *Actor) GetStackLabels(stackName string) (map[string]types.NullStrin
 	return actor.extractLabels(resource.Metadata, warnings, err)
 }
 
-func (actor *Actor) GetBuildpackLabels(buildpackName string, buildpackStack string) (map[string]types.NullString, Warnings, error) {
-	resource, warnings, err := actor.GetBuildpackByNameAndStack(buildpackName, buildpackStack)
+func (actor *Actor) GetBuildpackLabels(buildpackName string, buildpackStack string, buildpackLifecycle string) (map[string]types.NullString, Warnings, error) {
+	resource, warnings, err := actor.GetBuildpackByNameAndStackAndLifecycle(buildpackName, buildpackStack, buildpackLifecycle)
 	return actor.extractLabels(resource.Metadata, warnings, err)
 }
 
@@ -81,8 +81,8 @@ func (actor *Actor) UpdateApplicationLabelsByApplicationName(appName string, spa
 	return actor.updateResourceMetadata("app", app.GUID, resources.Metadata{Labels: labels}, warnings)
 }
 
-func (actor *Actor) UpdateBuildpackLabelsByBuildpackNameAndStack(buildpackName string, stack string, labels map[string]types.NullString) (Warnings, error) {
-	buildpack, warnings, err := actor.GetBuildpackByNameAndStack(buildpackName, stack)
+func (actor *Actor) UpdateBuildpackLabelsByBuildpackNameAndStackAndLifecycle(buildpackName string, stack string, lifecycle string, labels map[string]types.NullString) (Warnings, error) {
+	buildpack, warnings, err := actor.GetBuildpackByNameAndStackAndLifecycle(buildpackName, stack, lifecycle)
 	if err != nil {
 		return warnings, err
 	}