ref(pkg/tiller): refactor out imports of pkg/helm

pkg/releasetesting/test_suite_test.go

@@ -28,7 +28,6 @@ import (
 	"google.golang.org/grpc/metadata"
 	"k8s.io/kubernetes/pkg/apis/core"
 
-	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
@@ -312,7 +311,7 @@ func (rs mockStream) SendHeader(m metadata.MD) error { return nil }
 func (rs mockStream) SetTrailer(m metadata.MD)       {}
 func (rs mockStream) SendMsg(v interface{}) error    { return nil }
 func (rs mockStream) RecvMsg(v interface{}) error    { return nil }
-func (rs mockStream) Context() context.Context       { return helm.NewContext() }
+func (rs mockStream) Context() context.Context       { return context.TODO() }
 
 type podSucceededKubeClient struct {
 	tillerEnv.PrintingKubeClient

pkg/tiller/release_content_test.go

@@ -17,14 +17,14 @@ limitations under the License.
 package tiller
 
 import (
+	"context"
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 func TestGetReleaseContent(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	if err := rs.env.Releases.Create(rel); err != nil {

pkg/tiller/release_history_test.go

@@ -20,7 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
+	"golang.org/x/net/context"
+
 	rpb "k8s.io/helm/pkg/proto/hapi/release"
 	tpb "k8s.io/helm/pkg/proto/hapi/services"
 )
@@ -77,7 +78,7 @@ func TestGetHistory_WithRevisions(t *testing.T) {
 
 	// run tests
 	for _, tt := range tests {
-		res, err := srv.GetHistory(helm.NewContext(), tt.req)
+		res, err := srv.GetHistory(context.TODO(), tt.req)
 		if err != nil {
 			t.Fatalf("%s:\nFailed to get History of %q: %s", tt.desc, tt.req.Name, err)
 		}
@@ -104,7 +105,7 @@ func TestGetHistory_WithNoRevisions(t *testing.T) {
 	srv.env.Releases.Create(rls)
 
 	for _, tt := range tests {
-		res, err := srv.GetHistory(helm.NewContext(), tt.req)
+		res, err := srv.GetHistory(context.TODO(), tt.req)
 		if err != nil {
 			t.Fatalf("%s:\nFailed to get History of %q: %s", tt.desc, tt.req.Name, err)
 		}

pkg/tiller/release_install_test.go

@@ -21,14 +21,15 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
+	"golang.org/x/net/context"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/version"
 )
 
 func TestInstallRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest()
@@ -82,7 +83,7 @@ func TestInstallRelease(t *testing.T) {
 }
 
 func TestInstallRelease_WithNotes(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(
@@ -142,7 +143,7 @@ func TestInstallRelease_WithNotes(t *testing.T) {
 }
 
 func TestInstallRelease_WithNotesRendered(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(
@@ -204,7 +205,7 @@ func TestInstallRelease_WithNotesRendered(t *testing.T) {
 
 func TestInstallRelease_TillerVersion(t *testing.T) {
 	version.Version = "2.2.0"
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(
@@ -218,7 +219,7 @@ func TestInstallRelease_TillerVersion(t *testing.T) {
 
 func TestInstallRelease_WrongTillerVersion(t *testing.T) {
 	version.Version = "2.2.0"
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(
@@ -236,7 +237,7 @@ func TestInstallRelease_WrongTillerVersion(t *testing.T) {
 }
 
 func TestInstallRelease_WithChartAndDependencyNotes(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(withChart(
@@ -268,7 +269,7 @@ func TestInstallRelease_WithChartAndDependencyNotes(t *testing.T) {
 }
 
 func TestInstallRelease_DryRun(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(withDryRun(),
@@ -320,7 +321,7 @@ func TestInstallRelease_DryRun(t *testing.T) {
 }
 
 func TestInstallRelease_NoHooks(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.env.Releases.Create(releaseStub())
 
@@ -336,7 +337,7 @@ func TestInstallRelease_NoHooks(t *testing.T) {
 }
 
 func TestInstallRelease_FailedHooks(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.env.Releases.Create(releaseStub())
 	rs.env.KubeClient = newHookFailingKubeClient()
@@ -353,7 +354,7 @@ func TestInstallRelease_FailedHooks(t *testing.T) {
 }
 
 func TestInstallRelease_ReuseName(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rel.Info.Status.Code = release.Status_DELETED
@@ -383,7 +384,7 @@ func TestInstallRelease_ReuseName(t *testing.T) {
 }
 
 func TestInstallRelease_KubeVersion(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(
@@ -396,7 +397,7 @@ func TestInstallRelease_KubeVersion(t *testing.T) {
 }
 
 func TestInstallRelease_WrongKubeVersion(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	req := installRequest(

pkg/tiller/release_rollback_test.go

@@ -20,13 +20,14 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
+	"golang.org/x/net/context"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 func TestRollbackRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -137,7 +138,7 @@ func TestRollbackRelease(t *testing.T) {
 }
 
 func TestRollbackWithReleaseVersion(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.Log = t.Logf
 	rs.env.Releases.Log = t.Logf
@@ -185,7 +186,7 @@ func TestRollbackWithReleaseVersion(t *testing.T) {
 }
 
 func TestRollbackReleaseNoHooks(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rel.Hooks = []*release.Hook{
@@ -221,7 +222,7 @@ func TestRollbackReleaseNoHooks(t *testing.T) {
 }
 
 func TestRollbackReleaseFailure(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)

pkg/tiller/release_server_test.go

@@ -34,7 +34,6 @@ import (
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 
-	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/hooks"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/chart"
@@ -439,7 +438,7 @@ func (l *mockListServer) Send(res *services.ListReleasesResponse) error {
 	return nil
 }
 
-func (l *mockListServer) Context() context.Context       { return helm.NewContext() }
+func (l *mockListServer) Context() context.Context       { return context.TODO() }
 func (l *mockListServer) SendMsg(v interface{}) error    { return nil }
 func (l *mockListServer) RecvMsg(v interface{}) error    { return nil }
 func (l *mockListServer) SendHeader(m metadata.MD) error { return nil }
@@ -456,7 +455,7 @@ func (rs mockRunReleaseTestServer) SendHeader(m metadata.MD) error { return nil
 func (rs mockRunReleaseTestServer) SetTrailer(m metadata.MD)       {}
 func (rs mockRunReleaseTestServer) SendMsg(v interface{}) error    { return nil }
 func (rs mockRunReleaseTestServer) RecvMsg(v interface{}) error    { return nil }
-func (rs mockRunReleaseTestServer) Context() context.Context       { return helm.NewContext() }
+func (rs mockRunReleaseTestServer) Context() context.Context       { return context.TODO() }
 
 type mockHooksManifest struct {
 	Metadata struct {

pkg/tiller/release_status_test.go

@@ -19,13 +19,14 @@ package tiller
 import (
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
+	"golang.org/x/net/context"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 func TestGetReleaseStatus(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	if err := rs.env.Releases.Create(rel); err != nil {
@@ -46,7 +47,7 @@ func TestGetReleaseStatus(t *testing.T) {
 }
 
 func TestGetReleaseStatusDeleted(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rel.Info.Status.Code = release.Status_DELETED

pkg/tiller/release_uninstall_test.go

@@ -20,13 +20,14 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/pkg/helm"
+	"golang.org/x/net/context"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 func TestUninstallRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.env.Releases.Create(releaseStub())
 
@@ -61,7 +62,7 @@ func TestUninstallRelease(t *testing.T) {
 }
 
 func TestUninstallPurgeRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -90,7 +91,7 @@ func TestUninstallPurgeRelease(t *testing.T) {
 	if res.Release.Info.Deleted.Seconds <= 0 {
 		t.Errorf("Expected valid UNIX date, got %d", res.Release.Info.Deleted.Seconds)
 	}
-	rels, err := rs.GetHistory(helm.NewContext(), &services.GetHistoryRequest{Name: "angry-panda"})
+	rels, err := rs.GetHistory(context.TODO(), &services.GetHistoryRequest{Name: "angry-panda"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -100,7 +101,7 @@ func TestUninstallPurgeRelease(t *testing.T) {
 }
 
 func TestUninstallPurgeDeleteRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.env.Releases.Create(releaseStub())
 
@@ -125,7 +126,7 @@ func TestUninstallPurgeDeleteRelease(t *testing.T) {
 }
 
 func TestUninstallReleaseWithKeepPolicy(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	name := "angry-bunny"
 	rs.env.Releases.Create(releaseWithKeepStub(name))
@@ -157,7 +158,7 @@ func TestUninstallReleaseWithKeepPolicy(t *testing.T) {
 }
 
 func TestUninstallReleaseNoHooks(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rs.env.Releases.Create(releaseStub())
 

pkg/tiller/release_update_test.go

@@ -22,15 +22,15 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
+	"golang.org/x/net/context"
 
-	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 func TestUpdateRelease(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -103,7 +103,7 @@ func TestUpdateRelease(t *testing.T) {
 	}
 }
 func TestUpdateRelease_ResetValues(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -131,7 +131,7 @@ func TestUpdateRelease_ResetValues(t *testing.T) {
 
 // This is a regression test for bug found in issue #3655
 func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 
 	installReq := &services.InstallReleaseRequest{
@@ -231,7 +231,7 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
 }
 
 func TestUpdateRelease_ReuseValues(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -269,7 +269,7 @@ func TestUpdateRelease_ReuseValues(t *testing.T) {
 
 func TestUpdateRelease_ResetReuseValues(t *testing.T) {
 	// This verifies that when both reset and reuse are set, reset wins.
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -298,7 +298,7 @@ func TestUpdateRelease_ResetReuseValues(t *testing.T) {
 }
 
 func TestUpdateReleaseFailure(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -342,7 +342,7 @@ func TestUpdateReleaseFailure(t *testing.T) {
 }
 
 func TestUpdateReleaseFailure_Force(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := namedReleaseStub("forceful-luke", release.Status_FAILED)
 	rs.env.Releases.Create(rel)
@@ -386,7 +386,7 @@ func TestUpdateReleaseFailure_Force(t *testing.T) {
 }
 
 func TestUpdateReleaseNoHooks(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)
@@ -415,7 +415,7 @@ func TestUpdateReleaseNoHooks(t *testing.T) {
 }
 
 func TestUpdateReleaseNoChanges(t *testing.T) {
-	c := helm.NewContext()
+	c := context.TODO()
 	rs := rsFixture()
 	rel := releaseStub()
 	rs.env.Releases.Create(rel)