--exclude-special -> --include-special

[#139303811] Special characters should be excluded by default

Signed-off-by: Iryna Shustava <ishustava@pivotal.io>

Author: Andrew Cantino

README.md

@@ -69,7 +69,7 @@ CREDENTIAL MANAGEMENT:
     -U, --exclude-upper                    [Password] Exclude upper alpha characters from generated value
     -L, --exclude-lower                    [Password] Exclude lower alpha characters from generated value
     -N, --exclude-number                   [Password] Exclude number characters from generated value
-    -S, --exclude-special                  [Password] Exclude special characters from generated value
+    -S, --include-special                  [Password] Include special characters in the generated value
     -H, --only-hex                         [Password] Use only hexadecimal characters in generated value   
     -k, --key-length [2048, 3072, 4096]    [Certificate, SSH, RSA] Bit length of the generated key (Default: 2048)
     -m, --ssh-comment 'COMMENT'            [SSH] A comment appended to the SSH public key for identification 

client/requests_test.go

@@ -200,7 +200,7 @@ var _ = Describe("API", func() {
 
 			It("returns a request with parameters", func() {
 				parameters := models.SecretParameters{
-					ExcludeSpecial: true,
+					IncludeSpecial: true,
 					ExcludeNumber:  true,
 					ExcludeUpper:   true,
 					ExcludeLower:   true,
@@ -211,7 +211,7 @@ var _ = Describe("API", func() {
 					"type":"password",
 					"overwrite":false,
 					"parameters": {
-						"exclude_special": true,
+						"include_special": true,
 						"exclude_number": true,
 						"exclude_upper": true,
 						"exclude_lower": true,

commands/generate.go

@@ -14,7 +14,7 @@ type GenerateCommand struct {
 	NoOverwrite      bool     `short:"O" long:"no-overwrite" description:"Credential is not modified if stored value already exists"`
 	OutputJson       bool     `long:"output-json" description:"Return response in JSON format"`
 	Length           int      `short:"l" long:"length" description:"[Password] Length of the generated value (Default: 30)"`
-	ExcludeSpecial   bool     `short:"S" long:"exclude-special" description:"[Password] Exclude special characters from the generated value"`
+	IncludeSpecial   bool     `short:"S" long:"include-special" description:"[Password] Include special characters in the generated value"`
 	ExcludeNumber    bool     `short:"N" long:"exclude-number" description:"[Password] Exclude number characters from the generated value"`
 	ExcludeUpper     bool     `short:"U" long:"exclude-upper" description:"[Password] Exclude upper alpha characters from the generated value"`
 	ExcludeLower     bool     `short:"L" long:"exclude-lower" description:"[Password] Exclude lower alpha characters from the generated value"`
@@ -45,7 +45,7 @@ func (cmd GenerateCommand) Execute([]string) error {
 	repository := repositories.NewSecretRepository(client.NewHttpClient(cfg))
 
 	parameters := models.SecretParameters{
-		ExcludeSpecial:   cmd.ExcludeSpecial,
+		IncludeSpecial:   cmd.IncludeSpecial,
 		ExcludeNumber:    cmd.ExcludeNumber,
 		ExcludeUpper:     cmd.ExcludeUpper,
 		ExcludeLower:     cmd.ExcludeLower,

commands/generate_test.go

@@ -99,9 +99,9 @@ var _ = Describe("Generate", func() {
 			Eventually(session).Should(Exit(0))
 		})
 
-		It("excluding special characters", func() {
-			setupPasswordPostServer("my-password", "potatoes", generateRequestJson("password", "my-password", `{"exclude_special":true}`, true))
-			session := runCommand("generate", "-n", "my-password", "-t", "password", "--exclude-special")
+		It("including special characters", func() {
+			setupPasswordPostServer("my-password", "potatoes", generateRequestJson("password", "my-password", `{"include_special":true}`, true))
+			session := runCommand("generate", "-n", "my-password", "-t", "password", "--include-special")
 			Eventually(session).Should(Exit(0))
 		})
 
@@ -345,7 +345,7 @@ var _ = Describe("Generate", func() {
 				commands.HaveFlag("type", "t"),
 				commands.HaveFlag("no-overwrite", "O"),
 				commands.HaveFlag("length", "l"),
-				commands.HaveFlag("exclude-special", "S"),
+				commands.HaveFlag("include-special", "S"),
 				commands.HaveFlag("exclude-number", "N"),
 				commands.HaveFlag("exclude-upper", "U"),
 				commands.HaveFlag("exclude-lower", "L"),

models/secret_parameters.go

@@ -1,7 +1,7 @@
 package models
 
 type SecretParameters struct {
-	ExcludeSpecial   bool     `json:"exclude_special,omitempty"`
+	IncludeSpecial   bool     `json:"include_special,omitempty"`
 	ExcludeNumber    bool     `json:"exclude_number,omitempty"`
 	ExcludeUpper     bool     `json:"exclude_upper,omitempty"`
 	ExcludeLower     bool     `json:"exclude_lower,omitempty"`