Make policies importable.

vault/import_policy_test.go

@@ -0,0 +1,27 @@
+package vault
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccPolicy_importBasic(t *testing.T) {
+	name := "test-" + acctest.RandString(10)
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testResourcePolicy_initialConfig(name),
+				Check:  testResourcePolicy_initialCheck(name),
+			},
+			{
+				ResourceName:      "vault_policy.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

vault/resource_policy.go

@@ -14,6 +14,9 @@ func policyResource() *schema.Resource {
 		Update: policyWrite,
 		Delete: policyDelete,
 		Read:   policyRead,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"name": &schema.Schema{
@@ -47,7 +50,7 @@ func policyWrite(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(name)
 
-	return nil
+	return policyRead(d, meta)
 }
 
 func policyDelete(d *schema.ResourceData, meta interface{}) error {
@@ -77,6 +80,7 @@ func policyRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.Set("policy", policy)
+	d.Set("name", name)
 
 	return nil
 }

vault/resource_policy_test.go

@@ -4,73 +4,77 @@ import (
 	"fmt"
 	"testing"
 
-	r "github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/hashicorp/vault/api"
 )
 
 func TestResourcePolicy(t *testing.T) {
-	r.Test(t, r.TestCase{
+	name := acctest.RandomWithPrefix("test-")
+	resource.Test(t, resource.TestCase{
 		Providers: testProviders,
 		PreCheck:  func() { testAccPreCheck(t) },
-		Steps: []r.TestStep{
-			r.TestStep{
-				Config: testResourcePolicy_initialConfig,
-				Check:  testResourcePolicy_initialCheck,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testResourcePolicy_initialConfig(name),
+				Check:  testResourcePolicy_initialCheck(name),
 			},
-			r.TestStep{
+			resource.TestStep{
 				Config: testResourcePolicy_updateConfig,
 				Check:  testResourcePolicy_updateCheck,
 			},
 		},
 	})
 }
 
-var testResourcePolicy_initialConfig = `
-
+func testResourcePolicy_initialConfig(name string) string {
+	return fmt.Sprintf(`
 resource "vault_policy" "test" {
-	name = "dev-team"
+	name = "%s"
 	policy = <<EOT
 path "secret/*" {
 	policy = "read"
 }
 EOT
 }
+`, name)
+}
 
-`
+func testResourcePolicy_initialCheck(expectedName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		resourceState := s.Modules[0].Resources["vault_policy.test"]
+		if resourceState == nil {
+			return fmt.Errorf("resource not found in state")
+		}
 
-func testResourcePolicy_initialCheck(s *terraform.State) error {
-	resourceState := s.Modules[0].Resources["vault_policy.test"]
-	if resourceState == nil {
-		return fmt.Errorf("resource not found in state")
-	}
+		instanceState := resourceState.Primary
+		if instanceState == nil {
+			return fmt.Errorf("resource has no primary instance")
+		}
 
-	instanceState := resourceState.Primary
-	if instanceState == nil {
-		return fmt.Errorf("resource has no primary instance")
-	}
+		name := instanceState.ID
 
-	name := instanceState.ID
+		if name != instanceState.Attributes["name"] {
+			return fmt.Errorf("id %q doesn't match name %q", name, instanceState.Attributes["name"])
+		}
 
-	if name != instanceState.Attributes["name"] {
-		return fmt.Errorf("id doesn't match name")
-	}
+		if name != expectedName {
+			return fmt.Errorf("unexpected policy name %q, expected %q", name, expectedName)
+		}
 
-	if name != "dev-team" {
-		return fmt.Errorf("unexpected policy name")
-	}
+		client := testProvider.Meta().(*api.Client)
+		policy, err := client.Sys().GetPolicy(name)
+		if err != nil {
+			return fmt.Errorf("error reading back policy: %s", err)
+		}
 
-	client := testProvider.Meta().(*api.Client)
-	policy, err := client.Sys().GetPolicy(name)
-	if err != nil {
-		return fmt.Errorf("error reading back policy: %s", err)
-	}
+		if got, want := policy, "path \"secret/*\" {\n\tpolicy = \"read\"\n}\n"; got != want {
+			return fmt.Errorf("policy data is %q; want %q", got, want)
+		}
 
-	if got, want := policy, "path \"secret/*\" {\n\tpolicy = \"read\"\n}\n"; got != want {
-		return fmt.Errorf("policy data is %q; want %q", got, want)
+		return nil
 	}
-
-	return nil
 }
 
 var testResourcePolicy_updateConfig = `