Merge pull request hashicorp#52 from jcarrothers-sap/random_password

add new resource random_password
thirdeyenick · Jul 29, 2019 · 55a717f · 55a717f
2 parents a0d77de + 3392e60
commit 55a717f
Show file tree

Hide file tree

Showing 8 changed files with 292 additions and 180 deletions.
diff --git a/random/provider.go b/random/provider.go
@@ -11,12 +11,13 @@ func Provider() terraform.ResourceProvider {
 		Schema: map[string]*schema.Schema{},
 
 		ResourcesMap: map[string]*schema.Resource{
-			"random_id":      resourceId(),
-			"random_shuffle": resourceShuffle(),
-			"random_pet":     resourcePet(),
-			"random_string":  resourceString(),
-			"random_integer": resourceInteger(),
-			"random_uuid":    resourceUuid(),
+			"random_id":       resourceId(),
+			"random_shuffle":  resourceShuffle(),
+			"random_pet":      resourcePet(),
+			"random_string":   resourceString(),
+			"random_password": resourcePassword(),
+			"random_integer":  resourceInteger(),
+			"random_uuid":     resourceUuid(),
 		},
 	}
 }
diff --git a/random/resource_password.go b/random/resource_password.go
@@ -0,0 +1,14 @@
+package random
+
+import (
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourcePassword() *schema.Resource {
+	return &schema.Resource{
+		Create: createStringFunc(true),
+		Read:   readNil,
+		Delete: schema.RemoveFromState,
+		Schema: stringSchemaV1(true),
+	}
+}
diff --git a/random/resource_pasword_test.go b/random/resource_pasword_test.go
@@ -0,0 +1,40 @@
+package random
+
+import (
+	"regexp"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccResourcePassword(t *testing.T) {
+	resource.UnitTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: strings.Replace(testAccResourceStringConfig, "random_string", "random_password", -1),
+				Check: resource.ComposeTestCheckFunc(
+					testAccResourceStringCheck("random_password.foo", &customLens{
+						customLen: 12,
+					}),
+					testAccResourceStringCheck("random_password.bar", &customLens{
+						customLen: 32,
+					}),
+					testAccResourceStringCheck("random_password.three", &customLens{
+						customLen: 4,
+					}),
+					patternMatch("random_password.three", "!!!!"),
+					testAccResourceStringCheck("random_password.min", &customLens{
+						customLen: 12,
+					}),
+					regexMatch("random_password.min", regexp.MustCompile(`([a-z])`), 2),
+					regexMatch("random_password.min", regexp.MustCompile(`([A-Z])`), 3),
+					regexMatch("random_password.min", regexp.MustCompile(`([0-9])`), 4),
+					regexMatch("random_password.min", regexp.MustCompile(`([!#@])`), 1),
+				),
+			},
+		},
+	})
+}
diff --git a/random/resource_string.go b/random/resource_string.go
@@ -1,184 +1,16 @@
 package random
 
 import (
-	"crypto/rand"
-	"math/big"
-	"sort"
-
-	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func resourceString() *schema.Resource {
 	return &schema.Resource{
-		Create:        CreateString,
-		Read:          ReadString,
+		Create:        createStringFunc(false),
+		Read:          readNil,
 		Delete:        schema.RemoveFromState,
 		MigrateState:  resourceRandomStringMigrateState,
 		SchemaVersion: 1,
-		Schema: map[string]*schema.Schema{
-			"keepers": {
-				Type:     schema.TypeMap,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"length": {
-				Type:     schema.TypeInt,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"special": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
-				ForceNew: true,
-			},
-
-			"upper": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
-				ForceNew: true,
-			},
-
-			"lower": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
-				ForceNew: true,
-			},
-
-			"number": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
-				ForceNew: true,
-			},
-
-			"min_numeric": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Default:  0,
-				ForceNew: true,
-			},
-
-			"min_upper": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Default:  0,
-				ForceNew: true,
-			},
-
-			"min_lower": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Default:  0,
-				ForceNew: true,
-			},
-
-			"min_special": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Default:  0,
-				ForceNew: true,
-			},
-
-			"override_special": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"result": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-		},
-	}
-}
-
-func CreateString(d *schema.ResourceData, meta interface{}) error {
-	const numChars = "0123456789"
-	const lowerChars = "abcdefghijklmnopqrstuvwxyz"
-	const upperChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	var specialChars = "!@#$%&*()-_=+[]{}<>:?"
-
-	length := d.Get("length").(int)
-	upper := d.Get("upper").(bool)
-	minUpper := d.Get("min_upper").(int)
-	lower := d.Get("lower").(bool)
-	minLower := d.Get("min_lower").(int)
-	number := d.Get("number").(bool)
-	minNumeric := d.Get("min_numeric").(int)
-	special := d.Get("special").(bool)
-	minSpecial := d.Get("min_special").(int)
-	overrideSpecial := d.Get("override_special").(string)
-
-	if overrideSpecial != "" {
-		specialChars = overrideSpecial
+		Schema:        stringSchemaV1(false),
 	}
-
-	var chars = string("")
-	if upper {
-		chars += upperChars
-	}
-	if lower {
-		chars += lowerChars
-	}
-	if number {
-		chars += numChars
-	}
-	if special {
-		chars += specialChars
-	}
-
-	minMapping := map[string]int{
-		numChars:     minNumeric,
-		lowerChars:   minLower,
-		upperChars:   minUpper,
-		specialChars: minSpecial,
-	}
-	var result = make([]byte, 0, length)
-	for k, v := range minMapping {
-		s, err := generateRandomBytes(&k, v)
-		if err != nil {
-			return errwrap.Wrapf("error generating random bytes: {{err}}", err)
-		}
-		result = append(result, s...)
-	}
-	s, err := generateRandomBytes(&chars, length-len(result))
-	if err != nil {
-		return errwrap.Wrapf("error generating random bytes: {{err}}", err)
-	}
-	result = append(result, s...)
-	order := make([]byte, len(result))
-	if _, err := rand.Read(order); err != nil {
-		return errwrap.Wrapf("error generating random bytes: {{err}}", err)
-	}
-	sort.Slice(result, func(i, j int) bool {
-		return order[i] < order[j]
-	})
-
-	d.Set("result", string(result))
-	d.SetId("none")
-	return nil
-}
-
-func generateRandomBytes(charSet *string, length int) ([]byte, error) {
-	bytes := make([]byte, length)
-	setLen := big.NewInt(int64(len(*charSet)))
-	for i := range bytes {
-		idx, err := rand.Int(rand.Reader, setLen)
-		if err != nil {
-			return nil, err
-		}
-		bytes[i] = (*charSet)[idx.Int64()]
-	}
-	return bytes, nil
-}
-
-func ReadString(d *schema.ResourceData, meta interface{}) error {
-	return nil
 }