add deprication notice for test hooks

Signed-off-by: Michelle Noorali <michellemolu@gmail.com>
pull/5911/head
Michelle Noorali 6 years ago
parent 16df353e5b
commit 3ba9af7df7

@ -39,6 +39,7 @@ const (
PostUpgrade = "post-upgrade" PostUpgrade = "post-upgrade"
PreRollback = "pre-rollback" PreRollback = "pre-rollback"
PostRollback = "post-rollback" PostRollback = "post-rollback"
//TODO: remove test hooks entirely when release helm v3.0.0-beta
ReleaseTestSuccess = "test-success" ReleaseTestSuccess = "test-success"
ReleaseTestFailure = "test-failure" ReleaseTestFailure = "test-failure"
) )

@ -30,6 +30,7 @@ const (
HookPostUpgrade HookEvent = "post-upgrade" HookPostUpgrade HookEvent = "post-upgrade"
HookPreRollback HookEvent = "pre-rollback" HookPreRollback HookEvent = "pre-rollback"
HookPostRollback HookEvent = "post-rollback" HookPostRollback HookEvent = "post-rollback"
//TODO: remove depricated test hooks entirely with helm v3.0.0-beta
HookReleaseTestSuccess HookEvent = "release-test-success" HookReleaseTestSuccess HookEvent = "release-test-success"
HookReleaseTestFailure HookEvent = "release-test-failure" HookReleaseTestFailure HookEvent = "release-test-failure"
) )

@ -62,6 +62,9 @@ var events = map[string]release.HookEvent{
hooks.PostUpgrade: release.HookPostUpgrade, hooks.PostUpgrade: release.HookPostUpgrade,
hooks.PreRollback: release.HookPreRollback, hooks.PreRollback: release.HookPreRollback,
hooks.PostRollback: release.HookPostRollback, hooks.PostRollback: release.HookPostRollback,
}
var DepricatedHookEvents = map[string]release.HookEvent{
hooks.ReleaseTestSuccess: release.HookReleaseTestSuccess, hooks.ReleaseTestSuccess: release.HookReleaseTestSuccess,
hooks.ReleaseTestFailure: release.HookReleaseTestFailure, hooks.ReleaseTestFailure: release.HookReleaseTestFailure,
} }
@ -194,11 +197,17 @@ func (file *manifestFile) sort(result *result) error {
} }
isUnknownHook := false isUnknownHook := false
isDepricatedHook := false
for _, hookType := range strings.Split(hookTypes, ",") { for _, hookType := range strings.Split(hookTypes, ",") {
hookType = strings.ToLower(strings.TrimSpace(hookType)) hookType = strings.ToLower(strings.TrimSpace(hookType))
e, ok := events[hookType] e, ok := events[hookType]
if !ok { if !ok {
_, depricated := DepricatedHookEvents[hookType]
if depricated {
isDepricatedHook = true
} else {
isUnknownHook = true isUnknownHook = true
}
break break
} }
h.Events = append(h.Events, e) h.Events = append(h.Events, e)
@ -209,6 +218,11 @@ func (file *manifestFile) sort(result *result) error {
continue continue
} }
if isDepricatedHook {
log.Printf("info: skipping depricated hook: %q", hookTypes)
continue
}
result.hooks = append(result.hooks, h) result.hooks = append(result.hooks, h)
operateAnnotationValues(entry, hooks.HookDeleteAnno, func(value string) { operateAnnotationValues(entry, hooks.HookDeleteAnno, func(value string) {

@ -187,12 +187,13 @@ metadata:
t.Errorf("Expected 3 test manifests, got %d", len(ts)) t.Errorf("Expected 3 test manifests, got %d", len(ts))
} }
if len(hs) != 4 { if len(hs) != 3 {
t.Errorf("Expected 4 hooks, got %d", len(hs)) t.Errorf("Expected 3 hook manifests, got %d", len(hs))
} }
for _, out := range hs { for _, out := range hs {
found := false found := false
for _, expect := range data { for _, expect := range data {
if out.Path == expect.path { if out.Path == expect.path {
found = true found = true

Loading…
Cancel
Save