Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 6e572fc

Browse files
Fix PR comments
Signed-off-by: Silvin Lubecki <[email protected]>
1 parent 318d556 commit 6e572fc

File tree

3 files changed

+1
-62
lines changed

3 files changed

+1
-62
lines changed

cmd/docker-app/inspect.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/spf13/cobra"
1010
)
1111

12-
// inspectCmd represents the inspect command
1312
func inspectCmd(dockerCli command.Cli) *cobra.Command {
1413
var opts parametersOptions
1514
cmd := &cobra.Command{

cmd/docker-app/parameters_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import (
1212
func TestWithLoadFiles(t *testing.T) {
1313
tmpDir := fs.NewDir(t,
1414
t.Name(),
15-
fs.WithFile("params.yaml",
16-
`
17-
param1:
15+
fs.WithFile("params.yaml", `param1:
1816
param2: value1
1917
param3: 3
2018
overridden: bar`))

e2e/commands_test.go

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,6 @@ import (
1919
"gotest.tools/skip"
2020
)
2121

22-
// TODO: uncomment once we pull on `resolveBundle`
23-
// const (
24-
// singleFileApp = `version: 0.1.0
25-
// name: helloworld
26-
// description: "hello world app"
27-
// namespace: "foo"
28-
// ---
29-
// version: '3.5'
30-
// services:
31-
// hello-world:
32-
// image: hello-world
33-
// ---
34-
// # This section contains the default values for your application parameters.`
35-
// )
36-
3722
func TestRenderTemplates(t *testing.T) {
3823
skip.If(t, !hasExperimental, "experimental mode needed for this test")
3924
appsPath := filepath.Join("testdata", "templates")
@@ -226,49 +211,6 @@ func TestSplitMerge(t *testing.T) {
226211
icmd.RunCmd(cmd).Assert(t, icmd.Success)
227212
}
228213

229-
// TODO: uncomment once we pull on `resolveBundle`
230-
//func TestWithRegistry(t *testing.T) {
231-
// r := startRegistry(t)
232-
// defer r.Stop(t)
233-
// registry := r.GetAddress(t)
234-
// // push to a registry
235-
// icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
236-
// icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "-t", "latest", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
237-
//
238-
// icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my.dockerapp:0.1.0").Assert(t, icmd.Success)
239-
// // push a single-file app to a registry
240-
// dir := fs.NewDir(t, "save-prepare-build", fs.WithFile("my.dockerapp", singleFileApp))
241-
// defer dir.Remove()
242-
// icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", dir.Join("my.dockerapp")).Assert(t, icmd.Success)
243-
//
244-
// // push with custom repo name
245-
// icmd.RunCommand(dockerApp, "push", "-t", "marshmallows", "--namespace", registry+"/rainbows", "--repo", "unicorns", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
246-
// icmd.RunCommand(dockerApp, "inspect", registry+"/rainbows/unicorns:marshmallows").Assert(t, icmd.Success)
247-
//}
248-
//
249-
//func TestAttachmentsWithRegistry(t *testing.T) {
250-
// r := startRegistry(t)
251-
// defer r.Stop(t)
252-
// registry := r.GetAddress(t)
253-
//
254-
// dir := fs.NewDir(t, "testattachments",
255-
// fs.WithDir("attachments.dockerapp", fs.FromDir("testdata/attachments.dockerapp")),
256-
// )
257-
// defer dir.Remove()
258-
//
259-
// icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/acmecorp", dir.Join("attachments.dockerapp")).Assert(t, icmd.Success)
260-
//
261-
// // inspect will run the core pull code too
262-
// result := icmd.RunCommand(dockerApp, "inspect", registry+"/acmecorp/attachments.dockerapp:0.1.0")
263-
//
264-
// result.Assert(t, icmd.Success)
265-
// resultOutput := result.Combined()
266-
//
267-
// assert.Assert(t, strings.Contains(resultOutput, "config.cfg"))
268-
// assert.Assert(t, strings.Contains(resultOutput, "nesteddir/config2.cfg"))
269-
// assert.Assert(t, strings.Contains(resultOutput, "nesteddir/nested2/nested3/config3.cfg"))
270-
//}
271-
272214
func TestBundle(t *testing.T) {
273215
tmpDir := fs.NewDir(t, t.Name())
274216
defer tmpDir.Remove()

0 commit comments

Comments
 (0)