Merge pull request #104 from hashicorp/import-string

Import string

.go-version

@@ -1 +1 @@
-1.11.5
+1.14

.travis.yml

@@ -4,7 +4,8 @@ services:
 - docker
 language: go
 go:
-  - "1.11.x"
+  - "1.14.x"
+  - tip
 env:
   - GO111MODULE=on GOFLAGS=-mod=vendor TF_VERSION=0.12.20
 

go.mod

@@ -1,5 +1,7 @@
 module github.com/terraform-providers/terraform-provider-random
 
+go 1.14
+
 require (
 	github.com/dustinkirkland/golang-petname v0.0.0-20170105215008-242afa0b4f8a
 	github.com/hashicorp/errwrap v1.0.0

random/resource_password.go

@@ -10,5 +10,8 @@ func resourcePassword() *schema.Resource {
 		Read:   readNil,
 		Delete: schema.RemoveFromState,
 		Schema: stringSchemaV1(true),
+		Importer: &schema.ResourceImporter{
+			State: importStringFunc(true),
+		},
 	}
 }

random/resource_pasword_test.go

@@ -1,11 +1,13 @@
 package random
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccResourcePassword(t *testing.T) {
@@ -35,6 +37,40 @@ func TestAccResourcePassword(t *testing.T) {
 					regexMatch("random_password.min", regexp.MustCompile(`([!#@])`), 1),
 				),
 			},
+			// TODO: for some reason unable to test import of a single resource here, broken out to test below
+		},
+	})
+}
+
+func TestAccResourcePassword_import(t *testing.T) {
+	resource.UnitTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: `
+resource "random_password" "foo" {
+	length = 32
+}`,
+			},
+			{
+				ResourceName: "random_password.foo",
+				ImportStateIdFunc: func(s *terraform.State) (string, error) {
+					id := "random_password.foo"
+					rs, ok := s.RootModule().Resources[id]
+					if !ok {
+						return "", fmt.Errorf("Not found: %s", id)
+					}
+					if rs.Primary.ID == "" {
+						return "", fmt.Errorf("No ID is set")
+					}
+
+					return rs.Primary.Attributes["result"], nil
+				},
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"length", "lower", "number", "special", "upper", "min_lower", "min_numeric", "min_special", "min_upper", "override_special"},
+			},
 		},
 	})
 }

random/resource_string.go

@@ -12,5 +12,8 @@ func resourceString() *schema.Resource {
 		MigrateState:  resourceRandomStringMigrateState,
 		SchemaVersion: 1,
 		Schema:        stringSchemaV1(false),
+		Importer: &schema.ResourceImporter{
+			State: importStringFunc(false),
+		},
 	}
 }

random/resource_string_test.go

@@ -40,6 +40,30 @@ func TestAccResourceString(t *testing.T) {
 					regexMatch("random_string.min", regexp.MustCompile(`([!#@])`), 1),
 				),
 			},
+			{
+				ResourceName:            "random_string.foo",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"length", "lower", "number", "special", "upper", "min_lower", "min_numeric", "min_special", "min_upper", "override_special"},
+			},
+			{
+				ResourceName:            "random_string.bar",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"length", "lower", "number", "special", "upper", "min_lower", "min_numeric", "min_special", "min_upper", "override_special"},
+			},
+			{
+				ResourceName:            "random_string.three",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"length", "lower", "number", "special", "upper", "min_lower", "min_numeric", "min_special", "min_upper", "override_special"},
+			},
+			{
+				ResourceName:            "random_string.min",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"length", "lower", "number", "special", "upper", "min_lower", "min_numeric", "min_special", "min_upper", "override_special"},
+			},
 		},
 	})
 }
@@ -128,6 +152,5 @@ resource "random_string" "min" {
   min_special = 1
   min_numeric = 4
 }
-
 `
 )

random/string.go

@@ -185,3 +185,14 @@ func generateRandomBytes(charSet *string, length int) ([]byte, error) {
 func readNil(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
+
+func importStringFunc(sensitive bool) schema.StateFunc {
+	return func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+		val := d.Id()
+		if sensitive {
+			d.SetId("none")
+		}
+		d.Set("result", val)
+		return []*schema.ResourceData{d}, nil
+	}
+}