Move template* packages to internal/helm…

vdemeester · vdemeester · commit 9a7fbb63835e · 2018-07-30T16:30:54.000+02:00
… they are only used by `helm` so let's *hide* them here.

Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/internal/helm/helm.go b/internal/helm/helm.go
@@ -11,13 +11,13 @@ import (
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/docker/app/internal"
+	"github.com/docker/app/internal/helm/templateconversion"
+	"github.com/docker/app/internal/helm/templateloader"
+	"github.com/docker/app/internal/helm/templatev1beta2"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/internal/render"
 	"github.com/docker/app/internal/settings"
 	"github.com/docker/app/internal/slices"
-	"github.com/docker/app/internal/templateconversion"
-	"github.com/docker/app/internal/templateloader"
-	"github.com/docker/app/internal/templatev1beta2"
 	"github.com/docker/app/internal/types"
 	"github.com/docker/cli/cli/command/stack/kubernetes"
 	"github.com/docker/cli/cli/compose/loader"
diff --git a/internal/helm/templateconversion/convert.go b/internal/helm/templateconversion/convert.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	composeTypes "github.com/docker/app/internal/templatetypes"
-	v1beta2 "github.com/docker/app/internal/templatev1beta2"
+	composeTypes "github.com/docker/app/internal/helm/templatetypes"
+	v1beta2 "github.com/docker/app/internal/helm/templatev1beta2"
 )
 
 // FromComposeConfig converts a compose.Config into a StackSpec
diff --git a/internal/helm/templateloader/interpolate.go b/internal/helm/templateloader/interpolate.go
diff --git a/internal/helm/templateloader/loader.go b/internal/helm/templateloader/loader.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	types "github.com/docker/app/internal/templatetypes"
+	types "github.com/docker/app/internal/helm/templatetypes"
 	"github.com/docker/cli/cli/compose/schema"
 	"github.com/docker/cli/cli/compose/template"
 	"github.com/docker/cli/opts"
diff --git a/internal/helm/templateloader/volume.go b/internal/helm/templateloader/volume.go
@@ -5,7 +5,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	types "github.com/docker/app/internal/templatetypes"
+	types "github.com/docker/app/internal/helm/templatetypes"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/pkg/errors"
 )
diff --git a/internal/helm/templatetypes/types.go b/internal/helm/templatetypes/types.go
diff --git a/internal/helm/templatev1beta2/stack.go b/internal/helm/templatev1beta2/stack.go
@@ -1,7 +1,7 @@
 package templatev1beta2
 
 import (
-	types "github.com/docker/app/internal/templatetypes"
+	types "github.com/docker/app/internal/helm/templatetypes"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"strconv"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- composeTypes "github.com/docker/app/internal/templatetypes"`
`10`		`- v1beta2 "github.com/docker/app/internal/templatev1beta2"`
	`9`	`+ composeTypes "github.com/docker/app/internal/helm/templatetypes"`
	`10`	`+ v1beta2 "github.com/docker/app/internal/helm/templatev1beta2"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// FromComposeConfig converts a compose.Config into a StackSpec`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"unicode"`
`6`	`6`	`"unicode/utf8"`
`7`	`7`
`8`		`- types "github.com/docker/app/internal/templatetypes"`
	`8`	`+ types "github.com/docker/app/internal/helm/templatetypes"`
`9`	`9`	`"github.com/docker/docker/api/types/mount"`
`10`	`10`	`"github.com/pkg/errors"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package templatev1beta2`
`2`	`2`
`3`	`3`	`import (`
`4`		`- types "github.com/docker/app/internal/templatetypes"`
	`4`	`+ types "github.com/docker/app/internal/helm/templatetypes"`
`5`	`5`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`6`	`6`	`"k8s.io/apimachinery/pkg/runtime"`
`7`	`7`	`)`