Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli/command/volume: various fixes and improvements in tests #5782

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

cli/command/volume: various fixes and improvements in tests #5782

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29d6122
cli/command/volume: TestVolumeCreateErrors: assert unhandled errors
thaJeztah Feb 1, 2025
b84e744
cli/command/volume: TestVolumeCreateWithName: minor fixes and improve…
thaJeztah Feb 1, 2025
7d1bbd5
cli/command/volume: TestVolumeCreateWithFlags: minor fixes
thaJeztah Feb 1, 2025
7a2578c
cli/command/volume: TestVolumeCreateCluster: minor fixes and refactor
thaJeztah Feb 1, 2025
341e665
cli/command/volume: TestVolumeCreateClusterOpts: minor fixes and refa…
thaJeztah Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 81 additions & 50 deletions cli/command/volume/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestVolumeCreateErrors(t *testing.T) {
)
cmd.SetArgs(tc.args)
for key, value := range tc.flags {
cmd.Flags().Set(key, value)
assert.Check(t, cmd.Flags().Set(key, value))
}
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
Expand All @@ -56,7 +56,7 @@ func TestVolumeCreateErrors(t *testing.T) {
}

func TestVolumeCreateWithName(t *testing.T) {
name := "foo"
const name = "my-volume-name"
cli := test.NewFakeCli(&fakeClient{
volumeCreateFunc: func(body volume.CreateOptions) (volume.Volume, error) {
if body.Name != name {
Expand All @@ -69,23 +69,42 @@ func TestVolumeCreateWithName(t *testing.T) {
})

buf := cli.OutBuffer()
t.Run("using-flags", func(t *testing.T) {
cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs([]string{})
assert.Check(t, cmd.Flags().Set("name", name))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(strings.TrimSpace(buf.String()), name))
})

// Test by flags
cmd := newCreateCommand(cli)
cmd.Flags().Set("name", name)
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(name, strings.TrimSpace(buf.String())))
buf.Reset()
t.Run("using-args", func(t *testing.T) {
cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs([]string{name})
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(strings.TrimSpace(buf.String()), name))
})

// Then by args
buf.Reset()
cmd = newCreateCommand(cli)
cmd.SetArgs([]string{name})
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(name, strings.TrimSpace(buf.String())))
t.Run("using-both", func(t *testing.T) {
cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs([]string{name})
assert.Check(t, cmd.Flags().Set("name", name))
err := cmd.Execute()
assert.Check(t, is.Error(err, `conflicting options: cannot specify a volume-name through both --name and as a positional arg`))
assert.Check(t, is.Equal(strings.TrimSpace(buf.String()), ""))
})
}

func TestVolumeCreateWithFlags(t *testing.T) {
expectedDriver := "foo"
const name = "random-generated-name"
const expectedDriver = "foo-volume-driver"
expectedOpts := map[string]string{
"bar": "1",
"baz": "baz",
Expand All @@ -94,7 +113,6 @@ func TestVolumeCreateWithFlags(t *testing.T) {
"lbl1": "v1",
"lbl2": "v2",
}
name := "banana"

cli := test.NewFakeCli(&fakeClient{
volumeCreateFunc: func(body volume.CreateOptions) (volume.Volume, error) {
Expand All @@ -117,13 +135,16 @@ func TestVolumeCreateWithFlags(t *testing.T) {
})

cmd := newCreateCommand(cli)
cmd.Flags().Set("driver", "foo")
cmd.Flags().Set("opt", "bar=1")
cmd.Flags().Set("opt", "baz=baz")
cmd.Flags().Set("label", "lbl1=v1")
cmd.Flags().Set("label", "lbl2=v2")
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs([]string{})
assert.Check(t, cmd.Flags().Set("driver", expectedDriver))
assert.Check(t, cmd.Flags().Set("opt", "bar=1"))
assert.Check(t, cmd.Flags().Set("opt", "baz=baz"))
assert.Check(t, cmd.Flags().Set("label", "lbl1=v1"))
assert.Check(t, cmd.Flags().Set("label", "lbl2=v2"))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(name, strings.TrimSpace(cli.OutBuffer().String())))
assert.Check(t, is.Equal(strings.TrimSpace(cli.OutBuffer().String()), name))
}

func TestVolumeCreateCluster(t *testing.T) {
Expand All @@ -139,19 +160,27 @@ func TestVolumeCreateCluster(t *testing.T) {
},
})

cmd := newCreateCommand(cli)
cmd.Flags().Set("type", "block")
cmd.Flags().Set("group", "gronp")
cmd.Flags().Set("driver", "csi")
cmd.SetArgs([]string{"name"})
t.Run("csi-volume", func(t *testing.T) {
cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
assert.Check(t, cmd.Flags().Set("type", "block"))
assert.Check(t, cmd.Flags().Set("group", "gronp"))
assert.Check(t, cmd.Flags().Set("driver", "csi"))
cmd.SetArgs([]string{"my-csi-volume"})

assert.NilError(t, cmd.Execute())
assert.NilError(t, cmd.Execute())
})

cmd = newCreateCommand(cli)
cmd.Flags().Set("driver", "notcsi")
cmd.SetArgs([]string{"name"})
t.Run("non-csi-volume", func(t *testing.T) {
cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
assert.Check(t, cmd.Flags().Set("driver", "notcsi"))
cmd.SetArgs([]string{"my-non-csi-volume"})

assert.NilError(t, cmd.Execute())
assert.NilError(t, cmd.Execute())
})
}

func TestVolumeCreateClusterOpts(t *testing.T) {
Expand Down Expand Up @@ -203,25 +232,27 @@ func TestVolumeCreateClusterOpts(t *testing.T) {
})

cmd := newCreateCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs([]string{"name"})
cmd.Flags().Set("driver", "csi")
cmd.Flags().Set("group", "gronp")
cmd.Flags().Set("scope", "multi")
cmd.Flags().Set("sharing", "onewriter")
cmd.Flags().Set("type", "mount")
cmd.Flags().Set("sharing", "onewriter")
cmd.Flags().Set("required-bytes", "1234")
cmd.Flags().Set("limit-bytes", "567890")

cmd.Flags().Set("secret", "key1=secret1")
cmd.Flags().Set("secret", "key2=secret2")

cmd.Flags().Set("topology-required", "region=R1,zone=Z1")
cmd.Flags().Set("topology-required", "region=R1,zone=Z2")
cmd.Flags().Set("topology-required", "region=R1,zone=Z3")

cmd.Flags().Set("topology-preferred", "region=R1,zone=Z2")
cmd.Flags().Set("topology-preferred", "region=R1,zone=Z3")

cmd.Execute()
assert.Check(t, cmd.Flags().Set("driver", "csi"))
assert.Check(t, cmd.Flags().Set("group", "gronp"))
assert.Check(t, cmd.Flags().Set("scope", "multi"))
assert.Check(t, cmd.Flags().Set("sharing", "onewriter"))
assert.Check(t, cmd.Flags().Set("type", "mount"))
assert.Check(t, cmd.Flags().Set("sharing", "onewriter"))
assert.Check(t, cmd.Flags().Set("required-bytes", "1234"))
assert.Check(t, cmd.Flags().Set("limit-bytes", "567890"))

assert.Check(t, cmd.Flags().Set("secret", "key1=secret1"))
assert.Check(t, cmd.Flags().Set("secret", "key2=secret2"))

assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z1"))
assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z2"))
assert.Check(t, cmd.Flags().Set("topology-required", "region=R1,zone=Z3"))

assert.Check(t, cmd.Flags().Set("topology-preferred", "region=R1,zone=Z2"))
assert.Check(t, cmd.Flags().Set("topology-preferred", "region=R1,zone=Z3"))

assert.NilError(t, cmd.Execute())
}
Loading