Skip to content

Commit 3706ee6

Browse files
tomkennedy513tomkennedy513
committed
Add lifecycle flag to buildpacks and create-buildpack
Signed-off-by: Tom Kennedy <tom.kennedy@broadcom.com>
1 parent 55036aa commit 3706ee6

File tree

9 files changed

+116
-53
lines changed

9 files changed

+116
-53
lines changed

‎actor/v7action/buildpack.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ type Downloader interface {
2121
Download(url string, tmpDirPath string) (string, error)
2222
}
2323

24-
func (actor Actor) GetBuildpacks(labelSelector string) ([]resources.Buildpack, Warnings, error) {
24+
func (actor Actor) GetBuildpacks(labelSelector string, lifecycle string) ([]resources.Buildpack, Warnings, error) {
2525
queries := []ccv3.Query{ccv3.Query{Key: ccv3.OrderBy, Values: []string{ccv3.PositionOrder}}}
2626
if labelSelector != "" {
2727
queries = append(queries, ccv3.Query{Key: ccv3.LabelSelectorFilter, Values: []string{labelSelector}})
2828
}
2929

30+
if lifecycle != "" {
31+
queries = append(queries, ccv3.Query{Key: ccv3.LifecycleFilter, Values: []string{lifecycle}})
32+
}
33+
3034
buildpacks, warnings, err := actor.CloudControllerClient.GetBuildpacks(queries...)
3135

3236
return buildpacks, Warnings(warnings), err

‎actor/v7action/buildpack_test.go

+21-1
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,11 @@ var _ = Describe("Buildpack", func() {
198198
warnings Warnings
199199
executeErr error
200200
labelSelector string
201+
lifecycle string
201202
)
202203

203204
JustBeforeEach(func() {
204-
buildpacks, warnings, executeErr = actor.GetBuildpacks(labelSelector)
205+
buildpacks, warnings, executeErr = actor.GetBuildpacks(labelSelector, lifecycle)
205206
})
206207

207208
It("calls CloudControllerClient.GetBuildpacks()", func() {
@@ -265,6 +266,25 @@ var _ = Describe("Buildpack", func() {
265266
}))
266267
})
267268
})
269+
270+
When("lifecycle flag is provided", func() {
271+
BeforeEach(func() {
272+
ccBuildpacks := []resources.Buildpack{
273+
{Name: "cnb-1", Position: types.NullInt{Value: 1, IsSet: true}, Lifecycle: "cnb"},
274+
{Name: "cnb-2", Position: types.NullInt{Value: 2, IsSet: true}, Lifecycle: "cnb"},
275+
}
276+
fakeCloudControllerClient.GetBuildpacksReturns(
277+
ccBuildpacks,
278+
ccv3.Warnings{},
279+
nil)
280+
lifecycle = "cnb"
281+
})
282+
283+
It("passes the lifecycle as a query", func() {
284+
Expect(executeErr).ToNot(HaveOccurred())
285+
Expect(fakeCloudControllerClient.GetBuildpacksArgsForCall(0)).To(ContainElement(ccv3.Query{Key: ccv3.LifecycleFilter, Values: []string{"cnb"}}))
286+
})
287+
})
268288
})
269289

270290
Describe("CreateBuildpack", func() {

‎api/cloudcontroller/ccv3/query.go

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ const (
1717
GUIDFilter QueryKey = "guids"
1818
// LabelSelectorFilter is a query parameter for listing objects by label
1919
LabelSelectorFilter QueryKey = "label_selector"
20+
// Lifecycle fileter is a query parameter for listing buildpacks by lifecycle
21+
LifecycleFilter QueryKey = "lifecycle"
2022
// NameFilter is a query parameter for listing objects by name.
2123
NameFilter QueryKey = "names"
2224
// NoRouteFilter is a query parameter for skipping route creation and unmapping existing routes.

‎command/v7/actor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ type Actor interface {
100100
GetApplicationTasks(appName string, sortOrder v7action.SortOrder) ([]resources.Task, v7action.Warnings, error)
101101
GetApplicationsByNamesAndSpace(appNames []string, spaceGUID string) ([]resources.Application, v7action.Warnings, error)
102102
GetBuildpackLabels(buildpackName string, buildpackStack string) (map[string]types.NullString, v7action.Warnings, error)
103-
GetBuildpacks(labelSelector string) ([]resources.Buildpack, v7action.Warnings, error)
103+
GetBuildpacks(labelSelector string, lifecycle string) ([]resources.Buildpack, v7action.Warnings, error)
104104
GetCurrentUser() (configv3.User, error)
105105
GetDefaultDomain(orgGUID string) (resources.Domain, v7action.Warnings, error)
106106
GetDetailedAppSummary(appName string, spaceGUID string, withObfuscatedValues bool) (v7action.DetailedApplicationSummary, v7action.Warnings, error)

‎command/v7/buildpacks_command.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import (
1010
type BuildpacksCommand struct {
1111
BaseCommand
1212

13-
usage interface{} `usage:"CF_NAME buildpacks [--labels SELECTOR]\n\nEXAMPLES:\n CF_NAME buildpacks\n CF_NAME buildpacks --labels 'environment in (production,staging),tier in (backend)'\n CF_NAME buildpacks --labels 'env=dev,!chargeback-code,tier in (backend,worker)'"`
13+
usage interface{} `usage:"CF_NAME buildpacks [--labels SELECTOR] [--lifecycle buildpack|cnb]\n\nEXAMPLES:\n CF_NAME buildpacks\n CF_NAME buildpacks --labels 'environment in (production,staging),tier in (backend)'\n CF_NAME buildpacks --labels 'env=dev,!chargeback-code,tier in (backend,worker)'\n CF_NAME buildpacks --lifecycle cnb"`
1414
relatedCommands interface{} `related_commands:"create-buildpack, delete-buildpack, rename-buildpack, update-buildpack"`
1515
Labels string `long:"labels" description:"Selector to filter buildpacks by labels"`
16+
Lifecycle string `long:"lifecycle" description:"Filter buildpacks with by lifecycle ('buildpack' or 'cnb')"`
1617
}
1718

1819
func (cmd BuildpacksCommand) Execute(args []string) error {
@@ -31,7 +32,7 @@ func (cmd BuildpacksCommand) Execute(args []string) error {
3132
})
3233
cmd.UI.DisplayNewline()
3334

34-
buildpacks, warnings, err := cmd.Actor.GetBuildpacks(cmd.Labels)
35+
buildpacks, warnings, err := cmd.Actor.GetBuildpacks(cmd.Labels, cmd.Lifecycle)
3536
cmd.UI.DisplayWarnings(warnings)
3637
if err != nil {
3738
return err
@@ -48,8 +49,9 @@ func (cmd BuildpacksCommand) Execute(args []string) error {
4849
func (cmd BuildpacksCommand) displayTable(buildpacks []resources.Buildpack) {
4950
if len(buildpacks) > 0 {
5051
var keyValueTable = [][]string{
51-
{"position", "name", "stack", "enabled", "locked", "state", "filename"},
52+
{"position", "name", "stack", "enabled", "locked", "state", "filename", "lifecycle"},
5253
}
54+
5355
for _, buildpack := range buildpacks {
5456
keyValueTable = append(keyValueTable, []string{
5557
strconv.Itoa(buildpack.Position.Value),
@@ -59,6 +61,7 @@ func (cmd BuildpacksCommand) displayTable(buildpacks []resources.Buildpack) {
5961
strconv.FormatBool(buildpack.Locked.Value),
6062
buildpack.State,
6163
buildpack.Filename,
64+
buildpack.Lifecycle,
6265
})
6366
}
6467

‎command/v7/buildpacks_command_test.go

+42-18
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,22 @@ var _ = Describe("buildpacks Command", func() {
8787
})
8888

8989
It("passes the label selector to the actor", func() {
90-
labelSelector := fakeActor.GetBuildpacksArgsForCall(0)
90+
labelSelector, _ := fakeActor.GetBuildpacksArgsForCall(0)
9191
Expect(labelSelector).To(Equal("some-label-selector"))
9292
})
9393
})
9494

95+
When("the --lifecycle flag is used", func() {
96+
BeforeEach(func() {
97+
cmd.Lifecycle = "cnb"
98+
})
99+
100+
It("passes the lifecycle to the actor", func() {
101+
_, lifecycle := fakeActor.GetBuildpacksArgsForCall(0)
102+
Expect(lifecycle).To(Equal("cnb"))
103+
})
104+
})
105+
95106
When("getting buildpacks fails", func() {
96107
BeforeEach(func() {
97108
fakeActor.GetBuildpacksReturns(nil, v7action.Warnings{"some-warning-1", "some-warning-2"},
@@ -111,23 +122,35 @@ var _ = Describe("buildpacks Command", func() {
111122
BeforeEach(func() {
112123
buildpacks := []resources.Buildpack{
113124
{
114-
Name: "buildpack-1",
115-
Position: types.NullInt{Value: 1, IsSet: true},
116-
Enabled: types.NullBool{Value: true, IsSet: true},
117-
Locked: types.NullBool{Value: false, IsSet: true},
118-
State: constant.BuildpackReady,
119-
Filename: "buildpack-1.file",
120-
Stack: "buildpack-1-stack",
125+
Name: "buildpack-1",
126+
Position: types.NullInt{Value: 1, IsSet: true},
127+
Enabled: types.NullBool{Value: true, IsSet: true},
128+
Locked: types.NullBool{Value: false, IsSet: true},
129+
State: constant.BuildpackReady,
130+
Filename: "buildpack-1.file",
131+
Stack: "buildpack-1-stack",
132+
Lifecycle: "buildpack",
121133
},
122134

123135
{
124-
Name: "buildpack-2",
125-
Position: types.NullInt{Value: 2, IsSet: true},
126-
Enabled: types.NullBool{Value: false, IsSet: true},
127-
Locked: types.NullBool{Value: true, IsSet: true},
128-
State: constant.BuildpackAwaitingUpload,
129-
Filename: "buildpack-2.file",
130-
Stack: "",
136+
Name: "buildpack-2",
137+
Position: types.NullInt{Value: 2, IsSet: true},
138+
Enabled: types.NullBool{Value: false, IsSet: true},
139+
Locked: types.NullBool{Value: true, IsSet: true},
140+
State: constant.BuildpackAwaitingUpload,
141+
Filename: "buildpack-2.file",
142+
Stack: "",
143+
Lifecycle: "buildpack",
144+
},
145+
{
146+
Name: "cnb-1",
147+
Position: types.NullInt{Value: 1, IsSet: true},
148+
Enabled: types.NullBool{Value: true, IsSet: true},
149+
Locked: types.NullBool{Value: false, IsSet: true},
150+
State: constant.BuildpackReady,
151+
Filename: "cnb-1.cnb",
152+
Stack: "cnb-1-stack",
153+
Lifecycle: "cnb",
131154
},
132155
}
133156
fakeActor.GetBuildpacksReturns(buildpacks, v7action.Warnings{"some-warning-1", "some-warning-2"}, nil)
@@ -136,9 +159,10 @@ var _ = Describe("buildpacks Command", func() {
136159
Expect(executeErr).NotTo(HaveOccurred())
137160
Expect(testUI.Err).To(Say("some-warning-1"))
138161
Expect(testUI.Err).To(Say("some-warning-2"))
139-
Expect(testUI.Out).To(Say(`position\s+name\s+stack\s+enabled\s+locked\s+state\s+filename`))
140-
Expect(testUI.Out).To(Say(`1\s+buildpack-1\s+buildpack-1-stack\s+true\s+false\s+READY\s+buildpack-1.file`))
141-
Expect(testUI.Out).To(Say(`2\s+buildpack-2\s+false\s+true\s+AWAITING_UPLOAD\s+buildpack-2.file`))
162+
Expect(testUI.Out).To(Say(`position\s+name\s+stack\s+enabled\s+locked\s+state\s+filename\s+lifecycle`))
163+
Expect(testUI.Out).To(Say(`1\s+buildpack-1\s+buildpack-1-stack\s+true\s+false\s+READY\s+buildpack-1.file\s+buildpack`))
164+
Expect(testUI.Out).To(Say(`2\s+buildpack-2\s+false\s+true\s+AWAITING_UPLOAD\s+buildpack-2.file\s+buildpack`))
165+
Expect(testUI.Out).To(Say(`1\s+cnb-1\s+cnb-1-stack\s+true\s+false\s+READY\s+cnb-1.cnb\s+cnb`))
142166
})
143167
})
144168
When("there are no buildpacks", func() {

‎command/v7/create_buildpack_command.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type CreateBuildpackCommand struct {
2121
usage interface{} `usage:"CF_NAME create-buildpack BUILDPACK PATH POSITION [--disable]\n\nTIP:\n Path should be a zip file, a url to a zip file, or a local directory. Position is a positive integer, sets priority, and is sorted from lowest to highest."`
2222
relatedCommands interface{} `related_commands:"buildpacks, push"`
2323
Disable bool `long:"disable" description:"Disable the buildpack from being used for staging"`
24+
Lifecycle string `long:"lifecycle" description:"Lifecycle that this buildpack will use ('buildpack' or 'cnb')"`
2425

2526
ProgressBar v7action.SimpleProgressBar
2627
}
@@ -59,9 +60,10 @@ func (cmd CreateBuildpackCommand) Execute(args []string) error {
5960
}
6061

6162
createdBuildpack, warnings, err := cmd.Actor.CreateBuildpack(resources.Buildpack{
62-
Name: cmd.RequiredArgs.Buildpack,
63-
Position: types.NullInt{IsSet: true, Value: cmd.RequiredArgs.Position},
64-
Enabled: types.NullBool{IsSet: true, Value: !cmd.Disable},
63+
Name: cmd.RequiredArgs.Buildpack,
64+
Position: types.NullInt{IsSet: true, Value: cmd.RequiredArgs.Position},
65+
Enabled: types.NullBool{IsSet: true, Value: !cmd.Disable},
66+
Lifecycle: cmd.Lifecycle,
6567
})
6668
cmd.UI.DisplayWarnings(warnings)
6769
if err != nil {

‎command/v7/v7fakes/fake_actor.go

+10-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/buildpack_resource.go

+24-18
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,24 @@ type Buildpack struct {
3131
Links APILinks
3232
// Metadata is used for custom tagging of API resources
3333
Metadata *Metadata
34+
// Lifecycle is the lifecycle used with this buildpack
35+
Lifecycle string
3436
}
3537

3638
// MarshalJSON converts a Package into a Cloud Controller Package.
3739
func (buildpack Buildpack) MarshalJSON() ([]byte, error) {
3840
ccBuildpack := struct {
39-
Name string `json:"name,omitempty"`
40-
Stack string `json:"stack,omitempty"`
41-
Position *int `json:"position,omitempty"`
42-
Enabled *bool `json:"enabled,omitempty"`
43-
Locked *bool `json:"locked,omitempty"`
44-
Metadata *Metadata `json:"metadata,omitempty"`
41+
Name string `json:"name,omitempty"`
42+
Stack string `json:"stack,omitempty"`
43+
Position *int `json:"position,omitempty"`
44+
Enabled *bool `json:"enabled,omitempty"`
45+
Locked *bool `json:"locked,omitempty"`
46+
Metadata *Metadata `json:"metadata,omitempty"`
47+
Lifecycle string `json:"lifecycle,omitempty"`
4548
}{
46-
Name: buildpack.Name,
47-
Stack: buildpack.Stack,
49+
Name: buildpack.Name,
50+
Stack: buildpack.Stack,
51+
Lifecycle: buildpack.Lifecycle,
4852
}
4953

5054
if buildpack.Position.IsSet {
@@ -62,16 +66,17 @@ func (buildpack Buildpack) MarshalJSON() ([]byte, error) {
6266

6367
func (buildpack *Buildpack) UnmarshalJSON(data []byte) error {
6468
var ccBuildpack struct {
65-
GUID string `json:"guid,omitempty"`
66-
Links APILinks `json:"links,omitempty"`
67-
Name string `json:"name,omitempty"`
68-
Filename string `json:"filename,omitempty"`
69-
Stack string `json:"stack,omitempty"`
70-
State string `json:"state,omitempty"`
71-
Enabled types.NullBool `json:"enabled"`
72-
Locked types.NullBool `json:"locked"`
73-
Position types.NullInt `json:"position"`
74-
Metadata *Metadata `json:"metadata"`
69+
GUID string `json:"guid,omitempty"`
70+
Links APILinks `json:"links,omitempty"`
71+
Name string `json:"name,omitempty"`
72+
Filename string `json:"filename,omitempty"`
73+
Stack string `json:"stack,omitempty"`
74+
State string `json:"state,omitempty"`
75+
Enabled types.NullBool `json:"enabled"`
76+
Locked types.NullBool `json:"locked"`
77+
Position types.NullInt `json:"position"`
78+
Metadata *Metadata `json:"metadata"`
79+
Lifecycle string `json:"lifecycle"`
7580
}
7681

7782
err := cloudcontroller.DecodeJSON(data, &ccBuildpack)
@@ -89,6 +94,7 @@ func (buildpack *Buildpack) UnmarshalJSON(data []byte) error {
8994
buildpack.State = ccBuildpack.State
9095
buildpack.Links = ccBuildpack.Links
9196
buildpack.Metadata = ccBuildpack.Metadata
97+
buildpack.Lifecycle = ccBuildpack.Lifecycle
9298

9399
return nil
94100
}

0 commit comments

Comments
 (0)