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

Remove reference to stdtime to reduce confusion

Browse Source 
Signed-off-by: Taylor Thomas <taylor.thomas@microsoft.com>
pull/6679/head
Taylor Thomas 6 years ago
parent 4d7968f692
commit 93abfd75ad
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

18
cmd/helm/history.go
Unescape View File

@ -19,7 +19,7 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
stdtime "time" "time"
"github.com/gosuri/uitable" "github.com/gosuri/uitable"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -30,7 +30,7 @@ import (
"helm.sh/helm/v3/pkg/cli/output" "helm.sh/helm/v3/pkg/cli/output"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/releaseutil"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
var historyHelp = ` var historyHelp = `
@ -77,12 +77,12 @@ func newHistoryCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
type releaseInfo struct { type releaseInfo struct {
Revision int `json:"revision"` Revision int `json:"revision"`
Updated time.Time `json:"updated"` Updated helmtime.Time `json:"updated"`
Status string `json:"status"` Status string `json:"status"`
Chart string `json:"chart"` Chart string `json:"chart"`
AppVersion string `json:"app_version"` AppVersion string `json:"app_version"`
Description string `json:"description"` Description string `json:"description"`
} }
type releaseHistory []releaseInfo type releaseHistory []releaseInfo
@ -99,7 +99,7 @@ func (r releaseHistory) WriteTable(out io.Writer) error {
tbl := uitable.New() tbl := uitable.New()
tbl.AddRow("REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION", "DESCRIPTION") tbl.AddRow("REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION", "DESCRIPTION")
for _, item := range r { for _, item := range r {
tbl.AddRow(item.Revision, item.Updated.Format(stdtime.ANSIC), item.Status, item.Chart, item.AppVersion, item.Description) tbl.AddRow(item.Revision, item.Updated.Format(time.ANSIC), item.Status, item.Chart, item.AppVersion, item.Description)
} }
return output.EncodeTable(out, tbl) return output.EncodeTable(out, tbl)
} }

10
cmd/helm/status_test.go
Unescape View File

@ -18,16 +18,16 @@ package main
import ( import (
"testing" "testing"
stdtime "time" "time"
"helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
func TestStatusCmd(t *testing.T) { func TestStatusCmd(t *testing.T) {
releasesMockWithStatus := func(info *release.Info, hooks ...*release.Hook) []*release.Release { releasesMockWithStatus := func(info *release.Info, hooks ...*release.Hook) []*release.Release {
info.LastDeployed = time.Unix(1452902400, 0).UTC() info.LastDeployed = helmtime.Unix(1452902400, 0).UTC()
return []*release.Release{{ return []*release.Release{{
Name: "flummoxed-chickadee", Name: "flummoxed-chickadee",
Namespace: "default", Namespace: "default",
@ -104,7 +104,7 @@ func TestStatusCmd(t *testing.T) {
runTestCmd(t, tests) runTestCmd(t, tests)
} }
func mustParseTime(t string) time.Time { func mustParseTime(t string) helmtime.Time {
res, _ := time.Parse(stdtime.RFC3339, t) res, _ := helmtime.Parse(time.RFC3339, t)
return res return res
} }

12
pkg/action/hooks.go
Unescape View File

@ -18,16 +18,16 @@ package action
import ( import (
"bytes" "bytes"
"sort" "sort"
stdtime "time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
// execHook executes all of the hooks for the given hook event. // execHook executes all of the hooks for the given hook event.
func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, timeout stdtime.Duration) error { func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, timeout time.Duration) error {
executingHooks := []*release.Hook{} executingHooks := []*release.Hook{}
for _, h := range rl.Hooks { for _, h := range rl.Hooks {
@ -61,7 +61,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
// Record the time at which the hook was applied to the cluster // Record the time at which the hook was applied to the cluster
h.LastRun = release.HookExecution{ h.LastRun = release.HookExecution{
StartedAt: time.Now(), StartedAt: helmtime.Now(),
Phase: release.HookPhaseRunning, Phase: release.HookPhaseRunning,
} }
cfg.recordRelease(rl) cfg.recordRelease(rl)
@ -73,7 +73,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
// Create hook resources // Create hook resources
if _, err := cfg.KubeClient.Create(resources); err != nil { if _, err := cfg.KubeClient.Create(resources); err != nil {
h.LastRun.CompletedAt = time.Now() h.LastRun.CompletedAt = helmtime.Now()
h.LastRun.Phase = release.HookPhaseFailed h.LastRun.Phase = release.HookPhaseFailed
return errors.Wrapf(err, "warning: Hook %s %s failed", hook, h.Path) return errors.Wrapf(err, "warning: Hook %s %s failed", hook, h.Path)
} }
@ -81,7 +81,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
// Watch hook resources until they have completed // Watch hook resources until they have completed
err = cfg.KubeClient.WatchUntilReady(resources, timeout) err = cfg.KubeClient.WatchUntilReady(resources, timeout)
// Note the time of success/failure // Note the time of success/failure
h.LastRun.CompletedAt = time.Now() h.LastRun.CompletedAt = helmtime.Now()
// Mark hook as succeeded or failed // Mark hook as succeeded or failed
if err != nil { if err != nil {
h.LastRun.Phase = release.HookPhaseFailed h.LastRun.Phase = release.HookPhaseFailed

8
pkg/action/rollback.go
Unescape View File

@ -20,12 +20,12 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"strings" "strings"
stdtime "time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
// Rollback is the action for rolling back to a given release. // Rollback is the action for rolling back to a given release.
@ -35,7 +35,7 @@ type Rollback struct {
cfg *Configuration cfg *Configuration
Version int Version int
Timeout stdtime.Duration Timeout time.Duration
Wait bool Wait bool
DisableHooks bool DisableHooks bool
DryRun bool DryRun bool
@ -120,7 +120,7 @@ func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Rele
Config: previousRelease.Config, Config: previousRelease.Config,
Info: &release.Info{ Info: &release.Info{
FirstDeployed: currentRelease.Info.FirstDeployed, FirstDeployed: currentRelease.Info.FirstDeployed,
LastDeployed: time.Now(), LastDeployed: helmtime.Now(),
Status: release.StatusPendingRollback, Status: release.StatusPendingRollback,
Notes: previousRelease.Info.Notes, Notes: previousRelease.Info.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

8
pkg/action/uninstall.go
Unescape View File

@ -18,13 +18,13 @@ package action
import ( import (
"strings" "strings"
stdtime "time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/releaseutil"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
// Uninstall is the action for uninstalling releases. // Uninstall is the action for uninstalling releases.
@ -36,7 +36,7 @@ type Uninstall struct {
DisableHooks bool DisableHooks bool
DryRun bool DryRun bool
KeepHistory bool KeepHistory bool
Timeout stdtime.Duration Timeout time.Duration
} }
// NewUninstall creates a new Uninstall object with the given configuration. // NewUninstall creates a new Uninstall object with the given configuration.
@ -90,7 +90,7 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
u.cfg.Log("uninstall: Deleting %s", name) u.cfg.Log("uninstall: Deleting %s", name)
rel.Info.Status = release.StatusUninstalling rel.Info.Status = release.StatusUninstalling
rel.Info.Deleted = time.Now() rel.Info.Deleted = helmtime.Now()
rel.Info.Description = "Deletion in progress (or silently failed)" rel.Info.Description = "Deletion in progress (or silently failed)"
res := &release.UninstallReleaseResponse{Release: rel} res := &release.UninstallReleaseResponse{Release: rel}

8
pkg/releaseutil/sorter_test.go
Unescape View File

@ -18,10 +18,10 @@ package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil"
import ( import (
"testing" "testing"
stdtime "time" "time"
rspb "helm.sh/helm/v3/pkg/release" rspb "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/time" helmtime "helm.sh/helm/v3/pkg/time"
) )
// note: this test data is shared with filter_test.go. // note: this test data is shared with filter_test.go.
@ -33,8 +33,8 @@ var releases = []*rspb.Release{
tsRelease("vocal-dogs", 3, 6000, rspb.StatusUninstalled), tsRelease("vocal-dogs", 3, 6000, rspb.StatusUninstalled),
} }
func tsRelease(name string, vers int, dur stdtime.Duration, status rspb.Status) *rspb.Release { func tsRelease(name string, vers int, dur time.Duration, status rspb.Status) *rspb.Release {
info := &rspb.Info{Status: status, LastDeployed: time.Now().Add(dur)} info := &rspb.Info{Status: status, LastDeployed: helmtime.Now().Add(dur)}
return &rspb.Release{ return &rspb.Release{
Name: name, Name: name,
Version: vers, Version: vers,

Write Preview
Loading…
Cancel
Save