Skip to content

Commit

Permalink
Add quoted string flag Value.
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Nephin <dnephin@docker.com>
  • Loading branch information
dnephin committed Jan 3, 2017
1 parent 2ef6d80 commit e4c1f07
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
30 changes: 30 additions & 0 deletions opts/quotedstring.go
@@ -0,0 +1,30 @@
package opts

// QuotedString is a string that may have extra quotes around the value. The
// quotes are stripped from the value.
type QuotedString string

// Set sets a new value
func (s *QuotedString) Set(val string) error {
*s = QuotedString(trimQuotes(val))
return nil
}

// Type returns the type of the value
func (s *QuotedString) Type() string {
return "string"
}

func (s *QuotedString) String() string {
return string(*s)
}

func trimQuotes(value string) string {
lastIndex := len(value) - 1
for _, char := range []byte{'\'', '"'} {
if value[0] == char && value[lastIndex] == char {
return value[1:lastIndex]
}
}
return value
}
24 changes: 24 additions & 0 deletions opts/quotedstring_test.go
@@ -0,0 +1,24 @@
package opts

import (
"github.com/docker/docker/pkg/testutil/assert"
"testing"
)

func TestQuotedStringSetWithQuotes(t *testing.T) {
qs := QuotedString("")
assert.NilError(t, qs.Set("\"something\""))
assert.Equal(t, qs.String(), "something")
}

func TestQuotedStringSetWithMismatchedQuotes(t *testing.T) {
qs := QuotedString("")
assert.NilError(t, qs.Set("\"something'"))
assert.Equal(t, qs.String(), "\"something'")
}

func TestQuotedStringSetWithNoQuotes(t *testing.T) {
qs := QuotedString("")
assert.NilError(t, qs.Set("something"))
assert.Equal(t, qs.String(), "something")
}

0 comments on commit e4c1f07

Please sign in to comment.