msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #3978 from adamreese/dev-v3-const

Browse Source 
ref(*): convert const types to strings
pull/3989/head
Adam Reese 7 years ago committed by GitHub
parent 07b0658e76 3b9596c6ab
commit a06d14ae00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
52 changed files with 523 additions and 586 deletions
Show Stats Download Patch File Download Diff File

10
cmd/helm/history.go
Unescape View File

@ -50,10 +50,10 @@ The historical release set is printed as a formatted table, e.g:
$ helm history angry-bird --max=4 $ helm history angry-bird --max=4
REVISION UPDATED STATUS CHART DESCRIPTION REVISION UPDATED STATUS CHART DESCRIPTION
1 Mon Oct 3 10:15:13 2016 SUPERSEDED alpine-0.1.0 Initial install 1 Mon Oct 3 10:15:13 2016 superseded alpine-0.1.0 Initial install
2 Mon Oct 3 10:15:13 2016 SUPERSEDED alpine-0.1.0 Upgraded successfully 2 Mon Oct 3 10:15:13 2016 superseded alpine-0.1.0 Upgraded successfully
3 Mon Oct 3 10:15:13 2016 SUPERSEDED alpine-0.1.0 Rolled back to 2 3 Mon Oct 3 10:15:13 2016 superseded alpine-0.1.0 Rolled back to 2
4 Mon Oct 3 10:15:13 2016 DEPLOYED alpine-0.1.0 Upgraded successfully 4 Mon Oct 3 10:15:13 2016 deployed alpine-0.1.0 Upgraded successfully
` `
type historyCmd struct { type historyCmd struct {
@ -128,7 +128,7 @@ func getReleaseHistory(rls []*release.Release) (history releaseHistory) {
for i := len(rls) - 1; i >= 0; i-- { for i := len(rls) - 1; i >= 0; i-- {
r := rls[i] r := rls[i]
c := formatChartname(r.Chart) c := formatChartname(r.Chart)
s := r.Info.Status.Code.String() s := r.Info.Status.String()
v := r.Version v := r.Version
d := r.Info.Description d := r.Info.Description

36
cmd/helm/history_test.go
Unescape View File

@ -24,11 +24,11 @@ import (
) )
func TestHistoryCmd(t *testing.T) { func TestHistoryCmd(t *testing.T) {
mk := func(name string, vers int, code rpb.StatusCode) *rpb.Release { mk := func(name string, vers int, status rpb.ReleaseStatus) *rpb.Release {
return helm.ReleaseMock(&helm.MockReleaseOptions{ return helm.ReleaseMock(&helm.MockReleaseOptions{
Name: name, Name: name,
Version: vers, Version: vers,
StatusCode: code, Status: status,
}) })
} }
@ -37,39 +37,39 @@ func TestHistoryCmd(t *testing.T) {
name: "get history for release", name: "get history for release",
cmd: "history angry-bird", cmd: "history angry-bird",
rels: []*rpb.Release{ rels: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
mk("angry-bird", 2, rpb.Status_SUPERSEDED), mk("angry-bird", 2, rpb.StatusSuperseded),
mk("angry-bird", 1, rpb.Status_SUPERSEDED), mk("angry-bird", 1, rpb.StatusSuperseded),
}, },
matches: `REVISION\s+UPDATED\s+STATUS\s+CHART\s+DESCRIPTION \n1\s+(.*)\s+SUPERSEDED\s+foo-0.1.0-beta.1\s+Release mock\n2(.*)SUPERSEDED\s+foo-0.1.0-beta.1\s+Release mock\n3(.*)SUPERSEDED\s+foo-0.1.0-beta.1\s+Release mock\n4(.*)DEPLOYED\s+foo-0.1.0-beta.1\s+Release mock\n`, matches: `REVISION\s+UPDATED\s+STATUS\s+CHART\s+DESCRIPTION \n1\s+(.*)\s+superseded\s+foo-0.1.0-beta.1\s+Release mock\n2(.*)superseded\s+foo-0.1.0-beta.1\s+Release mock\n3(.*)superseded\s+foo-0.1.0-beta.1\s+Release mock\n4(.*)deployed\s+foo-0.1.0-beta.1\s+Release mock\n`,
}, },
{ {
name: "get history with max limit set", name: "get history with max limit set",
cmd: "history angry-bird --max 2", cmd: "history angry-bird --max 2",
rels: []*rpb.Release{ rels: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
}, },
matches: `REVISION\s+UPDATED\s+STATUS\s+CHART\s+DESCRIPTION \n3\s+(.*)\s+SUPERSEDED\s+foo-0.1.0-beta.1\s+Release mock\n4\s+(.*)\s+DEPLOYED\s+foo-0.1.0-beta.1\s+Release mock\n`, matches: `REVISION\s+UPDATED\s+STATUS\s+CHART\s+DESCRIPTION \n3\s+(.*)\s+superseded\s+foo-0.1.0-beta.1\s+Release mock\n4\s+(.*)\s+deployed\s+foo-0.1.0-beta.1\s+Release mock\n`,
}, },
{ {
name: "get history with yaml output format", name: "get history with yaml output format",
cmd: "history angry-bird --output yaml", cmd: "history angry-bird --output yaml",
rels: []*rpb.Release{ rels: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
}, },
matches: "- chart: foo-0.1.0-beta.1\n description: Release mock\n revision: 3\n status: SUPERSEDED\n updated: (.*)\n- chart: foo-0.1.0-beta.1\n description: Release mock\n revision: 4\n status: DEPLOYED\n updated: (.*)\n\n", matches: "- chart: foo-0.1.0-beta.1\n description: Release mock\n revision: 3\n status: superseded\n updated: (.*)\n- chart: foo-0.1.0-beta.1\n description: Release mock\n revision: 4\n status: deployed\n updated: (.*)\n\n",
}, },
{ {
name: "get history with json output format", name: "get history with json output format",
cmd: "history angry-bird --output json", cmd: "history angry-bird --output json",
rels: []*rpb.Release{ rels: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
}, },
matches: `[{"revision":3,"updated":".*","status":"SUPERSEDED","chart":"foo\-0.1.0-beta.1","description":"Release mock"},{"revision":4,"updated":".*","status":"DEPLOYED","chart":"foo\-0.1.0-beta.1","description":"Release mock"}]\n`, matches: `[{"revision":3,"updated":".*","status":"superseded","chart":"foo\-0.1.0-beta.1","description":"Release mock"},{"revision":4,"updated":".*","status":"deployed","chart":"foo\-0.1.0-beta.1","description":"Release mock"}]\n`,
}, },
} }
testReleaseCmd(t, tests) testReleaseCmd(t, tests)

52
cmd/helm/list.go
Unescape View File

@ -102,7 +102,7 @@ func newListCmd(client helm.Interface, out io.Writer) *cobra.Command {
f.BoolVarP(&list.sortDesc, "reverse", "r", false, "reverse the sort order") f.BoolVarP(&list.sortDesc, "reverse", "r", false, "reverse the sort order")
f.IntVarP(&list.limit, "max", "m", 256, "maximum number of releases to fetch") f.IntVarP(&list.limit, "max", "m", 256, "maximum number of releases to fetch")
f.StringVarP(&list.offset, "offset", "o", "", "next release name in the list, used to offset from start value") f.StringVarP(&list.offset, "offset", "o", "", "next release name in the list, used to offset from start value")
f.BoolVarP(&list.all, "all", "a", false, "show all releases, not just the ones marked DEPLOYED") f.BoolVarP(&list.all, "all", "a", false, "show all releases, not just the ones marked deployed")
f.BoolVar(&list.deleted, "deleted", false, "show deleted releases") f.BoolVar(&list.deleted, "deleted", false, "show deleted releases")
f.BoolVar(&list.deleting, "deleting", false, "show releases that are currently being deleted") f.BoolVar(&list.deleting, "deleting", false, "show releases that are currently being deleted")
f.BoolVar(&list.deployed, "deployed", false, "show deployed releases. If no other is specified, this will be automatically enabled") f.BoolVar(&list.deployed, "deployed", false, "show deployed releases. If no other is specified, this will be automatically enabled")
@ -115,14 +115,14 @@ func newListCmd(client helm.Interface, out io.Writer) *cobra.Command {
} }
func (l *listCmd) run() error { func (l *listCmd) run() error {
sortBy := hapi.ListSort_NAME sortBy := hapi.ListSortName
if l.byDate { if l.byDate {
sortBy = hapi.ListSort_LAST_RELEASED sortBy = hapi.ListSortLastReleased
} }
sortOrder := hapi.ListSort_ASC sortOrder := hapi.ListSortAsc
if l.sortDesc { if l.sortDesc {
sortOrder = hapi.ListSort_DESC sortOrder = hapi.ListSortDesc
} }
stats := l.statusCodes() stats := l.statusCodes()
@ -131,8 +131,8 @@ func (l *listCmd) run() error {
helm.ReleaseListLimit(l.limit), helm.ReleaseListLimit(l.limit),
helm.ReleaseListOffset(l.offset), helm.ReleaseListOffset(l.offset),
helm.ReleaseListFilter(l.filter), helm.ReleaseListFilter(l.filter),
helm.ReleaseListSort(int(sortBy)), helm.ReleaseListSort(sortBy),
helm.ReleaseListOrder(int(sortOrder)), helm.ReleaseListOrder(sortOrder),
helm.ReleaseListStatuses(stats), helm.ReleaseListStatuses(stats),
) )
@ -181,42 +181,42 @@ func filterList(rels []*release.Release) []*release.Release {
} }
// statusCodes gets the list of status codes that are to be included in the results. // statusCodes gets the list of status codes that are to be included in the results.
func (l *listCmd) statusCodes() []release.StatusCode { func (l *listCmd) statusCodes() []release.ReleaseStatus {
if l.all { if l.all {
return []release.StatusCode{ return []release.ReleaseStatus{
release.Status_UNKNOWN, release.StatusUnknown,
release.Status_DEPLOYED, release.StatusDeployed,
release.Status_DELETED, release.StatusDeleted,
release.Status_DELETING, release.StatusDeleting,
release.Status_FAILED, release.StatusFailed,
release.Status_PENDING_INSTALL, release.StatusPendingInstall,
release.Status_PENDING_UPGRADE, release.StatusPendingUpgrade,
release.Status_PENDING_ROLLBACK, release.StatusPendingRollback,
} }
} }
status := []release.StatusCode{} status := []release.ReleaseStatus{}
if l.deployed { if l.deployed {
status = append(status, release.Status_DEPLOYED) status = append(status, release.StatusDeployed)
} }
if l.deleted { if l.deleted {
status = append(status, release.Status_DELETED) status = append(status, release.StatusDeleted)
} }
if l.deleting { if l.deleting {
status = append(status, release.Status_DELETING) status = append(status, release.StatusDeleting)
} }
if l.failed { if l.failed {
status = append(status, release.Status_FAILED) status = append(status, release.StatusFailed)
} }
if l.superseded { if l.superseded {
status = append(status, release.Status_SUPERSEDED) status = append(status, release.StatusSuperseded)
} }
if l.pending { if l.pending {
status = append(status, release.Status_PENDING_INSTALL, release.Status_PENDING_UPGRADE, release.Status_PENDING_ROLLBACK) status = append(status, release.StatusPendingInstall, release.StatusPendingUpgrade, release.StatusPendingRollback)
} }
// Default case. // Default case.
if len(status) == 0 { if len(status) == 0 {
status = append(status, release.Status_DEPLOYED, release.Status_FAILED) status = append(status, release.StatusDeployed, release.StatusFailed)
} }
return status return status
} }
@ -233,7 +233,7 @@ func formatList(rels []*release.Release, colWidth uint) string {
if tspb := r.Info.LastDeployed; !tspb.IsZero() { if tspb := r.Info.LastDeployed; !tspb.IsZero() {
t = tspb.String() t = tspb.String()
} }
s := r.Info.Status.Code.String() s := r.Info.Status.String()
v := r.Version v := r.Version
n := r.Namespace n := r.Namespace
table.AddRow(r.Name, v, t, s, c, n) table.AddRow(r.Name, v, t, s, c, n)

32
cmd/helm/list_test.go
Unescape View File

@ -39,14 +39,14 @@ func TestListCmd(t *testing.T) {
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas"}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas"}),
}, },
matches: `NAME\s+REVISION\s+UPDATED\s+STATUS\s+CHART\s+NAMESPACE\natlas\s+1\s+(.*)\s+DEPLOYED\s+foo-0.1.0-beta.1\s+default`, matches: `NAME\s+REVISION\s+UPDATED\s+STATUS\s+CHART\s+NAMESPACE\natlas\s+1\s+(.*)\s+deployed\s+foo-0.1.0-beta.1\s+default`,
}, },
{ {
name: "list, one deployed, one failed", name: "list, one deployed, one failed",
cmd: "list -q", cmd: "list -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_FAILED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusFailed}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
matches: "thomas-guide\natlas-guide", matches: "thomas-guide\natlas-guide",
}, },
@ -54,8 +54,8 @@ func TestListCmd(t *testing.T) {
name: "with a release, multiple flags", name: "with a release, multiple flags",
cmd: "list --deleted --deployed --failed -q", cmd: "list --deleted --deployed --failed -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_DELETED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusDeleted}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
// Note: We're really only testing that the flags parsed correctly. Which results are returned // Note: We're really only testing that the flags parsed correctly. Which results are returned
// depends on the backend. And until pkg/helm is done, we can't mock this. // depends on the backend. And until pkg/helm is done, we can't mock this.
@ -65,8 +65,8 @@ func TestListCmd(t *testing.T) {
name: "with a release, multiple flags", name: "with a release, multiple flags",
cmd: "list --all -q", cmd: "list --all -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_DELETED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusDeleted}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
// See note on previous test. // See note on previous test.
matches: "thomas-guide\natlas-guide", matches: "thomas-guide\natlas-guide",
@ -75,8 +75,8 @@ func TestListCmd(t *testing.T) {
name: "with a release, multiple flags, deleting", name: "with a release, multiple flags, deleting",
cmd: "list --all -q", cmd: "list --all -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_DELETING}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusDeleting}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
// See note on previous test. // See note on previous test.
matches: "thomas-guide\natlas-guide", matches: "thomas-guide\natlas-guide",
@ -95,8 +95,8 @@ func TestListCmd(t *testing.T) {
name: "with a pending release, multiple flags", name: "with a pending release, multiple flags",
cmd: "list --all -q", cmd: "list --all -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_PENDING_INSTALL}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusPendingInstall}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
matches: "thomas-guide\natlas-guide", matches: "thomas-guide\natlas-guide",
}, },
@ -104,10 +104,10 @@ func TestListCmd(t *testing.T) {
name: "with a pending release, pending flag", name: "with a pending release, pending flag",
cmd: "list --pending -q", cmd: "list --pending -q",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_PENDING_INSTALL}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusPendingInstall}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "wild-idea", StatusCode: release.Status_PENDING_UPGRADE}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "wild-idea", Status: release.StatusPendingUpgrade}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-maps", StatusCode: release.Status_PENDING_ROLLBACK}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-maps", Status: release.StatusPendingRollback}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", StatusCode: release.Status_DEPLOYED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide", Status: release.StatusDeployed}),
}, },
matches: "thomas-guide\nwild-idea\ncrazy-maps", matches: "thomas-guide\nwild-idea\ncrazy-maps",
}, },
@ -116,7 +116,7 @@ func TestListCmd(t *testing.T) {
cmd: "list", cmd: "list",
rels: []*release.Release{ rels: []*release.Release{
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide"}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide"}),
helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", StatusCode: release.Status_FAILED}), helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide", Status: release.StatusFailed}),
}, },
matches: "thomas-guide", matches: "thomas-guide",
}, },

2
cmd/helm/release_testing.go
Unescape View File

@ -89,7 +89,7 @@ func (t *releaseTestCmd) run() (err error) {
break break
} }
if res.Status == release.TestRun_FAILURE { if res.Status == release.TestRunFailure {
testErr.failed++ testErr.failed++
} }

22
cmd/helm/release_testing_test.go
Unescape View File

@ -27,43 +27,43 @@ func TestReleaseTesting(t *testing.T) {
{ {
name: "basic test", name: "basic test",
cmd: "test example-release", cmd: "test example-release",
responses: map[string]release.TestRunStatus{"PASSED: green lights everywhere": release.TestRun_SUCCESS}, responses: map[string]release.TestRunStatus{"PASSED: green lights everywhere": release.TestRunSuccess},
wantError: false, wantError: false,
}, },
{ {
name: "test failure", name: "test failure",
cmd: "test example-fail", cmd: "test example-fail",
responses: map[string]release.TestRunStatus{"FAILURE: red lights everywhere": release.TestRun_FAILURE}, responses: map[string]release.TestRunStatus{"FAILURE: red lights everywhere": release.TestRunFailure},
wantError: true, wantError: true,
}, },
{ {
name: "test unknown", name: "test unknown",
cmd: "test example-unknown", cmd: "test example-unknown",
responses: map[string]release.TestRunStatus{"UNKNOWN: yellow lights everywhere": release.TestRun_UNKNOWN}, responses: map[string]release.TestRunStatus{"UNKNOWN: yellow lights everywhere": release.TestRunUnknown},
wantError: false, wantError: false,
}, },
{ {
name: "test error", name: "test error",
cmd: "test example-error", cmd: "test example-error",
responses: map[string]release.TestRunStatus{"ERROR: yellow lights everywhere": release.TestRun_FAILURE}, responses: map[string]release.TestRunStatus{"ERROR: yellow lights everywhere": release.TestRunFailure},
wantError: true, wantError: true,
}, },
{ {
name: "test running", name: "test running",
cmd: "test example-running", cmd: "test example-running",
responses: map[string]release.TestRunStatus{"RUNNING: things are happpeningggg": release.TestRun_RUNNING}, responses: map[string]release.TestRunStatus{"RUNNING: things are happpeningggg": release.TestRunRunning},
wantError: false, wantError: false,
}, },
{ {
name: "multiple tests example", name: "multiple tests example",
cmd: "test example-suite", cmd: "test example-suite",
responses: map[string]release.TestRunStatus{ responses: map[string]release.TestRunStatus{
"RUNNING: things are happpeningggg": release.TestRun_RUNNING, "RUNNING: things are happpeningggg": release.TestRunRunning,
"PASSED: party time": release.TestRun_SUCCESS, "PASSED: party time": release.TestRunSuccess,
"RUNNING: things are happening again": release.TestRun_RUNNING, "RUNNING: things are happening again": release.TestRunRunning,
"FAILURE: good thing u checked :)": release.TestRun_FAILURE, "FAILURE: good thing u checked :)": release.TestRunFailure,
"RUNNING: things are happpeningggg yet again": release.TestRun_RUNNING, "RUNNING: things are happpeningggg yet again": release.TestRunRunning,
"PASSED: feel free to party again": release.TestRun_SUCCESS}, "PASSED: feel free to party again": release.TestRunSuccess},
wantError: true, wantError: true,
}, },
} }

16
cmd/helm/status.go
Unescape View File

@ -38,7 +38,7 @@ This command shows the status of a named release.
The status consists of: The status consists of:
- last deployment time - last deployment time
- k8s namespace in which the release lives - k8s namespace in which the release lives
- state of the release (can be: UNKNOWN, DEPLOYED, DELETED, SUPERSEDED, FAILED or DELETING) - state of the release (can be: unknown, deployed, deleted, superseded, failed or deleting)
- list of resources that this release consists of, sorted by kind - list of resources that this release consists of, sorted by kind
- details on last test suite run, if applicable - details on last test suite run, if applicable
- additional notes provided by the chart - additional notes provided by the chart
@ -114,25 +114,25 @@ func PrintStatus(out io.Writer, res *hapi.GetReleaseStatusResponse) {
fmt.Fprintf(out, "LAST DEPLOYED: %s\n", res.Info.LastDeployed) fmt.Fprintf(out, "LAST DEPLOYED: %s\n", res.Info.LastDeployed)
} }
fmt.Fprintf(out, "NAMESPACE: %s\n", res.Namespace) fmt.Fprintf(out, "NAMESPACE: %s\n", res.Namespace)
fmt.Fprintf(out, "STATUS: %s\n", res.Info.Status.Code.String()) fmt.Fprintf(out, "STATUS: %s\n", res.Info.Status.String())
fmt.Fprintf(out, "\n") fmt.Fprintf(out, "\n")
if len(res.Info.Status.Resources) > 0 { if len(res.Info.Resources) > 0 {
re := regexp.MustCompile(" +") re := regexp.MustCompile(" +")
w := tabwriter.NewWriter(out, 0, 0, 2, ' ', tabwriter.TabIndent) w := tabwriter.NewWriter(out, 0, 0, 2, ' ', tabwriter.TabIndent)
fmt.Fprintf(w, "RESOURCES:\n%s\n", re.ReplaceAllString(res.Info.Status.Resources, "\t")) fmt.Fprintf(w, "RESOURCES:\n%s\n", re.ReplaceAllString(res.Info.Resources, "\t"))
w.Flush() w.Flush()
} }
if res.Info.Status.LastTestSuiteRun != nil { if res.Info.LastTestSuiteRun != nil {
lastRun := res.Info.Status.LastTestSuiteRun lastRun := res.Info.LastTestSuiteRun
fmt.Fprintf(out, "TEST SUITE:\n%s\n%s\n\n%s\n", fmt.Fprintf(out, "TEST SUITE:\n%s\n%s\n\n%s\n",
fmt.Sprintf("Last Started: %s", lastRun.StartedAt), fmt.Sprintf("Last Started: %s", lastRun.StartedAt),
fmt.Sprintf("Last Completed: %s", lastRun.CompletedAt), fmt.Sprintf("Last Completed: %s", lastRun.CompletedAt),
formatTestResults(lastRun.Results)) formatTestResults(lastRun.Results))
} }
if len(res.Info.Status.Notes) > 0 { if len(res.Info.Notes) > 0 {
fmt.Fprintf(out, "NOTES:\n%s\n", res.Info.Status.Notes) fmt.Fprintf(out, "NOTES:\n%s\n", res.Info.Notes)
} }
} }

58
cmd/helm/status_test.go
Unescape View File

@ -29,42 +29,42 @@ func TestStatusCmd(t *testing.T) {
{ {
name: "get status of a deployed release", name: "get status of a deployed release",
cmd: "status flummoxed-chickadee", cmd: "status flummoxed-chickadee",
matches: outputWithStatus("DEPLOYED"), matches: outputWithStatus("deployed"),
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
}), }),
}, },
}, },
{ {
name: "get status of a deployed release with notes", name: "get status of a deployed release with notes",
cmd: "status flummoxed-chickadee", cmd: "status flummoxed-chickadee",
matches: outputWithStatus("DEPLOYED\n\nNOTES:\nrelease notes\n"), matches: outputWithStatus("deployed\n\nNOTES:\nrelease notes\n"),
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
Notes: "release notes", Notes: "release notes",
}), }),
}, },
}, },
{ {
name: "get status of a deployed release with notes in json", name: "get status of a deployed release with notes in json",
cmd: "status flummoxed-chickadee -o json", cmd: "status flummoxed-chickadee -o json",
matches: `{"name":"flummoxed-chickadee","info":{"status":{"code":1,"notes":"release notes"},"first_deployed":(.*),"last_deployed":(.*)}}`, matches: `{"name":"flummoxed-chickadee","info":{"first_deployed":(.*),"last_deployed":(.*),"deleted":(.*),"status":"deployed","notes":"release notes"}}`,
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
Notes: "release notes", Notes: "release notes",
}), }),
}, },
}, },
{ {
name: "get status of a deployed release with resources", name: "get status of a deployed release with resources",
cmd: "status flummoxed-chickadee", cmd: "status flummoxed-chickadee",
matches: outputWithStatus("DEPLOYED\n\nRESOURCES:\nresource A\nresource B\n\n"), matches: outputWithStatus("deployed\n\nRESOURCES:\nresource A\nresource B\n\n"),
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
Resources: "resource A\nresource B\n", Resources: "resource A\nresource B\n",
}), }),
}, },
@ -72,10 +72,10 @@ func TestStatusCmd(t *testing.T) {
{ {
name: "get status of a deployed release with resources in YAML", name: "get status of a deployed release with resources in YAML",
cmd: "status flummoxed-chickadee -o yaml", cmd: "status flummoxed-chickadee -o yaml",
matches: "info:\n (.*)first_deployed:\n (.*)seconds: 242085845\n (.*)last_deployed:\n (.*)seconds: 242085845\n (.*)status:\n code: 1\n (.*)resources: |\n (.*)resource A\n (.*)resource B\nname: flummoxed-chickadee\n", matches: `info:\n deleted: .*\n first_deployed: .*\n last_deployed: .*\n resources: |\n resource A\n resource B\n status: deployed\nname: flummoxed-chickadee\n`,
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
Resources: "resource A\nresource B\n", Resources: "resource A\nresource B\n",
}), }),
}, },
@ -84,27 +84,27 @@ func TestStatusCmd(t *testing.T) {
name: "get status of a deployed release with test suite", name: "get status of a deployed release with test suite",
cmd: "status flummoxed-chickadee", cmd: "status flummoxed-chickadee",
matches: outputWithStatus( matches: outputWithStatus(
"DEPLOYED\n\nTEST SUITE:\nLast Started: (.*)\nLast Completed: (.*)\n\n" + "deployed\n\nTEST SUITE:\nLast Started: (.*)\nLast Completed: (.*)\n\n" +
"TEST \tSTATUS (.*)\tINFO (.*)\tSTARTED (.*)\tCOMPLETED (.*)\n" + "TEST \tSTATUS (.*)\tINFO (.*)\tSTARTED (.*)\tCOMPLETED (.*)\n" +
"test run 1\tSUCCESS (.*)\textra info\t(.*)\t(.*)\n" + "test run 1\tsuccess (.*)\textra info\t(.*)\t(.*)\n" +
"test run 2\tFAILURE (.*)\t (.*)\t(.*)\t(.*)\n"), "test run 2\tfailure (.*)\t (.*)\t(.*)\t(.*)\n"),
rels: []*release.Release{ rels: []*release.Release{
releaseMockWithStatus(&release.Status{ releaseMockWithStatus(&release.Info{
Code: release.Status_DEPLOYED, Status: release.StatusDeployed,
LastTestSuiteRun: &release.TestSuite{ LastTestSuiteRun: &release.TestSuite{
StartedAt: time.Now(), StartedAt: time.Now(),
CompletedAt: time.Now(), CompletedAt: time.Now(),
Results: []*release.TestRun{ Results: []*release.TestRun{
{ {
Name: "test run 1", Name: "test run 1",
Status: release.TestRun_SUCCESS, Status: release.TestRunSuccess,
Info: "extra info", Info: "extra info",
StartedAt: time.Now(), StartedAt: time.Now(),
CompletedAt: time.Now(), CompletedAt: time.Now(),
}, },
{ {
Name: "test run 2", Name: "test run 2",
Status: release.TestRun_FAILURE, Status: release.TestRunFailure,
StartedAt: time.Now(), StartedAt: time.Now(),
CompletedAt: time.Now(), CompletedAt: time.Now(),
}, },
@ -121,13 +121,11 @@ func outputWithStatus(status string) string {
return fmt.Sprintf(`LAST DEPLOYED:(.*)\nNAMESPACE: \nSTATUS: %s`, status) return fmt.Sprintf(`LAST DEPLOYED:(.*)\nNAMESPACE: \nSTATUS: %s`, status)
} }
func releaseMockWithStatus(status *release.Status) *release.Release { func releaseMockWithStatus(info *release.Info) *release.Release {
info.FirstDeployed = time.Now()
info.LastDeployed = time.Now()
return &release.Release{ return &release.Release{
Name: "flummoxed-chickadee", Name: "flummoxed-chickadee",
Info: &release.Info{ Info: info,
FirstDeployed: time.Now(),
LastDeployed: time.Now(),
Status: status,
},
} }
} }

55
pkg/hapi/release/hook.go
Unescape View File

@ -17,53 +17,32 @@ package release
import "time" import "time"
type HookEvent int type HookEvent string
const ( const (
Hook_UNKNOWN HookEvent = iota HookPreInstall HookEvent = "pre-install"
Hook_PRE_INSTALL HookPostInstall HookEvent = "post-install"
Hook_POST_INSTALL HookPreDelete HookEvent = "pre-delete"
Hook_PRE_DELETE HookPostDelete HookEvent = "post-delete"
Hook_POST_DELETE HookPreUpgrade HookEvent = "pre-upgrade"
Hook_PRE_UPGRADE HookPostUpgrade HookEvent = "post-upgrade"
Hook_POST_UPGRADE HookPreRollback HookEvent = "pre-rollback"
Hook_PRE_ROLLBACK HookPostRollback HookEvent = "post-rollback"
Hook_POST_ROLLBACK HookReleaseTestSuccess HookEvent = "release-test-success"
Hook_RELEASE_TEST_SUCCESS HookReleaseTestFailure HookEvent = "release-test-failure"
Hook_RELEASE_TEST_FAILURE
) )
var eventNames = [...]string{ func (x HookEvent) String() string { return string(x) }
"UNKNOWN",
"PRE_INSTALL",
"POST_INSTALL",
"PRE_DELETE",
"POST_DELETE",
"PRE_UPGRADE",
"POST_UPGRADE",
"PRE_ROLLBACK",
"POST_ROLLBACK",
"RELEASE_TEST_SUCCESS",
"RELEASE_TEST_FAILURE",
}
func (x HookEvent) String() string { return eventNames[x] }
type HookDeletePolicy int type HookDeletePolicy string
const ( const (
Hook_SUCCEEDED HookDeletePolicy = iota HookSucceeded HookDeletePolicy = "succeeded"
Hook_FAILED HookFailed HookDeletePolicy = "failed"
Hook_BEFORE_HOOK_CREATION HookBeforeHookCreation HookDeletePolicy = "before-hook-creation"
) )
var deletePolicyNames = [...]string{ func (x HookDeletePolicy) String() string { return string(x) }
"SUCCEEDED",
"FAILED",
"BEFORE_HOOK_CREATION",
}
func (x HookDeletePolicy) String() string { return deletePolicyNames[x] }
// Hook defines a hook object. // Hook defines a hook object.
type Hook struct { type Hook struct {

9
pkg/hapi/release/info.go
Unescape View File

@ -19,11 +19,18 @@ import "time"
// Info describes release information. // Info describes release information.
type Info struct { type Info struct {
Status *Status `json:"status,omitempty"`
FirstDeployed time.Time `json:"first_deployed,omitempty"` FirstDeployed time.Time `json:"first_deployed,omitempty"`
LastDeployed time.Time `json:"last_deployed,omitempty"` LastDeployed time.Time `json:"last_deployed,omitempty"`
// Deleted tracks when this object was deleted. // Deleted tracks when this object was deleted.
Deleted time.Time `json:"deleted,omitempty"` Deleted time.Time `json:"deleted,omitempty"`
// Description is human-friendly "log entry" about this release. // Description is human-friendly "log entry" about this release.
Description string `json:"Description,omitempty"` Description string `json:"Description,omitempty"`
// Status is the current state of the release
Status ReleaseStatus `json:"status,omitempty"`
// Cluster resources as kubectl would print them.
Resources string `json:"resources,omitempty"`
// Contains the rendered templates/NOTES.txt if available
Notes string `json:"notes,omitempty"`
// LastTestSuiteRun provides results on the last test run on a release
LastTestSuiteRun *TestSuite `json:"last_test_suite_run,omitempty"`
} }

63
pkg/hapi/release/status.go
Unescape View File

@ -15,50 +15,27 @@ limitations under the License.
package release package release
type StatusCode int type ReleaseStatus string
const ( const (
// Status_UNKNOWN indicates that a release is in an uncertain state. // StatusUnknown indicates that a release is in an uncertain state.
Status_UNKNOWN StatusCode = iota StatusUnknown ReleaseStatus = "unknown"
// Status_DEPLOYED indicates that the release has been pushed to Kubernetes. // StatusDeployed indicates that the release has been pushed to Kubernetes.
Status_DEPLOYED StatusDeployed ReleaseStatus = "deployed"
// Status_DELETED indicates that a release has been deleted from Kubermetes. // StatusDeleted indicates that a release has been deleted from Kubermetes.
Status_DELETED StatusDeleted ReleaseStatus = "deleted"
// Status_SUPERSEDED indicates that this release object is outdated and a newer one exists. // StatusSuperseded indicates that this release object is outdated and a newer one exists.
Status_SUPERSEDED StatusSuperseded ReleaseStatus = "superseded"
// Status_FAILED indicates that the release was not successfully deployed. // StatusFailed indicates that the release was not successfully deployed.
Status_FAILED StatusFailed ReleaseStatus = "failed"
// Status_DELETING indicates that a delete operation is underway. // StatusDeleting indicates that a delete operation is underway.
Status_DELETING StatusDeleting ReleaseStatus = "deleting"
// Status_PENDING_INSTALL indicates that an install operation is underway. // StatusPendingInstall indicates that an install operation is underway.
Status_PENDING_INSTALL StatusPendingInstall ReleaseStatus = "pending-install"
// Status_PENDING_UPGRADE indicates that an upgrade operation is underway. // StatusPendingUpgrade indicates that an upgrade operation is underway.
Status_PENDING_UPGRADE StatusPendingUpgrade ReleaseStatus = "pending-upgrade"
// Status_PENDING_ROLLBACK indicates that an rollback operation is underway. // StatusPendingRollback indicates that an rollback operation is underway.
Status_PENDING_ROLLBACK StatusPendingRollback ReleaseStatus = "pending-rollback"
) )
var statusCodeNames = [...]string{ func (x ReleaseStatus) String() string { return string(x) }
"UNKNOWN",
"DEPLOYED",
"DELETED",
"SUPERSEDED",
"FAILED",
"DELETING",
"PENDING_INSTALL",
"PENDING_UPGRADE",
"PENDING_ROLLBACK",
}
func (x StatusCode) String() string { return statusCodeNames[x] }
// Status defines the status of a release.
type Status struct {
Code StatusCode `json:"code,omitempty"`
// Cluster resources as kubectl would print them.
Resources string `json:"resources,omitempty"`
// Contains the rendered templates/NOTES.txt if available
Notes string `json:"notes,omitempty"`
// LastTestSuiteRun provides results on the last test run on a release
LastTestSuiteRun *TestSuite `json:"last_test_suite_run,omitempty"`
}

19
pkg/hapi/release/test_run.go
Unescape View File

@ -17,23 +17,16 @@ package release
import "time" import "time"
type TestRunStatus int type TestRunStatus string
const ( const (
TestRun_UNKNOWN TestRunStatus = iota TestRunUnknown TestRunStatus = "unknown"
TestRun_SUCCESS TestRunSuccess TestRunStatus = "success"
TestRun_FAILURE TestRunFailure TestRunStatus = "failure"
TestRun_RUNNING TestRunRunning TestRunStatus = "running"
) )
var testRunStatusNames = [...]string{ func (x TestRunStatus) String() string { return string(x) }
"UNKNOWN",
"SUCCESS",
"FAILURE",
"RUNNING",
}
func (x TestRunStatus) String() string { return testRunStatusNames[x] }
type TestRun struct { type TestRun struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`

32
pkg/hapi/tiller.go
Unescape View File

@ -21,37 +21,21 @@ import (
) )
// SortBy defines sort operations. // SortBy defines sort operations.
type ListSortBy int type ListSortBy string
const ( const (
ListSort_UNKNOWN ListSortBy = iota ListSortName ListSortBy = "name"
ListSort_NAME ListSortLastReleased ListSortBy = "last-released"
ListSort_LAST_RELEASED
) )
var sortByNames = [...]string{
"UNKNOWN",
"NAME",
"LAST_RELEASED",
}
func (x ListSortBy) String() string { return sortByNames[x] }
// SortOrder defines sort orders to augment sorting operations. // SortOrder defines sort orders to augment sorting operations.
type ListSortOrder int type ListSortOrder string
const ( const (
ListSort_ASC ListSortOrder = iota ListSortAsc ListSortOrder = "ascending"
ListSort_DESC ListSortDesc ListSortOrder = "descending"
) )
var sortOrderNames = [...]string{
"ASC",
"DESC",
}
func (x ListSortOrder) String() string { return sortOrderNames[x] }
// ListReleasesRequest requests a list of releases. // ListReleasesRequest requests a list of releases.
// //
// Releases can be retrieved in chunks by setting limit and offset. // Releases can be retrieved in chunks by setting limit and offset.
@ -73,8 +57,8 @@ type ListReleasesRequest struct {
// Anything that matches the regexp will be included in the results. // Anything that matches the regexp will be included in the results.
Filter string `json:"filter,omitempty"` Filter string `json:"filter,omitempty"`
// SortOrder is the ordering directive used for sorting. // SortOrder is the ordering directive used for sorting.
SortOrder ListSortOrder `json:"sort_order,omitempty"` SortOrder ListSortOrder `json:"sort_order,omitempty"`
StatusCodes []release.StatusCode `json:"status_codes,omitempty"` StatusCodes []release.ReleaseStatus `json:"status_codes,omitempty"`
} }
// GetReleaseStatusRequest is a request to get the status of a release. // GetReleaseStatusRequest is a request to get the status of a release.

20
pkg/helm/fake.go
Unescape View File

@ -178,11 +178,11 @@ metadata:
// MockReleaseOptions allows for user-configurable options on mock release objects. // MockReleaseOptions allows for user-configurable options on mock release objects.
type MockReleaseOptions struct { type MockReleaseOptions struct {
Name string Name string
Version int Version int
Chart *chart.Chart Chart *chart.Chart
StatusCode release.StatusCode Status release.ReleaseStatus
Namespace string Namespace string
} }
// ReleaseMock creates a mock release object based on options set by MockReleaseOptions. This function should typically not be used outside of testing. // ReleaseMock creates a mock release object based on options set by MockReleaseOptions. This function should typically not be used outside of testing.
@ -217,9 +217,9 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
} }
} }
scode := release.Status_DEPLOYED scode := release.StatusDeployed
if opts.StatusCode > 0 { if len(opts.Status) > 0 {
scode = opts.StatusCode scode = opts.Status
} }
return &release.Release{ return &release.Release{
@ -227,7 +227,7 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
Info: &release.Info{ Info: &release.Info{
FirstDeployed: date, FirstDeployed: date,
LastDeployed: date, LastDeployed: date,
Status: &release.Status{Code: scode}, Status: scode,
Description: "Release mock", Description: "Release mock",
}, },
Chart: ch, Chart: ch,
@ -241,7 +241,7 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
Path: "pre-install-hook.yaml", Path: "pre-install-hook.yaml",
Manifest: MockHookTemplate, Manifest: MockHookTemplate,
LastRun: date, LastRun: date,
Events: []release.HookEvent{release.Hook_PRE_INSTALL}, Events: []release.HookEvent{release.HookPreInstall},
}, },
}, },
Manifest: MockManifest, Manifest: MockManifest,

18
pkg/helm/helm_test.go
Unescape View File

@ -40,13 +40,13 @@ func TestListReleases_VerifyOptions(t *testing.T) {
var limit = 2 var limit = 2
var offset = "offset" var offset = "offset"
var filter = "filter" var filter = "filter"
var sortBy = 2 var sortBy = hapi.ListSortLastReleased
var sortOrd = 1 var sortOrd = hapi.ListSortAsc
var codes = []rls.StatusCode{ var codes = []rls.ReleaseStatus{
rls.Status_FAILED, rls.StatusFailed,
rls.Status_DELETED, rls.StatusDeleted,
rls.Status_DEPLOYED, rls.StatusDeployed,
rls.Status_SUPERSEDED, rls.StatusSuperseded,
} }
// Expected ListReleasesRequest message // Expected ListReleasesRequest message
@ -54,8 +54,8 @@ func TestListReleases_VerifyOptions(t *testing.T) {
Limit: int64(limit), Limit: int64(limit),
Offset: offset, Offset: offset,
Filter: filter, Filter: filter,
SortBy: hapi.ListSortBy(sortBy), SortBy: sortBy,
SortOrder: hapi.ListSortOrder(sortOrd), SortOrder: sortOrd,
StatusCodes: codes, StatusCodes: codes,
} }

12
pkg/helm/option.go
Unescape View File

@ -115,24 +115,24 @@ func ReleaseListLimit(limit int) ReleaseListOption {
} }
// ReleaseListOrder specifies how to order a list of releases. // ReleaseListOrder specifies how to order a list of releases.
func ReleaseListOrder(order int) ReleaseListOption { func ReleaseListOrder(order hapi.ListSortOrder) ReleaseListOption {
return func(opts *options) { return func(opts *options) {
opts.listReq.SortOrder = hapi.ListSortOrder(order) opts.listReq.SortOrder = order
} }
} }
// ReleaseListSort specifies how to sort a release list. // ReleaseListSort specifies how to sort a release list.
func ReleaseListSort(sort int) ReleaseListOption { func ReleaseListSort(sort hapi.ListSortBy) ReleaseListOption {
return func(opts *options) { return func(opts *options) {
opts.listReq.SortBy = hapi.ListSortBy(sort) opts.listReq.SortBy = sort
} }
} }
// ReleaseListStatuses specifies which status codes should be returned. // ReleaseListStatuses specifies which status codes should be returned.
func ReleaseListStatuses(statuses []release.StatusCode) ReleaseListOption { func ReleaseListStatuses(statuses []release.ReleaseStatus) ReleaseListOption {
return func(opts *options) { return func(opts *options) {
if len(statuses) == 0 { if len(statuses) == 0 {
statuses = []release.StatusCode{release.Status_DEPLOYED} statuses = []release.ReleaseStatus{release.StatusDeployed}
} }
opts.listReq.StatusCodes = statuses opts.listReq.StatusCodes = statuses
} }

2
pkg/hooks/hooks.go
Unescape View File

@ -56,7 +56,7 @@ func FilterTestHooks(hooks []*release.Hook) []*release.Hook {
for _, h := range hooks { for _, h := range hooks {
for _, e := range h.Events { for _, e := range h.Events {
if e == release.Hook_RELEASE_TEST_SUCCESS || e == release.Hook_RELEASE_TEST_FAILURE { if e == release.HookReleaseTestSuccess || e == release.HookReleaseTestFailure {
testHooks = append(testHooks, h) testHooks = append(testHooks, h)
continue continue
} }

18
pkg/releasetesting/environment.go
Unescape View File

@ -41,7 +41,7 @@ func (env *Environment) createTestPod(test *test) error {
b := bytes.NewBufferString(test.manifest) b := bytes.NewBufferString(test.manifest)
if err := env.KubeClient.Create(env.Namespace, b, env.Timeout, false); err != nil { if err := env.KubeClient.Create(env.Namespace, b, env.Timeout, false); err != nil {
test.result.Info = err.Error() test.result.Info = err.Error()
test.result.Status = release.TestRun_FAILURE test.result.Status = release.TestRunFailure
return err return err
} }
@ -54,7 +54,7 @@ func (env *Environment) getTestPodStatus(test *test) (core.PodPhase, error) {
if err != nil { if err != nil {
log.Printf("Error getting status for pod %s: %s", test.result.Name, err) log.Printf("Error getting status for pod %s: %s", test.result.Name, err)
test.result.Info = err.Error() test.result.Info = err.Error()
test.result.Status = release.TestRun_UNKNOWN test.result.Status = release.TestRunUnknown
return status, err return status, err
} }
@ -63,11 +63,11 @@ func (env *Environment) getTestPodStatus(test *test) (core.PodPhase, error) {
func (env *Environment) streamResult(r *release.TestRun) error { func (env *Environment) streamResult(r *release.TestRun) error {
switch r.Status { switch r.Status {
case release.TestRun_SUCCESS: case release.TestRunSuccess:
if err := env.streamSuccess(r.Name); err != nil { if err := env.streamSuccess(r.Name); err != nil {
return err return err
} }
case release.TestRun_FAILURE: case release.TestRunFailure:
if err := env.streamFailed(r.Name); err != nil { if err := env.streamFailed(r.Name); err != nil {
return err return err
} }
@ -82,27 +82,27 @@ func (env *Environment) streamResult(r *release.TestRun) error {
func (env *Environment) streamRunning(name string) error { func (env *Environment) streamRunning(name string) error {
msg := "RUNNING: " + name msg := "RUNNING: " + name
return env.streamMessage(msg, release.TestRun_RUNNING) return env.streamMessage(msg, release.TestRunRunning)
} }
func (env *Environment) streamError(info string) error { func (env *Environment) streamError(info string) error {
msg := "ERROR: " + info msg := "ERROR: " + info
return env.streamMessage(msg, release.TestRun_FAILURE) return env.streamMessage(msg, release.TestRunFailure)
} }
func (env *Environment) streamFailed(name string) error { func (env *Environment) streamFailed(name string) error {
msg := fmt.Sprintf("FAILED: %s, run `kubectl logs %s --namespace %s` for more info", name, name, env.Namespace) msg := fmt.Sprintf("FAILED: %s, run `kubectl logs %s --namespace %s` for more info", name, name, env.Namespace)
return env.streamMessage(msg, release.TestRun_FAILURE) return env.streamMessage(msg, release.TestRunFailure)
} }
func (env *Environment) streamSuccess(name string) error { func (env *Environment) streamSuccess(name string) error {
msg := fmt.Sprintf("PASSED: %s", name) msg := fmt.Sprintf("PASSED: %s", name)
return env.streamMessage(msg, release.TestRun_SUCCESS) return env.streamMessage(msg, release.TestRunSuccess)
} }
func (env *Environment) streamUnknown(name, info string) error { func (env *Environment) streamUnknown(name, info string) error {
msg := fmt.Sprintf("UNKNOWN: %s: %s", name, info) msg := fmt.Sprintf("UNKNOWN: %s: %s", name, info)
return env.streamMessage(msg, release.TestRun_UNKNOWN) return env.streamMessage(msg, release.TestRunUnknown)
} }
func (env *Environment) streamMessage(msg string, status release.TestRunStatus) error { func (env *Environment) streamMessage(msg string, status release.TestRunStatus) error {

4
pkg/releasetesting/environment_test.go
Unescape View File

@ -45,7 +45,7 @@ func TestCreateTestPodFailure(t *testing.T) {
if test.result.Info == "" { if test.result.Info == "" {
t.Errorf("Expected error to be saved in test result info but found empty string") t.Errorf("Expected error to be saved in test result info but found empty string")
} }
if test.result.Status != release.TestRun_FAILURE { if test.result.Status != release.TestRunFailure {
t.Errorf("Expected test result status to be failure but got: %v", test.result.Status) t.Errorf("Expected test result status to be failure but got: %v", test.result.Status)
} }
} }
@ -55,7 +55,7 @@ func TestStreamMessage(t *testing.T) {
defer close(env.Mesages) defer close(env.Mesages)
expectedMessage := "testing streamMessage" expectedMessage := "testing streamMessage"
expectedStatus := release.TestRun_SUCCESS expectedStatus := release.TestRunSuccess
if err := env.streamMessage(expectedMessage, expectedStatus); err != nil { if err := env.streamMessage(expectedMessage, expectedStatus); err != nil {
t.Errorf("Expected no errors, got: %s", err) t.Errorf("Expected no errors, got: %s", err)
} }

14
pkg/releasetesting/test_suite.go
Unescape View File

@ -58,7 +58,7 @@ func (ts *TestSuite) Run(env *Environment) error {
if len(ts.TestManifests) == 0 { if len(ts.TestManifests) == 0 {
// TODO: make this better, adding test run status on test suite is weird // TODO: make this better, adding test run status on test suite is weird
env.streamMessage("No Tests Found", release.TestRun_UNKNOWN) env.streamMessage("No Tests Found", release.TestRunUnknown)
} }
for _, testManifest := range ts.TestManifests { for _, testManifest := range ts.TestManifests {
@ -71,7 +71,7 @@ func (ts *TestSuite) Run(env *Environment) error {
if err := env.streamRunning(test.result.Name); err != nil { if err := env.streamRunning(test.result.Name); err != nil {
return err return err
} }
test.result.Status = release.TestRun_RUNNING test.result.Status = release.TestRunRunning
resourceCreated := true resourceCreated := true
if err := env.createTestPod(test); err != nil { if err := env.createTestPod(test); err != nil {
@ -115,18 +115,18 @@ func (t *test) assignTestResult(podStatus core.PodPhase) error {
switch podStatus { switch podStatus {
case core.PodSucceeded: case core.PodSucceeded:
if t.expectedSuccess { if t.expectedSuccess {
t.result.Status = release.TestRun_SUCCESS t.result.Status = release.TestRunSuccess
} else { } else {
t.result.Status = release.TestRun_FAILURE t.result.Status = release.TestRunFailure
} }
case core.PodFailed: case core.PodFailed:
if !t.expectedSuccess { if !t.expectedSuccess {
t.result.Status = release.TestRun_SUCCESS t.result.Status = release.TestRunSuccess
} else { } else {
t.result.Status = release.TestRun_FAILURE t.result.Status = release.TestRunFailure
} }
default: default:
t.result.Status = release.TestRun_UNKNOWN t.result.Status = release.TestRunUnknown
} }
return nil return nil

10
pkg/releasetesting/test_suite_test.go
Unescape View File

@ -104,7 +104,7 @@ func TestRun(t *testing.T) {
if result.Name != "finding-nemo" { if result.Name != "finding-nemo" {
t.Errorf("Expected test name to be finding-nemo. Got: %v", result.Name) t.Errorf("Expected test name to be finding-nemo. Got: %v", result.Name)
} }
if result.Status != release.TestRun_SUCCESS { if result.Status != release.TestRunSuccess {
t.Errorf("Expected test result to be successful, got: %v", result.Status) t.Errorf("Expected test result to be successful, got: %v", result.Status)
} }
result2 := ts.Results[1] result2 := ts.Results[1]
@ -117,7 +117,7 @@ func TestRun(t *testing.T) {
if result2.Name != "gold-rush" { if result2.Name != "gold-rush" {
t.Errorf("Expected test name to be gold-rush, Got: %v", result2.Name) t.Errorf("Expected test name to be gold-rush, Got: %v", result2.Name)
} }
if result2.Status != release.TestRun_FAILURE { if result2.Status != release.TestRunFailure {
t.Errorf("Expected test result to be successful, got: %v", result2.Status) t.Errorf("Expected test result to be successful, got: %v", result2.Status)
} }
} }
@ -191,7 +191,7 @@ func TestRunSuccessWithTestFailureHook(t *testing.T) {
if result.Name != "gold-rush" { if result.Name != "gold-rush" {
t.Errorf("Expected test name to be gold-rush, Got: %v", result.Name) t.Errorf("Expected test name to be gold-rush, Got: %v", result.Name)
} }
if result.Status != release.TestRun_SUCCESS { if result.Status != release.TestRunSuccess {
t.Errorf("Expected test result to be successful, got: %v", result.Status) t.Errorf("Expected test result to be successful, got: %v", result.Status)
} }
} }
@ -208,13 +208,13 @@ var hooksStub = []*release.Hook{
{ {
Manifest: manifestWithTestSuccessHook, Manifest: manifestWithTestSuccessHook,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_RELEASE_TEST_SUCCESS, release.HookReleaseTestSuccess,
}, },
}, },
{ {
Manifest: manifestWithInstallHooks, Manifest: manifestWithInstallHooks,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_POST_INSTALL, release.HookPostInstall,
}, },
}, },
} }

4
pkg/releaseutil/filter.go
Unescape View File

@ -68,11 +68,11 @@ func All(filters ...FilterFunc) FilterFunc {
} }
// StatusFilter filters a set of releases by status code. // StatusFilter filters a set of releases by status code.
func StatusFilter(status rspb.StatusCode) FilterFunc { func StatusFilter(status rspb.ReleaseStatus) FilterFunc {
return FilterFunc(func(rls *rspb.Release) bool { return FilterFunc(func(rls *rspb.Release) bool {
if rls == nil { if rls == nil {
return true return true
} }
return rls.Info.Status.Code == status return rls.Info.Status == status
}) })
} }

14
pkg/releaseutil/filter_test.go
Unescape View File

@ -23,24 +23,24 @@ import (
) )
func TestFilterAny(t *testing.T) { func TestFilterAny(t *testing.T) {
ls := Any(StatusFilter(rspb.Status_DELETED)).Filter(releases) ls := Any(StatusFilter(rspb.StatusDeleted)).Filter(releases)
if len(ls) != 2 { if len(ls) != 2 {
t.Fatalf("expected 2 results, got '%d'", len(ls)) t.Fatalf("expected 2 results, got '%d'", len(ls))
} }
r0, r1 := ls[0], ls[1] r0, r1 := ls[0], ls[1]
switch { switch {
case r0.Info.Status.Code != rspb.Status_DELETED: case r0.Info.Status != rspb.StatusDeleted:
t.Fatalf("expected DELETED result, got '%s'", r1.Info.Status.Code.String()) t.Fatalf("expected DELETED result, got '%s'", r1.Info.Status.String())
case r1.Info.Status.Code != rspb.Status_DELETED: case r1.Info.Status != rspb.StatusDeleted:
t.Fatalf("expected DELETED result, got '%s'", r1.Info.Status.Code.String()) t.Fatalf("expected DELETED result, got '%s'", r1.Info.Status.String())
} }
} }
func TestFilterAll(t *testing.T) { func TestFilterAll(t *testing.T) {
fn := FilterFunc(func(rls *rspb.Release) bool { fn := FilterFunc(func(rls *rspb.Release) bool {
// true if not deleted and version < 4 // true if not deleted and version < 4
v0 := !StatusFilter(rspb.Status_DELETED).Check(rls) v0 := !StatusFilter(rspb.StatusDeleted).Check(rls)
v1 := rls.Version < 4 v1 := rls.Version < 4
return v0 && v1 return v0 && v1
}) })
@ -53,7 +53,7 @@ func TestFilterAll(t *testing.T) {
switch r0 := ls[0]; { switch r0 := ls[0]; {
case r0.Version == 4: case r0.Version == 4:
t.Fatal("got release with status revision 4") t.Fatal("got release with status revision 4")
case r0.Info.Status.Code == rspb.Status_DELETED: case r0.Info.Status == rspb.StatusDeleted:
t.Fatal("got release with status DELTED") t.Fatal("got release with status DELTED")
} }
} }

12
pkg/releaseutil/sorter_test.go
Unescape View File

@ -26,15 +26,15 @@ import (
// note: this test data is shared with filter_test.go. // note: this test data is shared with filter_test.go.
var releases = []*rspb.Release{ var releases = []*rspb.Release{
tsRelease("quiet-bear", 2, 2000, rspb.Status_SUPERSEDED), tsRelease("quiet-bear", 2, 2000, rspb.StatusSuperseded),
tsRelease("angry-bird", 4, 3000, rspb.Status_DEPLOYED), tsRelease("angry-bird", 4, 3000, rspb.StatusDeployed),
tsRelease("happy-cats", 1, 4000, rspb.Status_DELETED), tsRelease("happy-cats", 1, 4000, rspb.StatusDeleted),
tsRelease("vocal-dogs", 3, 6000, rspb.Status_DELETED), tsRelease("vocal-dogs", 3, 6000, rspb.StatusDeleted),
} }
func tsRelease(name string, vers int, dur time.Duration, code rspb.StatusCode) *rspb.Release { func tsRelease(name string, vers int, dur time.Duration, status rspb.ReleaseStatus) *rspb.Release {
tmsp := time.Now().Add(time.Duration(dur)) tmsp := time.Now().Add(time.Duration(dur))
info := &rspb.Info{Status: &rspb.Status{Code: code}, LastDeployed: tmsp} info := &rspb.Info{Status: status, LastDeployed: tmsp}
return &rspb.Release{ return &rspb.Release{
Name: name, Name: name,
Version: vers, Version: vers,

30
pkg/storage/driver/cfgmaps.go
Unescape View File

@ -85,7 +85,7 @@ func (cfgmaps *ConfigMaps) Get(key string) (*rspb.Release, error) {
// that filter(release) == true. An error is returned if the // that filter(release) == true. An error is returned if the
// configmap fails to retrieve the releases. // configmap fails to retrieve the releases.
func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) { func (cfgmaps *ConfigMaps) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) {
lsel := kblabels.Set{"OWNER": "TILLER"}.AsSelector() lsel := kblabels.Set{"owner": "tiller"}.AsSelector()
opts := metav1.ListOptions{LabelSelector: lsel.String()} opts := metav1.ListOptions{LabelSelector: lsel.String()}
list, err := cfgmaps.impl.List(opts) list, err := cfgmaps.impl.List(opts)
@ -131,7 +131,7 @@ func (cfgmaps *ConfigMaps) Query(labels map[string]string) ([]*rspb.Release, err
} }
if len(list.Items) == 0 { if len(list.Items) == 0 {
return nil, ErrReleaseNotFound(labels["NAME"]) return nil, ErrReleaseNotFound(labels["name"])
} }
var results []*rspb.Release var results []*rspb.Release
@ -153,7 +153,7 @@ func (cfgmaps *ConfigMaps) Create(key string, rls *rspb.Release) error {
var lbs labels var lbs labels
lbs.init() lbs.init()
lbs.set("CREATED_AT", strconv.Itoa(int(time.Now().Unix()))) lbs.set("createdAt", strconv.Itoa(int(time.Now().Unix())))
// create a new configmap to hold the release // create a new configmap to hold the release
obj, err := newConfigMapsObject(key, rls, lbs) obj, err := newConfigMapsObject(key, rls, lbs)
@ -180,7 +180,7 @@ func (cfgmaps *ConfigMaps) Update(key string, rls *rspb.Release) error {
var lbs labels var lbs labels
lbs.init() lbs.init()
lbs.set("MODIFIED_AT", strconv.Itoa(int(time.Now().Unix()))) lbs.set("modifiedAt", strconv.Itoa(int(time.Now().Unix())))
// create a new configmap object to hold the release // create a new configmap object to hold the release
obj, err := newConfigMapsObject(key, rls, lbs) obj, err := newConfigMapsObject(key, rls, lbs)
@ -221,15 +221,15 @@ func (cfgmaps *ConfigMaps) Delete(key string) (rls *rspb.Release, err error) {
// //
// The following labels are used within each configmap: // The following labels are used within each configmap:
// //
// "MODIFIED_AT" - timestamp indicating when this configmap was last modified. (set in Update) // "modifiedAt" - timestamp indicating when this configmap was last modified. (set in Update)
// "CREATED_AT" - timestamp indicating when this configmap was created. (set in Create) // "createdAt" - timestamp indicating when this configmap was created. (set in Create)
// "VERSION" - version of the release. // "version" - version of the release.
// "STATUS" - status of the release (see proto/hapi/release.status.pb.go for variants) // "status" - status of the release (see proto/hapi/release.status.pb.go for variants)
// "OWNER" - owner of the configmap, currently "TILLER". // "owner" - owner of the configmap, currently "tiller".
// "NAME" - name of the release. // "name" - name of the release.
// //
func newConfigMapsObject(key string, rls *rspb.Release, lbs labels) (*v1.ConfigMap, error) { func newConfigMapsObject(key string, rls *rspb.Release, lbs labels) (*v1.ConfigMap, error) {
const owner = "TILLER" const owner = "tiller"
// encode the release // encode the release
s, err := encodeRelease(rls) s, err := encodeRelease(rls)
@ -242,10 +242,10 @@ func newConfigMapsObject(key string, rls *rspb.Release, lbs labels) (*v1.ConfigM
} }
// apply labels // apply labels
lbs.set("NAME", rls.Name) lbs.set("name", rls.Name)
lbs.set("OWNER", owner) lbs.set("owner", owner)
lbs.set("STATUS", rls.Info.Status.Code.String()) lbs.set("status", rls.Info.Status.String())
lbs.set("VERSION", strconv.Itoa(rls.Version)) lbs.set("version", strconv.Itoa(rls.Version))
// create and return configmap object // create and return configmap object
return &v1.ConfigMap{ return &v1.ConfigMap{

32
pkg/storage/driver/cfgmaps_test.go
Unescape View File

@ -36,7 +36,7 @@ func TestConfigMapGet(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{rel}...) cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{rel}...)
@ -56,7 +56,7 @@ func TestUNcompressedConfigMapGet(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
// Create a test fixture which contains an uncompressed release // Create a test fixture which contains an uncompressed release
cfgmap, err := newConfigMapsObject(key, rel, nil) cfgmap, err := newConfigMapsObject(key, rel, nil)
@ -85,17 +85,17 @@ func TestUNcompressedConfigMapGet(t *testing.T) {
func TestConfigMapList(t *testing.T) { func TestConfigMapList(t *testing.T) {
cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{ cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{
releaseStub("key-1", 1, "default", rspb.Status_DELETED), releaseStub("key-1", 1, "default", rspb.StatusDeleted),
releaseStub("key-2", 1, "default", rspb.Status_DELETED), releaseStub("key-2", 1, "default", rspb.StatusDeleted),
releaseStub("key-3", 1, "default", rspb.Status_DEPLOYED), releaseStub("key-3", 1, "default", rspb.StatusDeployed),
releaseStub("key-4", 1, "default", rspb.Status_DEPLOYED), releaseStub("key-4", 1, "default", rspb.StatusDeployed),
releaseStub("key-5", 1, "default", rspb.Status_SUPERSEDED), releaseStub("key-5", 1, "default", rspb.StatusSuperseded),
releaseStub("key-6", 1, "default", rspb.Status_SUPERSEDED), releaseStub("key-6", 1, "default", rspb.StatusSuperseded),
}...) }...)
// list all deleted releases // list all deleted releases
del, err := cfgmaps.List(func(rel *rspb.Release) bool { del, err := cfgmaps.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_DELETED return rel.Info.Status == rspb.StatusDeleted
}) })
// check // check
if err != nil { if err != nil {
@ -107,7 +107,7 @@ func TestConfigMapList(t *testing.T) {
// list all deployed releases // list all deployed releases
dpl, err := cfgmaps.List(func(rel *rspb.Release) bool { dpl, err := cfgmaps.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_DEPLOYED return rel.Info.Status == rspb.StatusDeployed
}) })
// check // check
if err != nil { if err != nil {
@ -119,7 +119,7 @@ func TestConfigMapList(t *testing.T) {
// list all superseded releases // list all superseded releases
ssd, err := cfgmaps.List(func(rel *rspb.Release) bool { ssd, err := cfgmaps.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_SUPERSEDED return rel.Info.Status == rspb.StatusSuperseded
}) })
// check // check
if err != nil { if err != nil {
@ -137,7 +137,7 @@ func TestConfigMapCreate(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
// store the release in a configmap // store the release in a configmap
if err := cfgmaps.Create(key, rel); err != nil { if err := cfgmaps.Create(key, rel); err != nil {
@ -161,12 +161,12 @@ func TestConfigMapUpdate(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{rel}...) cfgmaps := newTestFixtureCfgMaps(t, []*rspb.Release{rel}...)
// modify release status code // modify release status code
rel.Info.Status.Code = rspb.Status_SUPERSEDED rel.Info.Status = rspb.StatusSuperseded
// perform the update // perform the update
if err := cfgmaps.Update(key, rel); err != nil { if err := cfgmaps.Update(key, rel); err != nil {
@ -180,7 +180,7 @@ func TestConfigMapUpdate(t *testing.T) {
} }
// check release has actually been updated by comparing modified fields // check release has actually been updated by comparing modified fields
if rel.Info.Status.Code != got.Info.Status.Code { if rel.Info.Status != got.Info.Status {
t.Errorf("Expected status %s, got status %s", rel.Info.Status.Code.String(), got.Info.Status.Code.String()) t.Errorf("Expected status %s, got status %s", rel.Info.Status.String(), got.Info.Status.String())
} }
} }

14
pkg/storage/driver/memory_test.go
Unescape View File

@ -38,12 +38,12 @@ func TestMemoryCreate(t *testing.T) {
}{ }{
{ {
"create should success", "create should success",
releaseStub("rls-c", 1, "default", rspb.Status_DEPLOYED), releaseStub("rls-c", 1, "default", rspb.StatusDeployed),
false, false,
}, },
{ {
"create should fail (release already exists)", "create should fail (release already exists)",
releaseStub("rls-a", 1, "default", rspb.Status_DEPLOYED), releaseStub("rls-a", 1, "default", rspb.StatusDeployed),
true, true,
}, },
} }
@ -90,7 +90,7 @@ func TestMemoryQuery(t *testing.T) {
{ {
"should be 2 query results", "should be 2 query results",
2, 2,
map[string]string{"STATUS": "DEPLOYED"}, map[string]string{"status": "deployed"},
}, },
} }
@ -117,13 +117,13 @@ func TestMemoryUpdate(t *testing.T) {
{ {
"update release status", "update release status",
"rls-a.v4", "rls-a.v4",
releaseStub("rls-a", 4, "default", rspb.Status_SUPERSEDED), releaseStub("rls-a", 4, "default", rspb.StatusSuperseded),
false, false,
}, },
{ {
"update release does not exist", "update release does not exist",
"rls-z.v1", "rls-z.v1",
releaseStub("rls-z", 1, "default", rspb.Status_DELETED), releaseStub("rls-z", 1, "default", rspb.StatusDeleted),
true, true,
}, },
} }
@ -159,7 +159,7 @@ func TestMemoryDelete(t *testing.T) {
} }
ts := tsFixtureMemory(t) ts := tsFixtureMemory(t)
start, err := ts.Query(map[string]string{"NAME": "rls-a"}) start, err := ts.Query(map[string]string{"name": "rls-a"})
if err != nil { if err != nil {
t.Errorf("Query failed: %s", err) t.Errorf("Query failed: %s", err)
} }
@ -180,7 +180,7 @@ func TestMemoryDelete(t *testing.T) {
} }
// Make sure that the deleted records are gone. // Make sure that the deleted records are gone.
end, err := ts.Query(map[string]string{"NAME": "rls-a"}) end, err := ts.Query(map[string]string{"name": "rls-a"})
if err != nil { if err != nil {
t.Errorf("Query failed: %s", err) t.Errorf("Query failed: %s", err)
} }

20
pkg/storage/driver/mock_test.go
Unescape View File

@ -28,12 +28,12 @@ import (
rspb "k8s.io/helm/pkg/hapi/release" rspb "k8s.io/helm/pkg/hapi/release"
) )
func releaseStub(name string, vers int, namespace string, code rspb.StatusCode) *rspb.Release { func releaseStub(name string, vers int, namespace string, status rspb.ReleaseStatus) *rspb.Release {
return &rspb.Release{ return &rspb.Release{
Name: name, Name: name,
Version: vers, Version: vers,
Namespace: namespace, Namespace: namespace,
Info: &rspb.Info{Status: &rspb.Status{Code: code}}, Info: &rspb.Info{Status: status},
} }
} }
@ -44,15 +44,15 @@ func testKey(name string, vers int) string {
func tsFixtureMemory(t *testing.T) *Memory { func tsFixtureMemory(t *testing.T) *Memory {
hs := []*rspb.Release{ hs := []*rspb.Release{
// rls-a // rls-a
releaseStub("rls-a", 4, "default", rspb.Status_DEPLOYED), releaseStub("rls-a", 4, "default", rspb.StatusDeployed),
releaseStub("rls-a", 1, "default", rspb.Status_SUPERSEDED), releaseStub("rls-a", 1, "default", rspb.StatusSuperseded),
releaseStub("rls-a", 3, "default", rspb.Status_SUPERSEDED), releaseStub("rls-a", 3, "default", rspb.StatusSuperseded),
releaseStub("rls-a", 2, "default", rspb.Status_SUPERSEDED), releaseStub("rls-a", 2, "default", rspb.StatusSuperseded),
// rls-b // rls-b
releaseStub("rls-b", 4, "default", rspb.Status_DEPLOYED), releaseStub("rls-b", 4, "default", rspb.StatusDeployed),
releaseStub("rls-b", 1, "default", rspb.Status_SUPERSEDED), releaseStub("rls-b", 1, "default", rspb.StatusSuperseded),
releaseStub("rls-b", 3, "default", rspb.Status_SUPERSEDED), releaseStub("rls-b", 3, "default", rspb.StatusSuperseded),
releaseStub("rls-b", 2, "default", rspb.Status_SUPERSEDED), releaseStub("rls-b", 2, "default", rspb.StatusSuperseded),
} }
mem := NewMemory() mem := NewMemory()

8
pkg/storage/driver/records.go
Unescape View File

@ -124,10 +124,10 @@ func newRecord(key string, rls *rspb.Release) *record {
var lbs labels var lbs labels
lbs.init() lbs.init()
lbs.set("NAME", rls.Name) lbs.set("name", rls.Name)
lbs.set("OWNER", "TILLER") lbs.set("owner", "tiller")
lbs.set("STATUS", rls.Info.Status.Code.String()) lbs.set("status", rls.Info.Status.String())
lbs.set("VERSION", strconv.Itoa(rls.Version)) lbs.set("version", strconv.Itoa(rls.Version))
// return &record{key: key, lbs: lbs, rls: proto.Clone(rls).(*rspb.Release)} // return &record{key: key, lbs: lbs, rls: proto.Clone(rls).(*rspb.Release)}
return &record{key: key, lbs: lbs, rls: rls} return &record{key: key, lbs: lbs, rls: rls}

16
pkg/storage/driver/records_test.go
Unescape View File

@ -24,8 +24,8 @@ import (
func TestRecordsAdd(t *testing.T) { func TestRecordsAdd(t *testing.T) {
rs := records([]*record{ rs := records([]*record{
newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.Status_SUPERSEDED)), newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.StatusSuperseded)),
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.Status_DEPLOYED)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.StatusDeployed)),
}) })
var tests = []struct { var tests = []struct {
@ -38,13 +38,13 @@ func TestRecordsAdd(t *testing.T) {
"add valid key", "add valid key",
"rls-a.v3", "rls-a.v3",
false, false,
newRecord("rls-a.v3", releaseStub("rls-a", 3, "default", rspb.Status_SUPERSEDED)), newRecord("rls-a.v3", releaseStub("rls-a", 3, "default", rspb.StatusSuperseded)),
}, },
{ {
"add already existing key", "add already existing key",
"rls-a.v1", "rls-a.v1",
true, true,
newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.Status_DEPLOYED)), newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.StatusDeployed)),
}, },
} }
@ -69,8 +69,8 @@ func TestRecordsRemove(t *testing.T) {
} }
rs := records([]*record{ rs := records([]*record{
newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.Status_SUPERSEDED)), newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.StatusSuperseded)),
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.Status_DEPLOYED)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.StatusDeployed)),
}) })
startLen := rs.Len() startLen := rs.Len()
@ -97,8 +97,8 @@ func TestRecordsRemove(t *testing.T) {
func TestRecordsRemoveAt(t *testing.T) { func TestRecordsRemoveAt(t *testing.T) {
rs := records([]*record{ rs := records([]*record{
newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.Status_SUPERSEDED)), newRecord("rls-a.v1", releaseStub("rls-a", 1, "default", rspb.StatusSuperseded)),
newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.Status_DEPLOYED)), newRecord("rls-a.v2", releaseStub("rls-a", 2, "default", rspb.StatusDeployed)),
}) })
if len(rs) != 2 { if len(rs) != 2 {

30
pkg/storage/driver/secrets.go
Unescape View File

@ -85,7 +85,7 @@ func (secrets *Secrets) Get(key string) (*rspb.Release, error) {
// that filter(release) == true. An error is returned if the // that filter(release) == true. An error is returned if the
// secret fails to retrieve the releases. // secret fails to retrieve the releases.
func (secrets *Secrets) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) { func (secrets *Secrets) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) {
lsel := kblabels.Set{"OWNER": "TILLER"}.AsSelector() lsel := kblabels.Set{"owner": "tiller"}.AsSelector()
opts := metav1.ListOptions{LabelSelector: lsel.String()} opts := metav1.ListOptions{LabelSelector: lsel.String()}
list, err := secrets.impl.List(opts) list, err := secrets.impl.List(opts)
@ -131,7 +131,7 @@ func (secrets *Secrets) Query(labels map[string]string) ([]*rspb.Release, error)
} }
if len(list.Items) == 0 { if len(list.Items) == 0 {
return nil, ErrReleaseNotFound(labels["NAME"]) return nil, ErrReleaseNotFound(labels["name"])
} }
var results []*rspb.Release var results []*rspb.Release
@ -153,7 +153,7 @@ func (secrets *Secrets) Create(key string, rls *rspb.Release) error {
var lbs labels var lbs labels
lbs.init() lbs.init()
lbs.set("CREATED_AT", strconv.Itoa(int(time.Now().Unix()))) lbs.set("createdAt", strconv.Itoa(int(time.Now().Unix())))
// create a new secret to hold the release // create a new secret to hold the release
obj, err := newSecretsObject(key, rls, lbs) obj, err := newSecretsObject(key, rls, lbs)
@ -180,7 +180,7 @@ func (secrets *Secrets) Update(key string, rls *rspb.Release) error {
var lbs labels var lbs labels
lbs.init() lbs.init()
lbs.set("MODIFIED_AT", strconv.Itoa(int(time.Now().Unix()))) lbs.set("modifiedAt", strconv.Itoa(int(time.Now().Unix())))
// create a new secret object to hold the release // create a new secret object to hold the release
obj, err := newSecretsObject(key, rls, lbs) obj, err := newSecretsObject(key, rls, lbs)
@ -221,15 +221,15 @@ func (secrets *Secrets) Delete(key string) (rls *rspb.Release, err error) {
// //
// The following labels are used within each secret: // The following labels are used within each secret:
// //
// "MODIFIED_AT" - timestamp indicating when this secret was last modified. (set in Update) // "modifiedAt" - timestamp indicating when this secret was last modified. (set in Update)
// "CREATED_AT" - timestamp indicating when this secret was created. (set in Create) // "createdAt" - timestamp indicating when this secret was created. (set in Create)
// "VERSION" - version of the release. // "version" - version of the release.
// "STATUS" - status of the release (see proto/hapi/release.status.pb.go for variants) // "status" - status of the release (see proto/hapi/release.status.pb.go for variants)
// "OWNER" - owner of the secret, currently "TILLER". // "owner" - owner of the secret, currently "tiller".
// "NAME" - name of the release. // "name" - name of the release.
// //
func newSecretsObject(key string, rls *rspb.Release, lbs labels) (*v1.Secret, error) { func newSecretsObject(key string, rls *rspb.Release, lbs labels) (*v1.Secret, error) {
const owner = "TILLER" const owner = "tiller"
// encode the release // encode the release
s, err := encodeRelease(rls) s, err := encodeRelease(rls)
@ -242,10 +242,10 @@ func newSecretsObject(key string, rls *rspb.Release, lbs labels) (*v1.Secret, er
} }
// apply labels // apply labels
lbs.set("NAME", rls.Name) lbs.set("name", rls.Name)
lbs.set("OWNER", owner) lbs.set("owner", owner)
lbs.set("STATUS", rls.Info.Status.Code.String()) lbs.set("status", rls.Info.Status.String())
lbs.set("VERSION", strconv.Itoa(rls.Version)) lbs.set("version", strconv.Itoa(rls.Version))
// create and return secret object // create and return secret object
return &v1.Secret{ return &v1.Secret{

32
pkg/storage/driver/secrets_test.go
Unescape View File

@ -36,7 +36,7 @@ func TestSecretGet(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
secrets := newTestFixtureSecrets(t, []*rspb.Release{rel}...) secrets := newTestFixtureSecrets(t, []*rspb.Release{rel}...)
@ -56,7 +56,7 @@ func TestUNcompressedSecretGet(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
// Create a test fixture which contains an uncompressed release // Create a test fixture which contains an uncompressed release
secret, err := newSecretsObject(key, rel, nil) secret, err := newSecretsObject(key, rel, nil)
@ -85,17 +85,17 @@ func TestUNcompressedSecretGet(t *testing.T) {
func TestSecretList(t *testing.T) { func TestSecretList(t *testing.T) {
secrets := newTestFixtureSecrets(t, []*rspb.Release{ secrets := newTestFixtureSecrets(t, []*rspb.Release{
releaseStub("key-1", 1, "default", rspb.Status_DELETED), releaseStub("key-1", 1, "default", rspb.StatusDeleted),
releaseStub("key-2", 1, "default", rspb.Status_DELETED), releaseStub("key-2", 1, "default", rspb.StatusDeleted),
releaseStub("key-3", 1, "default", rspb.Status_DEPLOYED), releaseStub("key-3", 1, "default", rspb.StatusDeployed),
releaseStub("key-4", 1, "default", rspb.Status_DEPLOYED), releaseStub("key-4", 1, "default", rspb.StatusDeployed),
releaseStub("key-5", 1, "default", rspb.Status_SUPERSEDED), releaseStub("key-5", 1, "default", rspb.StatusSuperseded),
releaseStub("key-6", 1, "default", rspb.Status_SUPERSEDED), releaseStub("key-6", 1, "default", rspb.StatusSuperseded),
}...) }...)
// list all deleted releases // list all deleted releases
del, err := secrets.List(func(rel *rspb.Release) bool { del, err := secrets.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_DELETED return rel.Info.Status == rspb.StatusDeleted
}) })
// check // check
if err != nil { if err != nil {
@ -107,7 +107,7 @@ func TestSecretList(t *testing.T) {
// list all deployed releases // list all deployed releases
dpl, err := secrets.List(func(rel *rspb.Release) bool { dpl, err := secrets.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_DEPLOYED return rel.Info.Status == rspb.StatusDeployed
}) })
// check // check
if err != nil { if err != nil {
@ -119,7 +119,7 @@ func TestSecretList(t *testing.T) {
// list all superseded releases // list all superseded releases
ssd, err := secrets.List(func(rel *rspb.Release) bool { ssd, err := secrets.List(func(rel *rspb.Release) bool {
return rel.Info.Status.Code == rspb.Status_SUPERSEDED return rel.Info.Status == rspb.StatusSuperseded
}) })
// check // check
if err != nil { if err != nil {
@ -137,7 +137,7 @@ func TestSecretCreate(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
// store the release in a secret // store the release in a secret
if err := secrets.Create(key, rel); err != nil { if err := secrets.Create(key, rel); err != nil {
@ -161,12 +161,12 @@ func TestSecretUpdate(t *testing.T) {
name := "smug-pigeon" name := "smug-pigeon"
namespace := "default" namespace := "default"
key := testKey(name, vers) key := testKey(name, vers)
rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED) rel := releaseStub(name, vers, namespace, rspb.StatusDeployed)
secrets := newTestFixtureSecrets(t, []*rspb.Release{rel}...) secrets := newTestFixtureSecrets(t, []*rspb.Release{rel}...)
// modify release status code // modify release status code
rel.Info.Status.Code = rspb.Status_SUPERSEDED rel.Info.Status = rspb.StatusSuperseded
// perform the update // perform the update
if err := secrets.Update(key, rel); err != nil { if err := secrets.Update(key, rel); err != nil {
@ -180,7 +180,7 @@ func TestSecretUpdate(t *testing.T) {
} }
// check release has actually been updated by comparing modified fields // check release has actually been updated by comparing modified fields
if rel.Info.Status.Code != got.Info.Status.Code { if rel.Info.Status != got.Info.Status {
t.Errorf("Expected status %s, got status %s", rel.Info.Status.Code.String(), got.Info.Status.Code.String()) t.Errorf("Expected status %s, got status %s", rel.Info.Status.String(), got.Info.Status.String())
} }
} }

12
pkg/storage/storage.go
Unescape View File

@ -85,7 +85,7 @@ func (s *Storage) ListReleases() ([]*rspb.Release, error) {
func (s *Storage) ListDeleted() ([]*rspb.Release, error) { func (s *Storage) ListDeleted() ([]*rspb.Release, error) {
s.Log("listing deleted releases in storage") s.Log("listing deleted releases in storage")
return s.Driver.List(func(rls *rspb.Release) bool { return s.Driver.List(func(rls *rspb.Release) bool {
return relutil.StatusFilter(rspb.Status_DELETED).Check(rls) return relutil.StatusFilter(rspb.StatusDeleted).Check(rls)
}) })
} }
@ -94,7 +94,7 @@ func (s *Storage) ListDeleted() ([]*rspb.Release, error) {
func (s *Storage) ListDeployed() ([]*rspb.Release, error) { func (s *Storage) ListDeployed() ([]*rspb.Release, error) {
s.Log("listing all deployed releases in storage") s.Log("listing all deployed releases in storage")
return s.Driver.List(func(rls *rspb.Release) bool { return s.Driver.List(func(rls *rspb.Release) bool {
return relutil.StatusFilter(rspb.Status_DEPLOYED).Check(rls) return relutil.StatusFilter(rspb.StatusDeployed).Check(rls)
}) })
} }
@ -142,9 +142,9 @@ func (s *Storage) DeployedAll(name string) ([]*rspb.Release, error) {
s.Log("getting deployed releases from %q history", name) s.Log("getting deployed releases from %q history", name)
ls, err := s.Driver.Query(map[string]string{ ls, err := s.Driver.Query(map[string]string{
"NAME": name, "name": name,
"OWNER": "TILLER", "owner": "tiller",
"STATUS": "DEPLOYED", "status": "deployed",
}) })
if err == nil { if err == nil {
return ls, nil return ls, nil
@ -160,7 +160,7 @@ func (s *Storage) DeployedAll(name string) ([]*rspb.Release, error) {
func (s *Storage) History(name string) ([]*rspb.Release, error) { func (s *Storage) History(name string) ([]*rspb.Release, error) {
s.Log("getting release history for %q", name) s.Log("getting release history for %q", name)
return s.Driver.Query(map[string]string{"NAME": name, "OWNER": "TILLER"}) return s.Driver.Query(map[string]string{"name": name, "owner": "tiller"})
} }
// removeLeastRecent removes items from history until the lengh number of releases // removeLeastRecent removes items from history until the lengh number of releases

60
pkg/storage/storage_test.go
Unescape View File

@ -55,13 +55,13 @@ func TestStorageUpdate(t *testing.T) {
rls := ReleaseTestData{ rls := ReleaseTestData{
Name: "angry-beaver", Name: "angry-beaver",
Version: 1, Version: 1,
Status: rspb.Status_DEPLOYED, Status: rspb.StatusDeployed,
}.ToRelease() }.ToRelease()
assertErrNil(t.Fatal, storage.Create(rls), "StoreRelease") assertErrNil(t.Fatal, storage.Create(rls), "StoreRelease")
// modify the release // modify the release
rls.Info.Status.Code = rspb.Status_DELETED rls.Info.Status = rspb.StatusDeleted
assertErrNil(t.Fatal, storage.Update(rls), "UpdateRelease") assertErrNil(t.Fatal, storage.Update(rls), "UpdateRelease")
// retrieve the updated release // retrieve the updated release
@ -122,13 +122,13 @@ func TestStorageList(t *testing.T) {
// setup storage with test releases // setup storage with test releases
setup := func() { setup := func() {
// release records // release records
rls0 := ReleaseTestData{Name: "happy-catdog", Status: rspb.Status_SUPERSEDED}.ToRelease() rls0 := ReleaseTestData{Name: "happy-catdog", Status: rspb.StatusSuperseded}.ToRelease()
rls1 := ReleaseTestData{Name: "livid-human", Status: rspb.Status_SUPERSEDED}.ToRelease() rls1 := ReleaseTestData{Name: "livid-human", Status: rspb.StatusSuperseded}.ToRelease()
rls2 := ReleaseTestData{Name: "relaxed-cat", Status: rspb.Status_SUPERSEDED}.ToRelease() rls2 := ReleaseTestData{Name: "relaxed-cat", Status: rspb.StatusSuperseded}.ToRelease()
rls3 := ReleaseTestData{Name: "hungry-hippo", Status: rspb.Status_DEPLOYED}.ToRelease() rls3 := ReleaseTestData{Name: "hungry-hippo", Status: rspb.StatusDeployed}.ToRelease()
rls4 := ReleaseTestData{Name: "angry-beaver", Status: rspb.Status_DEPLOYED}.ToRelease() rls4 := ReleaseTestData{Name: "angry-beaver", Status: rspb.StatusDeployed}.ToRelease()
rls5 := ReleaseTestData{Name: "opulent-frog", Status: rspb.Status_DELETED}.ToRelease() rls5 := ReleaseTestData{Name: "opulent-frog", Status: rspb.StatusDeleted}.ToRelease()
rls6 := ReleaseTestData{Name: "happy-liger", Status: rspb.Status_DELETED}.ToRelease() rls6 := ReleaseTestData{Name: "happy-liger", Status: rspb.StatusDeleted}.ToRelease()
// create the release records in the storage // create the release records in the storage
assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'rls0'") assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'rls0'")
@ -174,10 +174,10 @@ func TestStorageDeployed(t *testing.T) {
// setup storage with test releases // setup storage with test releases
setup := func() { setup := func() {
// release records // release records
rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.Status_SUPERSEDED}.ToRelease() rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.StatusSuperseded}.ToRelease()
rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.Status_SUPERSEDED}.ToRelease() rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.StatusSuperseded}.ToRelease()
rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.Status_SUPERSEDED}.ToRelease() rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.StatusSuperseded}.ToRelease()
rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.Status_DEPLOYED}.ToRelease() rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.StatusDeployed}.ToRelease()
// create the release records in the storage // create the release records in the storage
assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)") assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)")
@ -200,8 +200,8 @@ func TestStorageDeployed(t *testing.T) {
t.Fatalf("Expected release name %q, actual %q\n", name, rls.Name) t.Fatalf("Expected release name %q, actual %q\n", name, rls.Name)
case rls.Version != vers: case rls.Version != vers:
t.Fatalf("Expected release version %d, actual %d\n", vers, rls.Version) t.Fatalf("Expected release version %d, actual %d\n", vers, rls.Version)
case rls.Info.Status.Code != rspb.Status_DEPLOYED: case rls.Info.Status != rspb.StatusDeployed:
t.Fatalf("Expected release status 'DEPLOYED', actual %s\n", rls.Info.Status.Code.String()) t.Fatalf("Expected release status 'DEPLOYED', actual %s\n", rls.Info.Status.String())
} }
} }
@ -213,10 +213,10 @@ func TestStorageHistory(t *testing.T) {
// setup storage with test releases // setup storage with test releases
setup := func() { setup := func() {
// release records // release records
rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.Status_SUPERSEDED}.ToRelease() rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.StatusSuperseded}.ToRelease()
rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.Status_SUPERSEDED}.ToRelease() rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.StatusSuperseded}.ToRelease()
rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.Status_SUPERSEDED}.ToRelease() rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.StatusSuperseded}.ToRelease()
rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.Status_DEPLOYED}.ToRelease() rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.StatusDeployed}.ToRelease()
// create the release records in the storage // create the release records in the storage
assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)") assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)")
@ -248,10 +248,10 @@ func TestStorageRemoveLeastRecent(t *testing.T) {
// setup storage with test releases // setup storage with test releases
setup := func() { setup := func() {
// release records // release records
rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.Status_SUPERSEDED}.ToRelease() rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.StatusSuperseded}.ToRelease()
rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.Status_SUPERSEDED}.ToRelease() rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.StatusSuperseded}.ToRelease()
rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.Status_SUPERSEDED}.ToRelease() rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.StatusSuperseded}.ToRelease()
rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.Status_DEPLOYED}.ToRelease() rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.StatusDeployed}.ToRelease()
// create the release records in the storage // create the release records in the storage
assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)") assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)")
@ -270,7 +270,7 @@ func TestStorageRemoveLeastRecent(t *testing.T) {
} }
storage.MaxHistory = 3 storage.MaxHistory = 3
rls5 := ReleaseTestData{Name: name, Version: 5, Status: rspb.Status_DEPLOYED}.ToRelease() rls5 := ReleaseTestData{Name: name, Version: 5, Status: rspb.StatusDeployed}.ToRelease()
assertErrNil(t.Fatal, storage.Create(rls5), "Storing release 'angry-bird' (v5)") assertErrNil(t.Fatal, storage.Create(rls5), "Storing release 'angry-bird' (v5)")
// On inserting the 5th record, we expect two records to be pruned from history. // On inserting the 5th record, we expect two records to be pruned from history.
@ -301,10 +301,10 @@ func TestStorageLast(t *testing.T) {
// Set up storage with test releases. // Set up storage with test releases.
setup := func() { setup := func() {
// release records // release records
rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.Status_SUPERSEDED}.ToRelease() rls0 := ReleaseTestData{Name: name, Version: 1, Status: rspb.StatusSuperseded}.ToRelease()
rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.Status_SUPERSEDED}.ToRelease() rls1 := ReleaseTestData{Name: name, Version: 2, Status: rspb.StatusSuperseded}.ToRelease()
rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.Status_SUPERSEDED}.ToRelease() rls2 := ReleaseTestData{Name: name, Version: 3, Status: rspb.StatusSuperseded}.ToRelease()
rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.Status_FAILED}.ToRelease() rls3 := ReleaseTestData{Name: name, Version: 4, Status: rspb.StatusFailed}.ToRelease()
// create the release records in the storage // create the release records in the storage
assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)") assertErrNil(t.Fatal, storage.Create(rls0), "Storing release 'angry-bird' (v1)")
@ -330,7 +330,7 @@ type ReleaseTestData struct {
Version int Version int
Manifest string Manifest string
Namespace string Namespace string
Status rspb.StatusCode Status rspb.ReleaseStatus
} }
func (test ReleaseTestData) ToRelease() *rspb.Release { func (test ReleaseTestData) ToRelease() *rspb.Release {
@ -339,7 +339,7 @@ func (test ReleaseTestData) ToRelease() *rspb.Release {
Version: test.Version, Version: test.Version,
Manifest: test.Manifest, Manifest: test.Manifest,
Namespace: test.Namespace, Namespace: test.Namespace,
Info: &rspb.Info{Status: &rspb.Status{Code: test.Status}}, Info: &rspb.Info{Status: test.Status},
} }
} }

26
pkg/tiller/hooks.go
Unescape View File

@ -32,23 +32,23 @@ import (
) )
var events = map[string]release.HookEvent{ var events = map[string]release.HookEvent{
hooks.PreInstall: release.Hook_PRE_INSTALL, hooks.PreInstall: release.HookPreInstall,
hooks.PostInstall: release.Hook_POST_INSTALL, hooks.PostInstall: release.HookPostInstall,
hooks.PreDelete: release.Hook_PRE_DELETE, hooks.PreDelete: release.HookPreDelete,
hooks.PostDelete: release.Hook_POST_DELETE, hooks.PostDelete: release.HookPostDelete,
hooks.PreUpgrade: release.Hook_PRE_UPGRADE, hooks.PreUpgrade: release.HookPreUpgrade,
hooks.PostUpgrade: release.Hook_POST_UPGRADE, hooks.PostUpgrade: release.HookPostUpgrade,
hooks.PreRollback: release.Hook_PRE_ROLLBACK, hooks.PreRollback: release.HookPreRollback,
hooks.PostRollback: release.Hook_POST_ROLLBACK, hooks.PostRollback: release.HookPostRollback,
hooks.ReleaseTestSuccess: release.Hook_RELEASE_TEST_SUCCESS, hooks.ReleaseTestSuccess: release.HookReleaseTestSuccess,
hooks.ReleaseTestFailure: release.Hook_RELEASE_TEST_FAILURE, hooks.ReleaseTestFailure: release.HookReleaseTestFailure,
} }
// deletePolices represents a mapping between the key in the annotation for label deleting policy and its real meaning // deletePolices represents a mapping between the key in the annotation for label deleting policy and its real meaning
var deletePolices = map[string]release.HookDeletePolicy{ var deletePolices = map[string]release.HookDeletePolicy{
hooks.HookSucceeded: release.Hook_SUCCEEDED, hooks.HookSucceeded: release.HookSucceeded,
hooks.HookFailed: release.Hook_FAILED, hooks.HookFailed: release.HookFailed,
hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION, hooks.BeforeHookCreation: release.HookBeforeHookCreation,
} }
// Manifest represents a manifest file, which has a name and some content. // Manifest represents a manifest file, which has a name and some content.

8
pkg/tiller/hooks_test.go
Unescape View File

@ -40,7 +40,7 @@ func TestSortManifests(t *testing.T) {
name: []string{"first"}, name: []string{"first"},
path: "one", path: "one",
kind: []string{"Job"}, kind: []string{"Job"},
hooks: map[string][]release.HookEvent{"first": {release.Hook_PRE_INSTALL}}, hooks: map[string][]release.HookEvent{"first": {release.HookPreInstall}},
manifest: `apiVersion: v1 manifest: `apiVersion: v1
kind: Job kind: Job
metadata: metadata:
@ -55,7 +55,7 @@ metadata:
name: []string{"second"}, name: []string{"second"},
path: "two", path: "two",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
hooks: map[string][]release.HookEvent{"second": {release.Hook_POST_INSTALL}}, hooks: map[string][]release.HookEvent{"second": {release.HookPostInstall}},
manifest: `kind: ReplicaSet manifest: `kind: ReplicaSet
apiVersion: v1beta1 apiVersion: v1beta1
metadata: metadata:
@ -90,7 +90,7 @@ metadata:
name: []string{"fifth"}, name: []string{"fifth"},
path: "five", path: "five",
kind: []string{"ReplicaSet"}, kind: []string{"ReplicaSet"},
hooks: map[string][]release.HookEvent{"fifth": {release.Hook_POST_DELETE, release.Hook_POST_INSTALL}}, hooks: map[string][]release.HookEvent{"fifth": {release.HookPostDelete, release.HookPostInstall}},
manifest: `kind: ReplicaSet manifest: `kind: ReplicaSet
apiVersion: v1beta1 apiVersion: v1beta1
metadata: metadata:
@ -117,7 +117,7 @@ metadata:
name: []string{"eighth", "example-test"}, name: []string{"eighth", "example-test"},
path: "eight", path: "eight",
kind: []string{"ConfigMap", "Pod"}, kind: []string{"ConfigMap", "Pod"},
hooks: map[string][]release.HookEvent{"eighth": nil, "example-test": {release.Hook_RELEASE_TEST_SUCCESS}}, hooks: map[string][]release.HookEvent{"eighth": nil, "example-test": {release.HookReleaseTestSuccess}},
manifest: `kind: ConfigMap manifest: `kind: ConfigMap
apiVersion: v1 apiVersion: v1
metadata: metadata:

26
pkg/tiller/release_history_test.go
Unescape View File

@ -25,11 +25,11 @@ import (
) )
func TestGetHistory_WithRevisions(t *testing.T) { func TestGetHistory_WithRevisions(t *testing.T) {
mk := func(name string, vers int, code rpb.StatusCode) *rpb.Release { mk := func(name string, vers int, status rpb.ReleaseStatus) *rpb.Release {
return &rpb.Release{ return &rpb.Release{
Name: name, Name: name,
Version: vers, Version: vers,
Info: &rpb.Info{Status: &rpb.Status{Code: code}}, Info: &rpb.Info{Status: status},
} }
} }
@ -43,28 +43,28 @@ func TestGetHistory_WithRevisions(t *testing.T) {
desc: "get release with history and default limit (max=256)", desc: "get release with history and default limit (max=256)",
req: &hapi.GetHistoryRequest{Name: "angry-bird", Max: 256}, req: &hapi.GetHistoryRequest{Name: "angry-bird", Max: 256},
res: []*rpb.Release{ res: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
mk("angry-bird", 2, rpb.Status_SUPERSEDED), mk("angry-bird", 2, rpb.StatusSuperseded),
mk("angry-bird", 1, rpb.Status_SUPERSEDED), mk("angry-bird", 1, rpb.StatusSuperseded),
}, },
}, },
{ {
desc: "get release with history using result limit (max=2)", desc: "get release with history using result limit (max=2)",
req: &hapi.GetHistoryRequest{Name: "angry-bird", Max: 2}, req: &hapi.GetHistoryRequest{Name: "angry-bird", Max: 2},
res: []*rpb.Release{ res: []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
}, },
}, },
} }
// test release history for release 'angry-bird' // test release history for release 'angry-bird'
hist := []*rpb.Release{ hist := []*rpb.Release{
mk("angry-bird", 4, rpb.Status_DEPLOYED), mk("angry-bird", 4, rpb.StatusDeployed),
mk("angry-bird", 3, rpb.Status_SUPERSEDED), mk("angry-bird", 3, rpb.StatusSuperseded),
mk("angry-bird", 2, rpb.Status_SUPERSEDED), mk("angry-bird", 2, rpb.StatusSuperseded),
mk("angry-bird", 1, rpb.Status_SUPERSEDED), mk("angry-bird", 1, rpb.StatusSuperseded),
} }
srv := rsFixture() srv := rsFixture()
@ -98,7 +98,7 @@ func TestGetHistory_WithNoRevisions(t *testing.T) {
} }
// create release 'sad-panda' with no revision history // create release 'sad-panda' with no revision history
rls := namedReleaseStub("sad-panda", rpb.Status_DEPLOYED) rls := namedReleaseStub("sad-panda", rpb.StatusDeployed)
srv := rsFixture() srv := rsFixture()
srv.Releases.Create(rls) srv.Releases.Create(rls)

18
pkg/tiller/release_install.go
Unescape View File

@ -94,7 +94,7 @@ func (s *ReleaseServer) prepareRelease(req *hapi.InstallReleaseRequest) (*releas
Info: &release.Info{ Info: &release.Info{
FirstDeployed: ts, FirstDeployed: ts,
LastDeployed: ts, LastDeployed: ts,
Status: &release.Status{Code: release.Status_UNKNOWN}, Status: release.StatusUnknown,
Description: fmt.Sprintf("Install failed: %s", err), Description: fmt.Sprintf("Install failed: %s", err),
}, },
Version: 0, Version: 0,
@ -114,7 +114,7 @@ func (s *ReleaseServer) prepareRelease(req *hapi.InstallReleaseRequest) (*releas
Info: &release.Info{ Info: &release.Info{
FirstDeployed: ts, FirstDeployed: ts,
LastDeployed: ts, LastDeployed: ts,
Status: &release.Status{Code: release.Status_PENDING_INSTALL}, Status: release.StatusPendingInstall,
Description: "Initial install underway", // Will be overwritten. Description: "Initial install underway", // Will be overwritten.
}, },
Manifest: manifestDoc.String(), Manifest: manifestDoc.String(),
@ -122,7 +122,7 @@ func (s *ReleaseServer) prepareRelease(req *hapi.InstallReleaseRequest) (*releas
Version: revision, Version: revision,
} }
if len(notesTxt) > 0 { if len(notesTxt) > 0 {
rel.Info.Status.Notes = notesTxt rel.Info.Notes = notesTxt
} }
err = validateManifest(s.KubeClient, req.Namespace, manifestDoc.Bytes()) err = validateManifest(s.KubeClient, req.Namespace, manifestDoc.Bytes())
@ -158,7 +158,7 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *hapi.InstallRele
old := h[0] old := h[0]
// update old release status // update old release status
old.Info.Status.Code = release.Status_SUPERSEDED old.Info.Status = release.StatusSuperseded
s.recordRelease(old, true) s.recordRelease(old, true)
// update new release with next revision number // update new release with next revision number
@ -173,8 +173,8 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *hapi.InstallRele
if err := s.updateRelease(old, r, updateReq); err != nil { if err := s.updateRelease(old, r, updateReq); err != nil {
msg := fmt.Sprintf("Release replace %q failed: %s", r.Name, err) msg := fmt.Sprintf("Release replace %q failed: %s", r.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
old.Info.Status.Code = release.Status_SUPERSEDED old.Info.Status = release.StatusSuperseded
r.Info.Status.Code = release.Status_FAILED r.Info.Status = release.StatusFailed
r.Info.Description = msg r.Info.Description = msg
s.recordRelease(old, true) s.recordRelease(old, true)
s.recordRelease(r, true) s.recordRelease(r, true)
@ -189,7 +189,7 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *hapi.InstallRele
if err := s.KubeClient.Create(r.Namespace, b, req.Timeout, req.Wait); err != nil { if err := s.KubeClient.Create(r.Namespace, b, req.Timeout, req.Wait); err != nil {
msg := fmt.Sprintf("Release %q failed: %s", r.Name, err) msg := fmt.Sprintf("Release %q failed: %s", r.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
r.Info.Status.Code = release.Status_FAILED r.Info.Status = release.StatusFailed
r.Info.Description = msg r.Info.Description = msg
s.recordRelease(r, true) s.recordRelease(r, true)
return r, fmt.Errorf("release %s failed: %s", r.Name, err) return r, fmt.Errorf("release %s failed: %s", r.Name, err)
@ -201,14 +201,14 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *hapi.InstallRele
if err := s.execHook(r.Hooks, r.Name, r.Namespace, hooks.PostInstall, req.Timeout); err != nil { if err := s.execHook(r.Hooks, r.Name, r.Namespace, hooks.PostInstall, req.Timeout); err != nil {
msg := fmt.Sprintf("Release %q failed post-install: %s", r.Name, err) msg := fmt.Sprintf("Release %q failed post-install: %s", r.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
r.Info.Status.Code = release.Status_FAILED r.Info.Status = release.StatusFailed
r.Info.Description = msg r.Info.Description = msg
s.recordRelease(r, true) s.recordRelease(r, true)
return r, err return r, err
} }
} }
r.Info.Status.Code = release.Status_DEPLOYED r.Info.Status = release.StatusDeployed
r.Info.Description = "Install complete" r.Info.Description = "Install complete"
// This is a tricky case. The release has been created, but the result // This is a tricky case. The release has been created, but the result
// cannot be recorded. The truest thing to tell the user is that the // cannot be recorded. The truest thing to tell the user is that the

35
pkg/tiller/release_install_test.go
Unescape View File

@ -54,10 +54,10 @@ func TestInstallRelease(t *testing.T) {
t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest) t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest)
} }
if rel.Hooks[0].Events[0] != release.Hook_POST_INSTALL { if rel.Hooks[0].Events[0] != release.HookPostInstall {
t.Errorf("Expected event 0 is post install") t.Errorf("Expected event 0 is post install")
} }
if rel.Hooks[0].Events[1] != release.Hook_PRE_DELETE { if rel.Hooks[0].Events[1] != release.HookPreDelete {
t.Errorf("Expected event 0 is pre-delete") t.Errorf("Expected event 0 is pre-delete")
} }
@ -109,14 +109,14 @@ func TestInstallRelease_WithNotes(t *testing.T) {
t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest) t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest)
} }
if rel.Info.Status.Notes != notesText { if rel.Info.Notes != notesText {
t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Status.Notes) t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Notes)
} }
if rel.Hooks[0].Events[0] != release.Hook_POST_INSTALL { if rel.Hooks[0].Events[0] != release.HookPostInstall {
t.Errorf("Expected event 0 is post install") t.Errorf("Expected event 0 is post install")
} }
if rel.Hooks[0].Events[1] != release.Hook_PRE_DELETE { if rel.Hooks[0].Events[1] != release.HookPreDelete {
t.Errorf("Expected event 0 is pre-delete") t.Errorf("Expected event 0 is pre-delete")
} }
@ -169,14 +169,14 @@ func TestInstallRelease_WithNotesRendered(t *testing.T) {
} }
expectedNotes := fmt.Sprintf("%s %s", notesText, res.Name) expectedNotes := fmt.Sprintf("%s %s", notesText, res.Name)
if rel.Info.Status.Notes != expectedNotes { if rel.Info.Notes != expectedNotes {
t.Fatalf("Expected '%s', got '%s'", expectedNotes, rel.Info.Status.Notes) t.Fatalf("Expected '%s', got '%s'", expectedNotes, rel.Info.Notes)
} }
if rel.Hooks[0].Events[0] != release.Hook_POST_INSTALL { if rel.Hooks[0].Events[0] != release.HookPostInstall {
t.Errorf("Expected event 0 is post install") t.Errorf("Expected event 0 is post install")
} }
if rel.Hooks[0].Events[1] != release.Hook_PRE_DELETE { if rel.Hooks[0].Events[1] != release.HookPreDelete {
t.Errorf("Expected event 0 is pre-delete") t.Errorf("Expected event 0 is pre-delete")
} }
@ -219,8 +219,8 @@ func TestInstallRelease_WithChartAndDependencyNotes(t *testing.T) {
t.Logf("rel: %v", rel) t.Logf("rel: %v", rel)
if rel.Info.Status.Notes != notesText { if rel.Info.Notes != notesText {
t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Status.Notes) t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Notes)
} }
if rel.Info.Description != "Install complete" { if rel.Info.Description != "Install complete" {
@ -305,15 +305,16 @@ func TestInstallRelease_FailedHooks(t *testing.T) {
t.Error("Expected failed install") t.Error("Expected failed install")
} }
if hl := res.Info.Status.Code; hl != release.Status_FAILED { if hl := res.Info.Status; hl != release.StatusFailed {
t.Errorf("Expected FAILED release. Got %d", hl) t.Errorf("Expected FAILED release. Got %s", hl)
} }
} }
func TestInstallRelease_ReuseName(t *testing.T) { func TestInstallRelease_ReuseName(t *testing.T) {
rs := rsFixture() rs := rsFixture()
rs.Log = t.Logf
rel := releaseStub() rel := releaseStub()
rel.Info.Status.Code = release.Status_DELETED rel.Info.Status = release.StatusDeleted
rs.Releases.Create(rel) rs.Releases.Create(rel)
req := installRequest( req := installRequest(
@ -334,8 +335,8 @@ func TestInstallRelease_ReuseName(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Failed to retrieve release: %s", err) t.Errorf("Failed to retrieve release: %s", err)
} }
if getres.Info.Status.Code != release.Status_DEPLOYED { if getres.Info.Status != release.StatusDeployed {
t.Errorf("Release status is %q", getres.Info.Status.Code) t.Errorf("Release status is %q", getres.Info.Status)
} }
} }

10
pkg/tiller/release_list.go
Unescape View File

@ -27,12 +27,12 @@ import (
// ListReleases lists the releases found by the server. // ListReleases lists the releases found by the server.
func (s *ReleaseServer) ListReleases(req *hapi.ListReleasesRequest) ([]*release.Release, error) { func (s *ReleaseServer) ListReleases(req *hapi.ListReleasesRequest) ([]*release.Release, error) {
if len(req.StatusCodes) == 0 { if len(req.StatusCodes) == 0 {
req.StatusCodes = []release.StatusCode{release.Status_DEPLOYED} req.StatusCodes = []release.ReleaseStatus{release.StatusDeployed}
} }
rels, err := s.Releases.ListFilterAll(func(r *release.Release) bool { rels, err := s.Releases.ListFilterAll(func(r *release.Release) bool {
for _, sc := range req.StatusCodes { for _, sc := range req.StatusCodes {
if sc == r.Info.Status.Code { if sc == r.Info.Status {
return true return true
} }
} }
@ -50,13 +50,13 @@ func (s *ReleaseServer) ListReleases(req *hapi.ListReleasesRequest) ([]*release.
} }
switch req.SortBy { switch req.SortBy {
case hapi.ListSort_NAME: case hapi.ListSortName:
relutil.SortByName(rels) relutil.SortByName(rels)
case hapi.ListSort_LAST_RELEASED: case hapi.ListSortLastReleased:
relutil.SortByDate(rels) relutil.SortByDate(rels)
} }
if req.SortOrder == hapi.ListSort_DESC { if req.SortOrder == hapi.ListSortDesc {
ll := len(rels) ll := len(rels)
rr := make([]*release.Release, ll) rr := make([]*release.Release, ll)
for i, item := range rels { for i, item := range rels {

30
pkg/tiller/release_list_test.go
Unescape View File

@ -48,10 +48,10 @@ func TestListReleases(t *testing.T) {
func TestListReleasesByStatus(t *testing.T) { func TestListReleasesByStatus(t *testing.T) {
rs := rsFixture() rs := rsFixture()
stubs := []*release.Release{ stubs := []*release.Release{
namedReleaseStub("kamal", release.Status_DEPLOYED), namedReleaseStub("kamal", release.StatusDeployed),
namedReleaseStub("astrolabe", release.Status_DELETED), namedReleaseStub("astrolabe", release.StatusDeleted),
namedReleaseStub("octant", release.Status_FAILED), namedReleaseStub("octant", release.StatusFailed),
namedReleaseStub("sextant", release.Status_UNKNOWN), namedReleaseStub("sextant", release.StatusUnknown),
} }
for _, stub := range stubs { for _, stub := range stubs {
if err := rs.Releases.Create(stub); err != nil { if err := rs.Releases.Create(stub); err != nil {
@ -60,28 +60,28 @@ func TestListReleasesByStatus(t *testing.T) {
} }
tests := []struct { tests := []struct {
statusCodes []release.StatusCode statusCodes []release.ReleaseStatus
names []string names []string
}{ }{
{ {
names: []string{"kamal"}, names: []string{"kamal"},
statusCodes: []release.StatusCode{release.Status_DEPLOYED}, statusCodes: []release.ReleaseStatus{release.StatusDeployed},
}, },
{ {
names: []string{"astrolabe"}, names: []string{"astrolabe"},
statusCodes: []release.StatusCode{release.Status_DELETED}, statusCodes: []release.ReleaseStatus{release.StatusDeleted},
}, },
{ {
names: []string{"kamal", "octant"}, names: []string{"kamal", "octant"},
statusCodes: []release.StatusCode{release.Status_DEPLOYED, release.Status_FAILED}, statusCodes: []release.ReleaseStatus{release.StatusDeployed, release.StatusFailed},
}, },
{ {
names: []string{"kamal", "astrolabe", "octant", "sextant"}, names: []string{"kamal", "astrolabe", "octant", "sextant"},
statusCodes: []release.StatusCode{ statusCodes: []release.ReleaseStatus{
release.Status_DEPLOYED, release.StatusDeployed,
release.Status_DELETED, release.StatusDeleted,
release.Status_FAILED, release.StatusFailed,
release.Status_UNKNOWN, release.StatusUnknown,
}, },
}, },
} }
@ -128,7 +128,7 @@ func TestListReleasesSort(t *testing.T) {
req := &hapi.ListReleasesRequest{ req := &hapi.ListReleasesRequest{
Offset: "", Offset: "",
Limit: int64(limit), Limit: int64(limit),
SortBy: hapi.ListSort_NAME, SortBy: hapi.ListSortName,
} }
rels, err := rs.ListReleases(req) rels, err := rs.ListReleases(req)
if err != nil { if err != nil {
@ -171,7 +171,7 @@ func TestListReleasesFilter(t *testing.T) {
Offset: "", Offset: "",
Limit: 64, Limit: 64,
Filter: "neuro[a-z]+", Filter: "neuro[a-z]+",
SortBy: hapi.ListSort_NAME, SortBy: hapi.ListSortName,
} }
rels, err := rs.ListReleases(req) rels, err := rs.ListReleases(req)
if err != nil { if err != nil {

14
pkg/tiller/release_rollback.go
Unescape View File

@ -94,10 +94,8 @@ func (s *ReleaseServer) prepareRollback(req *hapi.RollbackReleaseRequest) (*rele
Info: &release.Info{ Info: &release.Info{
FirstDeployed: currentRelease.Info.FirstDeployed, FirstDeployed: currentRelease.Info.FirstDeployed,
LastDeployed: time.Now(), LastDeployed: time.Now(),
Status: &release.Status{ Status: release.StatusPendingRollback,
Code: release.Status_PENDING_ROLLBACK, Notes: previousRelease.Info.Notes,
Notes: previousRelease.Info.Status.Notes,
},
// Because we lose the reference to previous version elsewhere, we set the // Because we lose the reference to previous version elsewhere, we set the
// message here, and only override it later if we experience failure. // message here, and only override it later if we experience failure.
Description: fmt.Sprintf("Rollback to %d", previousVersion), Description: fmt.Sprintf("Rollback to %d", previousVersion),
@ -131,8 +129,8 @@ func (s *ReleaseServer) performRollback(currentRelease, targetRelease *release.R
if err := s.KubeClient.Update(targetRelease.Namespace, c, t, req.Force, req.Recreate, req.Timeout, req.Wait); err != nil { if err := s.KubeClient.Update(targetRelease.Namespace, c, t, req.Force, req.Recreate, req.Timeout, req.Wait); err != nil {
msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err) msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
currentRelease.Info.Status.Code = release.Status_SUPERSEDED currentRelease.Info.Status = release.StatusSuperseded
targetRelease.Info.Status.Code = release.Status_FAILED targetRelease.Info.Status = release.StatusFailed
targetRelease.Info.Description = msg targetRelease.Info.Description = msg
s.recordRelease(currentRelease, true) s.recordRelease(currentRelease, true)
s.recordRelease(targetRelease, true) s.recordRelease(targetRelease, true)
@ -153,11 +151,11 @@ func (s *ReleaseServer) performRollback(currentRelease, targetRelease *release.R
// Supersede all previous deployments, see issue #2941. // Supersede all previous deployments, see issue #2941.
for _, r := range deployed { for _, r := range deployed {
s.Log("superseding previous deployment %d", r.Version) s.Log("superseding previous deployment %d", r.Version)
r.Info.Status.Code = release.Status_SUPERSEDED r.Info.Status = release.StatusSuperseded
s.recordRelease(r, true) s.recordRelease(r, true)
} }
targetRelease.Info.Status.Code = release.Status_DEPLOYED targetRelease.Info.Status = release.StatusDeployed
return targetRelease, nil return targetRelease, nil
} }

28
pkg/tiller/release_rollback_test.go
Unescape View File

@ -36,8 +36,8 @@ func TestRollbackRelease(t *testing.T) {
Path: "test-cm", Path: "test-cm",
Manifest: manifestWithRollbackHooks, Manifest: manifestWithRollbackHooks,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_PRE_ROLLBACK, release.HookPreRollback,
release.Hook_POST_ROLLBACK, release.HookPostRollback,
}, },
}, },
} }
@ -109,11 +109,11 @@ func TestRollbackRelease(t *testing.T) {
t.Errorf("Expected release version to be %v, got %v", 3, res.Version) t.Errorf("Expected release version to be %v, got %v", 3, res.Version)
} }
if updated.Hooks[0].Events[0] != release.Hook_PRE_ROLLBACK { if updated.Hooks[0].Events[0] != release.HookPreRollback {
t.Errorf("Expected event 0 to be pre rollback") t.Errorf("Expected event 0 to be pre rollback")
} }
if updated.Hooks[0].Events[1] != release.Hook_POST_ROLLBACK { if updated.Hooks[0].Events[1] != release.HookPostRollback {
t.Errorf("Expected event 1 to be post rollback") t.Errorf("Expected event 1 to be post rollback")
} }
@ -146,8 +146,8 @@ func TestRollbackWithReleaseVersion(t *testing.T) {
rs.Releases.Create(v2) rs.Releases.Create(v2)
v3 := upgradeReleaseVersion(v2) v3 := upgradeReleaseVersion(v2)
// retain the original release as DEPLOYED while the update should fail // retain the original release as DEPLOYED while the update should fail
v2.Info.Status.Code = release.Status_DEPLOYED v2.Info.Status = release.StatusDeployed
v3.Info.Status.Code = release.Status_FAILED v3.Info.Status = release.StatusFailed
rs.Releases.Update(v2) rs.Releases.Update(v2)
rs.Releases.Create(v3) rs.Releases.Create(v3)
@ -166,16 +166,16 @@ func TestRollbackWithReleaseVersion(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Failed to retrieve v1: %s", err) t.Fatalf("Failed to retrieve v1: %s", err)
} }
if oldRel.Info.Status.Code != release.Status_SUPERSEDED { if oldRel.Info.Status != release.StatusSuperseded {
t.Errorf("Expected v2 to be in a SUPERSEDED state, got %q", oldRel.Info.Status.Code) t.Errorf("Expected v2 to be in a SUPERSEDED state, got %q", oldRel.Info.Status)
} }
// make sure we didn't update some other deployments. // make sure we didn't update some other deployments.
otherRel, err := rs.Releases.Get(rel2.Name, 1) otherRel, err := rs.Releases.Get(rel2.Name, 1)
if err != nil { if err != nil {
t.Fatalf("Failed to retrieve other v1: %s", err) t.Fatalf("Failed to retrieve other v1: %s", err)
} }
if otherRel.Info.Status.Code != release.Status_DEPLOYED { if otherRel.Info.Status != release.StatusDeployed {
t.Errorf("Expected other deployed release to stay untouched, got %q", otherRel.Info.Status.Code) t.Errorf("Expected other deployed release to stay untouched, got %q", otherRel.Info.Status)
} }
} }
@ -189,8 +189,8 @@ func TestRollbackReleaseNoHooks(t *testing.T) {
Path: "test-cm", Path: "test-cm",
Manifest: manifestWithRollbackHooks, Manifest: manifestWithRollbackHooks,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_PRE_ROLLBACK, release.HookPreRollback,
release.Hook_POST_ROLLBACK, release.HookPostRollback,
}, },
}, },
} }
@ -233,7 +233,7 @@ func TestRollbackReleaseFailure(t *testing.T) {
t.Error("Expected failed rollback") t.Error("Expected failed rollback")
} }
if targetStatus := res.Info.Status.Code; targetStatus != release.Status_FAILED { if targetStatus := res.Info.Status; targetStatus != release.StatusFailed {
t.Errorf("Expected FAILED release. Got %v", targetStatus) t.Errorf("Expected FAILED release. Got %v", targetStatus)
} }
@ -241,7 +241,7 @@ func TestRollbackReleaseFailure(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Expected to be able to get previous release") t.Errorf("Expected to be able to get previous release")
} }
if oldStatus := oldRelease.Info.Status.Code; oldStatus != release.Status_SUPERSEDED { if oldStatus := oldRelease.Info.Status; oldStatus != release.StatusSuperseded {
t.Errorf("Expected SUPERSEDED status on previous Release version. Got %v", oldStatus) t.Errorf("Expected SUPERSEDED status on previous Release version. Got %v", oldStatus)
} }
} }

2
pkg/tiller/release_server.go
Unescape View File

@ -180,7 +180,7 @@ func (s *ReleaseServer) uniqName(start string, reuse bool) (string, error) {
relutil.Reverse(h, relutil.SortByRevision) relutil.Reverse(h, relutil.SortByRevision)
rel := h[0] rel := h[0]
if st := rel.Info.Status.Code; reuse && (st == release.Status_DELETED || st == release.Status_FAILED) { if st := rel.Info.Status; reuse && (st == release.StatusDeleted || st == release.StatusFailed) {
// Allowe re-use of names if the previous release is marked deleted. // Allowe re-use of names if the previous release is marked deleted.
s.Log("name %s exists but is not in use, reusing name", start) s.Log("name %s exists but is not in use, reusing name", start)
return start, nil return start, nil

46
pkg/tiller/release_server_test.go
Unescape View File

@ -214,16 +214,16 @@ func chartStub() *chart.Chart {
// releaseStub creates a release stub, complete with the chartStub as its chart. // releaseStub creates a release stub, complete with the chartStub as its chart.
func releaseStub() *release.Release { func releaseStub() *release.Release {
return namedReleaseStub("angry-panda", release.Status_DEPLOYED) return namedReleaseStub("angry-panda", release.StatusDeployed)
} }
func namedReleaseStub(name string, status release.StatusCode) *release.Release { func namedReleaseStub(name string, status release.ReleaseStatus) *release.Release {
return &release.Release{ return &release.Release{
Name: name, Name: name,
Info: &release.Info{ Info: &release.Info{
FirstDeployed: time.Now(), FirstDeployed: time.Now(),
LastDeployed: time.Now(), LastDeployed: time.Now(),
Status: &release.Status{Code: status}, Status: status,
Description: "Named Release Stub", Description: "Named Release Stub",
}, },
Chart: chartStub(), Chart: chartStub(),
@ -236,8 +236,8 @@ func namedReleaseStub(name string, status release.StatusCode) *release.Release {
Path: "test-cm", Path: "test-cm",
Manifest: manifestWithHook, Manifest: manifestWithHook,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_POST_INSTALL, release.HookPostInstall,
release.Hook_PRE_DELETE, release.HookPreDelete,
}, },
}, },
{ {
@ -246,7 +246,7 @@ func namedReleaseStub(name string, status release.StatusCode) *release.Release {
Path: "finding-nemo", Path: "finding-nemo",
Manifest: manifestWithTestHook, Manifest: manifestWithTestHook,
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_RELEASE_TEST_SUCCESS, release.HookReleaseTestSuccess,
}, },
}, },
}, },
@ -254,13 +254,13 @@ func namedReleaseStub(name string, status release.StatusCode) *release.Release {
} }
func upgradeReleaseVersion(rel *release.Release) *release.Release { func upgradeReleaseVersion(rel *release.Release) *release.Release {
rel.Info.Status.Code = release.Status_SUPERSEDED rel.Info.Status = release.StatusSuperseded
return &release.Release{ return &release.Release{
Name: rel.Name, Name: rel.Name,
Info: &release.Info{ Info: &release.Info{
FirstDeployed: rel.Info.FirstDeployed, FirstDeployed: rel.Info.FirstDeployed,
LastDeployed: time.Now(), LastDeployed: time.Now(),
Status: &release.Status{Code: release.Status_DEPLOYED}, Status: release.StatusDeployed,
}, },
Chart: rel.Chart, Chart: rel.Chart,
Config: rel.Config, Config: rel.Config,
@ -311,7 +311,7 @@ func TestUniqName(t *testing.T) {
rel1 := releaseStub() rel1 := releaseStub()
rel2 := releaseStub() rel2 := releaseStub()
rel2.Name = "happy-panda" rel2.Name = "happy-panda"
rel2.Info.Status.Code = release.Status_DELETED rel2.Info.Status = release.StatusDeleted
rs.Releases.Create(rel1) rs.Releases.Create(rel1)
rs.Releases.Create(rel2) rs.Releases.Create(rel2)
@ -364,7 +364,7 @@ func releaseWithKeepStub(rlsName string) *release.Release {
Info: &release.Info{ Info: &release.Info{
FirstDeployed: time.Now(), FirstDeployed: time.Now(),
LastDeployed: time.Now(), LastDeployed: time.Now(),
Status: &release.Status{Code: release.Status_DEPLOYED}, Status: release.StatusDeployed,
}, },
Chart: ch, Chart: ch,
Config: []byte(`name: value`), Config: []byte(`name: value`),
@ -514,8 +514,8 @@ metadata:
%sdata: %sdata:
name: value`, hookName, extraAnnotationsStr), name: value`, hookName, extraAnnotationsStr),
Events: []release.HookEvent{ Events: []release.HookEvent{
release.Hook_PRE_INSTALL, release.HookPreInstall,
release.Hook_PRE_UPGRADE, release.HookPreUpgrade,
}, },
DeletePolicies: DeletePolicies, DeletePolicies: DeletePolicies,
} }
@ -595,7 +595,7 @@ func TestSuccessfulHookWithSucceededDeletePolicy(t *testing.T) {
ctx := newDeletePolicyContext() ctx := newDeletePolicyContext()
hook := deletePolicyHookStub(ctx.HookName, hook := deletePolicyHookStub(ctx.HookName,
map[string]string{"helm.sh/hook-delete-policy": "hook-succeeded"}, map[string]string{"helm.sh/hook-delete-policy": "hook-succeeded"},
[]release.HookDeletePolicy{release.Hook_SUCCEEDED}, []release.HookDeletePolicy{release.HookSucceeded},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -610,7 +610,7 @@ func TestSuccessfulHookWithFailedDeletePolicy(t *testing.T) {
ctx := newDeletePolicyContext() ctx := newDeletePolicyContext()
hook := deletePolicyHookStub(ctx.HookName, hook := deletePolicyHookStub(ctx.HookName,
map[string]string{"helm.sh/hook-delete-policy": "hook-failed"}, map[string]string{"helm.sh/hook-delete-policy": "hook-failed"},
[]release.HookDeletePolicy{release.Hook_FAILED}, []release.HookDeletePolicy{release.HookFailed},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -629,7 +629,7 @@ func TestFailedHookWithSucceededDeletePolicy(t *testing.T) {
"mockHooksKubeClient/Emulate": "hook-failed", "mockHooksKubeClient/Emulate": "hook-failed",
"helm.sh/hook-delete-policy": "hook-succeeded", "helm.sh/hook-delete-policy": "hook-succeeded",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED}, []release.HookDeletePolicy{release.HookSucceeded},
) )
if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -648,7 +648,7 @@ func TestFailedHookWithFailedDeletePolicy(t *testing.T) {
"mockHooksKubeClient/Emulate": "hook-failed", "mockHooksKubeClient/Emulate": "hook-failed",
"helm.sh/hook-delete-policy": "hook-failed", "helm.sh/hook-delete-policy": "hook-failed",
}, },
[]release.HookDeletePolicy{release.Hook_FAILED}, []release.HookDeletePolicy{release.HookFailed},
) )
if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -666,7 +666,7 @@ func TestSuccessfulHookWithSuccededOrFailedDeletePolicy(t *testing.T) {
map[string]string{ map[string]string{
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed", "helm.sh/hook-delete-policy": "hook-succeeded,hook-failed",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_FAILED}, []release.HookDeletePolicy{release.HookSucceeded, release.HookFailed},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -685,7 +685,7 @@ func TestFailedHookWithSuccededOrFailedDeletePolicy(t *testing.T) {
"mockHooksKubeClient/Emulate": "hook-failed", "mockHooksKubeClient/Emulate": "hook-failed",
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed", "helm.sh/hook-delete-policy": "hook-succeeded,hook-failed",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_FAILED}, []release.HookDeletePolicy{release.HookSucceeded, release.HookFailed},
) )
if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -720,7 +720,7 @@ func TestHookDeletingWithBeforeHookCreationDeletePolicy(t *testing.T) {
hook := deletePolicyHookStub(ctx.HookName, hook := deletePolicyHookStub(ctx.HookName,
map[string]string{"helm.sh/hook-delete-policy": "before-hook-creation"}, map[string]string{"helm.sh/hook-delete-policy": "before-hook-creation"},
[]release.HookDeletePolicy{release.Hook_BEFORE_HOOK_CREATION}, []release.HookDeletePolicy{release.HookBeforeHookCreation},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -744,7 +744,7 @@ func TestSuccessfulHookWithMixedDeletePolicies(t *testing.T) {
map[string]string{ map[string]string{
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation", "helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_BEFORE_HOOK_CREATION}, []release.HookDeletePolicy{release.HookSucceeded, release.HookBeforeHookCreation},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -769,7 +769,7 @@ func TestFailedHookWithMixedDeletePolicies(t *testing.T) {
"mockHooksKubeClient/Emulate": "hook-failed", "mockHooksKubeClient/Emulate": "hook-failed",
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation", "helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_BEFORE_HOOK_CREATION}, []release.HookDeletePolicy{release.HookSucceeded, release.HookBeforeHookCreation},
) )
if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -794,7 +794,7 @@ func TestFailedThenSuccessfulHookWithMixedDeletePolicies(t *testing.T) {
"mockHooksKubeClient/Emulate": "hook-failed", "mockHooksKubeClient/Emulate": "hook-failed",
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation", "helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_BEFORE_HOOK_CREATION}, []release.HookDeletePolicy{release.HookSucceeded, release.HookBeforeHookCreation},
) )
if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil { if err := execHookShouldFail(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreInstall); err != nil {
@ -808,7 +808,7 @@ func TestFailedThenSuccessfulHookWithMixedDeletePolicies(t *testing.T) {
map[string]string{ map[string]string{
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation", "helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation",
}, },
[]release.HookDeletePolicy{release.Hook_SUCCEEDED, release.Hook_BEFORE_HOOK_CREATION}, []release.HookDeletePolicy{release.HookSucceeded, release.HookBeforeHookCreation},
) )
if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreUpgrade); err != nil { if err := execHookShouldSucceed(ctx.ReleaseServer, hook, ctx.ReleaseName, ctx.Namespace, hooks.PreUpgrade); err != nil {

6
pkg/tiller/release_status.go
Unescape View File

@ -54,7 +54,7 @@ func (s *ReleaseServer) GetReleaseStatus(req *hapi.GetReleaseStatusRequest) (*ha
return nil, errors.New("release chart is missing") return nil, errors.New("release chart is missing")
} }
sc := rel.Info.Status.Code sc := rel.Info.Status
statusResp := &hapi.GetReleaseStatusResponse{ statusResp := &hapi.GetReleaseStatusResponse{
Name: rel.Name, Name: rel.Name,
Namespace: rel.Namespace, Namespace: rel.Namespace,
@ -64,13 +64,13 @@ func (s *ReleaseServer) GetReleaseStatus(req *hapi.GetReleaseStatusRequest) (*ha
// Ok, we got the status of the release as we had jotted down, now we need to match the // Ok, we got the status of the release as we had jotted down, now we need to match the
// manifest we stashed away with reality from the cluster. // manifest we stashed away with reality from the cluster.
resp, err := s.KubeClient.Get(rel.Namespace, bytes.NewBufferString(rel.Manifest)) resp, err := s.KubeClient.Get(rel.Namespace, bytes.NewBufferString(rel.Manifest))
if sc == release.Status_DELETED || sc == release.Status_FAILED { if sc == release.StatusDeleted || sc == release.StatusFailed {
// Skip errors if this is already deleted or failed. // Skip errors if this is already deleted or failed.
return statusResp, nil return statusResp, nil
} else if err != nil { } else if err != nil {
s.Log("warning: Get for %s failed: %v", rel.Name, err) s.Log("warning: Get for %s failed: %v", rel.Name, err)
return nil, err return nil, err
} }
rel.Info.Status.Resources = resp rel.Info.Resources = resp
return statusResp, nil return statusResp, nil
} }

10
pkg/tiller/release_status_test.go
Unescape View File

@ -38,15 +38,15 @@ func TestGetReleaseStatus(t *testing.T) {
if res.Name != rel.Name { if res.Name != rel.Name {
t.Errorf("Expected name %q, got %q", rel.Name, res.Name) t.Errorf("Expected name %q, got %q", rel.Name, res.Name)
} }
if res.Info.Status.Code != release.Status_DEPLOYED { if res.Info.Status != release.StatusDeployed {
t.Errorf("Expected %d, got %d", release.Status_DEPLOYED, res.Info.Status.Code) t.Errorf("Expected %s, got %s", release.StatusDeployed, res.Info.Status)
} }
} }
func TestGetReleaseStatusDeleted(t *testing.T) { func TestGetReleaseStatusDeleted(t *testing.T) {
rs := rsFixture() rs := rsFixture()
rel := releaseStub() rel := releaseStub()
rel.Info.Status.Code = release.Status_DELETED rel.Info.Status = release.StatusDeleted
if err := rs.Releases.Create(rel); err != nil { if err := rs.Releases.Create(rel); err != nil {
t.Fatalf("Could not store mock release: %s", err) t.Fatalf("Could not store mock release: %s", err)
} }
@ -56,7 +56,7 @@ func TestGetReleaseStatusDeleted(t *testing.T) {
t.Fatalf("Error getting release content: %s", err) t.Fatalf("Error getting release content: %s", err)
} }
if res.Info.Status.Code != release.Status_DELETED { if res.Info.Status != release.StatusDeleted {
t.Errorf("Expected %d, got %d", release.Status_DELETED, res.Info.Status.Code) t.Errorf("Expected %s, got %s", release.StatusDeleted, res.Info.Status)
} }
} }

2
pkg/tiller/release_testing.go
Unescape View File

@ -58,7 +58,7 @@ func (s *ReleaseServer) RunReleaseTest(req *hapi.TestReleaseRequest) (<-chan *ha
return return
} }
rel.Info.Status.LastTestSuiteRun = &release.TestSuite{ rel.Info.LastTestSuiteRun = &release.TestSuite{
StartedAt: tSuite.StartedAt, StartedAt: tSuite.StartedAt,
CompletedAt: tSuite.CompletedAt, CompletedAt: tSuite.CompletedAt,
Results: tSuite.Results, Results: tSuite.Results,

8
pkg/tiller/release_uninstall.go
Unescape View File

@ -51,7 +51,7 @@ func (s *ReleaseServer) UninstallRelease(req *hapi.UninstallReleaseRequest) (*ha
// TODO: Are there any cases where we want to force a delete even if it's // TODO: Are there any cases where we want to force a delete even if it's
// already marked deleted? // already marked deleted?
if rel.Info.Status.Code == release.Status_DELETED { if rel.Info.Status == release.StatusDeleted {
if req.Purge { if req.Purge {
if err := s.purgeReleases(rels...); err != nil { if err := s.purgeReleases(rels...); err != nil {
s.Log("uninstall: Failed to purge the release: %s", err) s.Log("uninstall: Failed to purge the release: %s", err)
@ -63,7 +63,7 @@ func (s *ReleaseServer) UninstallRelease(req *hapi.UninstallReleaseRequest) (*ha
} }
s.Log("uninstall: Deleting %s", req.Name) s.Log("uninstall: Deleting %s", req.Name)
rel.Info.Status.Code = release.Status_DELETING rel.Info.Status = release.StatusDeleting
rel.Info.Deleted = time.Now() rel.Info.Deleted = time.Now()
rel.Info.Description = "Deletion in progress (or silently failed)" rel.Info.Description = "Deletion in progress (or silently failed)"
res := &hapi.UninstallReleaseResponse{Release: rel} res := &hapi.UninstallReleaseResponse{Release: rel}
@ -76,7 +76,7 @@ func (s *ReleaseServer) UninstallRelease(req *hapi.UninstallReleaseRequest) (*ha
s.Log("delete hooks disabled for %s", req.Name) s.Log("delete hooks disabled for %s", req.Name)
} }
// From here on out, the release is currently considered to be in Status_DELETING // From here on out, the release is currently considered to be in StatusDeleting
// state. // state.
if err := s.Releases.Update(rel); err != nil { if err := s.Releases.Update(rel); err != nil {
s.Log("uninstall: Failed to store updated release: %s", err) s.Log("uninstall: Failed to store updated release: %s", err)
@ -91,7 +91,7 @@ func (s *ReleaseServer) UninstallRelease(req *hapi.UninstallReleaseRequest) (*ha
} }
} }
rel.Info.Status.Code = release.Status_DELETED rel.Info.Status = release.StatusDeleted
rel.Info.Description = "Deletion complete" rel.Info.Description = "Deletion complete"
if req.Purge { if req.Purge {

12
pkg/tiller/release_uninstall_test.go
Unescape View File

@ -41,8 +41,8 @@ func TestUninstallRelease(t *testing.T) {
t.Errorf("Expected angry-panda, got %q", res.Release.Name) t.Errorf("Expected angry-panda, got %q", res.Release.Name)
} }
if res.Release.Info.Status.Code != release.Status_DELETED { if res.Release.Info.Status != release.StatusDeleted {
t.Errorf("Expected status code to be DELETED, got %d", res.Release.Info.Status.Code) t.Errorf("Expected status code to be DELETED, got %s", res.Release.Info.Status)
} }
if res.Release.Hooks[0].LastRun.IsZero() { if res.Release.Hooks[0].LastRun.IsZero() {
@ -80,8 +80,8 @@ func TestUninstallPurgeRelease(t *testing.T) {
t.Errorf("Expected angry-panda, got %q", res.Release.Name) t.Errorf("Expected angry-panda, got %q", res.Release.Name)
} }
if res.Release.Info.Status.Code != release.Status_DELETED { if res.Release.Info.Status != release.StatusDeleted {
t.Errorf("Expected status code to be DELETED, got %d", res.Release.Info.Status.Code) t.Errorf("Expected status code to be DELETED, got %s", res.Release.Info.Status)
} }
if res.Release.Info.Deleted.Second() <= 0 { if res.Release.Info.Deleted.Second() <= 0 {
@ -138,8 +138,8 @@ func TestUninstallReleaseWithKeepPolicy(t *testing.T) {
t.Errorf("Expected angry-bunny, got %q", res.Release.Name) t.Errorf("Expected angry-bunny, got %q", res.Release.Name)
} }
if res.Release.Info.Status.Code != release.Status_DELETED { if res.Release.Info.Status != release.StatusDeleted {
t.Errorf("Expected status code to be DELETED, got %d", res.Release.Info.Status.Code) t.Errorf("Expected status code to be DELETED, got %s", res.Release.Info.Status)
} }
if res.Info == "" { if res.Info == "" {

22
pkg/tiller/release_update.go
Unescape View File

@ -126,7 +126,7 @@ func (s *ReleaseServer) prepareUpdate(req *hapi.UpdateReleaseRequest) (*release.
Info: &release.Info{ Info: &release.Info{
FirstDeployed: currentRelease.Info.FirstDeployed, FirstDeployed: currentRelease.Info.FirstDeployed,
LastDeployed: ts, LastDeployed: ts,
Status: &release.Status{Code: release.Status_PENDING_UPGRADE}, Status: release.StatusPendingUpgrade,
Description: "Preparing upgrade", // This should be overwritten later. Description: "Preparing upgrade", // This should be overwritten later.
}, },
Version: revision, Version: revision,
@ -135,7 +135,7 @@ func (s *ReleaseServer) prepareUpdate(req *hapi.UpdateReleaseRequest) (*release.
} }
if len(notesTxt) > 0 { if len(notesTxt) > 0 {
updatedRelease.Info.Status.Notes = notesTxt updatedRelease.Info.Notes = notesTxt
} }
err = validateManifest(s.KubeClient, currentRelease.Namespace, manifestDoc.Bytes()) err = validateManifest(s.KubeClient, currentRelease.Namespace, manifestDoc.Bytes())
return currentRelease, updatedRelease, err return currentRelease, updatedRelease, err
@ -170,9 +170,9 @@ func (s *ReleaseServer) performUpdateForce(req *hapi.UpdateReleaseRequest) (*rel
return newRelease, err return newRelease, err
} }
// From here on out, the release is considered to be in Status_DELETING or Status_DELETED // From here on out, the release is considered to be in StatusDeleting or StatusDeleted
// state. There is no turning back. // state. There is no turning back.
oldRelease.Info.Status.Code = release.Status_DELETING oldRelease.Info.Status = release.StatusDeleting
oldRelease.Info.Deleted = time.Now() oldRelease.Info.Deleted = time.Now()
oldRelease.Info.Description = "Deletion in progress (or silently failed)" oldRelease.Info.Description = "Deletion in progress (or silently failed)"
s.recordRelease(oldRelease, true) s.recordRelease(oldRelease, true)
@ -189,7 +189,7 @@ func (s *ReleaseServer) performUpdateForce(req *hapi.UpdateReleaseRequest) (*rel
// delete manifests from the old release // delete manifests from the old release
_, errs := s.deleteRelease(oldRelease) _, errs := s.deleteRelease(oldRelease)
oldRelease.Info.Status.Code = release.Status_DELETED oldRelease.Info.Status = release.StatusDeleted
oldRelease.Info.Description = "Deletion complete" oldRelease.Info.Description = "Deletion complete"
s.recordRelease(oldRelease, true) s.recordRelease(oldRelease, true)
@ -217,7 +217,7 @@ func (s *ReleaseServer) performUpdateForce(req *hapi.UpdateReleaseRequest) (*rel
if err := s.updateRelease(oldRelease, newRelease, req); err != nil { if err := s.updateRelease(oldRelease, newRelease, req); err != nil {
msg := fmt.Sprintf("Upgrade %q failed: %s", newRelease.Name, err) msg := fmt.Sprintf("Upgrade %q failed: %s", newRelease.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
newRelease.Info.Status.Code = release.Status_FAILED newRelease.Info.Status = release.StatusFailed
newRelease.Info.Description = msg newRelease.Info.Description = msg
s.recordRelease(newRelease, true) s.recordRelease(newRelease, true)
return newRelease, err return newRelease, err
@ -228,14 +228,14 @@ func (s *ReleaseServer) performUpdateForce(req *hapi.UpdateReleaseRequest) (*rel
if err := s.execHook(newRelease.Hooks, newRelease.Name, newRelease.Namespace, hooks.PostInstall, req.Timeout); err != nil { if err := s.execHook(newRelease.Hooks, newRelease.Name, newRelease.Namespace, hooks.PostInstall, req.Timeout); err != nil {
msg := fmt.Sprintf("Release %q failed post-install: %s", newRelease.Name, err) msg := fmt.Sprintf("Release %q failed post-install: %s", newRelease.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
newRelease.Info.Status.Code = release.Status_FAILED newRelease.Info.Status = release.StatusFailed
newRelease.Info.Description = msg newRelease.Info.Description = msg
s.recordRelease(newRelease, true) s.recordRelease(newRelease, true)
return newRelease, err return newRelease, err
} }
} }
newRelease.Info.Status.Code = release.Status_DEPLOYED newRelease.Info.Status = release.StatusDeployed
newRelease.Info.Description = "Upgrade complete" newRelease.Info.Description = "Upgrade complete"
s.recordRelease(newRelease, true) s.recordRelease(newRelease, true)
@ -261,7 +261,7 @@ func (s *ReleaseServer) performUpdate(originalRelease, updatedRelease *release.R
if err := s.updateRelease(originalRelease, updatedRelease, req); err != nil { if err := s.updateRelease(originalRelease, updatedRelease, req); err != nil {
msg := fmt.Sprintf("Upgrade %q failed: %s", updatedRelease.Name, err) msg := fmt.Sprintf("Upgrade %q failed: %s", updatedRelease.Name, err)
s.Log("warning: %s", msg) s.Log("warning: %s", msg)
updatedRelease.Info.Status.Code = release.Status_FAILED updatedRelease.Info.Status = release.StatusFailed
updatedRelease.Info.Description = msg updatedRelease.Info.Description = msg
s.recordRelease(originalRelease, true) s.recordRelease(originalRelease, true)
s.recordRelease(updatedRelease, true) s.recordRelease(updatedRelease, true)
@ -275,10 +275,10 @@ func (s *ReleaseServer) performUpdate(originalRelease, updatedRelease *release.R
} }
} }
originalRelease.Info.Status.Code = release.Status_SUPERSEDED originalRelease.Info.Status = release.StatusSuperseded
s.recordRelease(originalRelease, true) s.recordRelease(originalRelease, true)
updatedRelease.Info.Status.Code = release.Status_DEPLOYED updatedRelease.Info.Status = release.StatusDeployed
updatedRelease.Info.Description = "Upgrade complete" updatedRelease.Info.Description = "Upgrade complete"
return updatedRelease, nil return updatedRelease, nil

18
pkg/tiller/release_update_test.go
Unescape View File

@ -68,11 +68,11 @@ func TestUpdateRelease(t *testing.T) {
t.Errorf("Unexpected manifest: %v", updated.Hooks[0].Manifest) t.Errorf("Unexpected manifest: %v", updated.Hooks[0].Manifest)
} }
if updated.Hooks[0].Events[0] != release.Hook_POST_UPGRADE { if updated.Hooks[0].Events[0] != release.HookPostUpgrade {
t.Errorf("Expected event 0 to be post upgrade") t.Errorf("Expected event 0 to be post upgrade")
} }
if updated.Hooks[0].Events[1] != release.Hook_PRE_UPGRADE { if updated.Hooks[0].Events[1] != release.HookPreUpgrade {
t.Errorf("Expected event 0 to be pre upgrade") t.Errorf("Expected event 0 to be pre upgrade")
} }
@ -309,8 +309,8 @@ func TestUpdateReleaseFailure(t *testing.T) {
t.Error("Expected failed update") t.Error("Expected failed update")
} }
if updatedStatus := res.Info.Status.Code; updatedStatus != release.Status_FAILED { if updatedStatus := res.Info.Status; updatedStatus != release.StatusFailed {
t.Errorf("Expected FAILED release. Got %d", updatedStatus) t.Errorf("Expected FAILED release. Got %s", updatedStatus)
} }
compareStoredAndReturnedRelease(t, *rs, res) compareStoredAndReturnedRelease(t, *rs, res)
@ -324,14 +324,14 @@ func TestUpdateReleaseFailure(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Expected to be able to get previous release") t.Errorf("Expected to be able to get previous release")
} }
if oldStatus := oldRelease.Info.Status.Code; oldStatus != release.Status_DEPLOYED { if oldStatus := oldRelease.Info.Status; oldStatus != release.StatusDeployed {
t.Errorf("Expected Deployed status on previous Release version. Got %v", oldStatus) t.Errorf("Expected Deployed status on previous Release version. Got %v", oldStatus)
} }
} }
func TestUpdateReleaseFailure_Force(t *testing.T) { func TestUpdateReleaseFailure_Force(t *testing.T) {
rs := rsFixture() rs := rsFixture()
rel := namedReleaseStub("forceful-luke", release.Status_FAILED) rel := namedReleaseStub("forceful-luke", release.StatusFailed)
rs.Releases.Create(rel) rs.Releases.Create(rel)
req := &hapi.UpdateReleaseRequest{ req := &hapi.UpdateReleaseRequest{
@ -351,8 +351,8 @@ func TestUpdateReleaseFailure_Force(t *testing.T) {
t.Errorf("Expected successful update, got %v", err) t.Errorf("Expected successful update, got %v", err)
} }
if updatedStatus := res.Info.Status.Code; updatedStatus != release.Status_DEPLOYED { if updatedStatus := res.Info.Status; updatedStatus != release.StatusDeployed {
t.Errorf("Expected DEPLOYED release. Got %d", updatedStatus) t.Errorf("Expected DEPLOYED release. Got %s", updatedStatus)
} }
compareStoredAndReturnedRelease(t, *rs, res) compareStoredAndReturnedRelease(t, *rs, res)
@ -366,7 +366,7 @@ func TestUpdateReleaseFailure_Force(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Expected to be able to get previous release") t.Errorf("Expected to be able to get previous release")
} }
if oldStatus := oldRelease.Info.Status.Code; oldStatus != release.Status_DELETED { if oldStatus := oldRelease.Info.Status; oldStatus != release.StatusDeleted {
t.Errorf("Expected Deleted status on previous Release version. Got %v", oldStatus) t.Errorf("Expected Deleted status on previous Release version. Got %v", oldStatus)
} }
} }

Write Preview
Loading…
Cancel
Save