[opendistro_user] Add password hash.

Author: phillbaker

es/resource_elasticsearch_opendistro_user.go

@@ -25,9 +25,18 @@ func resourceElasticsearchOpenDistroUser() *schema.Resource {
 				Required: true,
 			},
 			"password": {
-				Type:      schema.TypeString,
-				Required:  true,
-				Sensitive: true,
+				Type:             schema.TypeString,
+				Optional:         true,
+				Sensitive:        true,
+				DiffSuppressFunc: onlyDiffOnCreate,
+				ConflictsWith:    []string{"password_hash"},
+			},
+			"password_hash": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Sensitive:        true,
+				DiffSuppressFunc: onlyDiffOnCreate,
+				ConflictsWith:    []string{"password"},
 			},
 			"backend_roles": {
 				Type:     schema.TypeSet,
@@ -159,6 +168,7 @@ func resourceElasticsearchPutOpenDistroUser(d *schema.ResourceData, m interface{
 		Description:  d.Get("description").(string),
 		Attributes:   d.Get("attributes").(map[string]interface{}),
 		Password:     d.Get("password").(string),
+		PasswordHash: d.Get("password_hash").(string),
 	}
 
 	userJSON, err := json.Marshal(userDefinition)
@@ -204,6 +214,7 @@ type UserBody struct {
 	Attributes   map[string]interface{} `json:"attributes"`
 	Description  string                 `json:"description"`
 	Password     string                 `json:"password"`
+	PasswordHash string                 `json:"hash"`
 }
 
 // UserResponse sent by the odfe's API

es/resource_elasticsearch_opendistro_user_test.go

@@ -94,6 +94,17 @@ func TestAccElasticsearchOpenDistroUser(t *testing.T) {
 					),
 				),
 			},
+			{
+				Config: testAccOpenDistroUserResourceHash(randomName),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckElasticSearchOpenDistroUserExists("elasticsearch_opendistro_user.test"),
+					resource.TestCheckResourceAttr(
+						"elasticsearch_opendistro_user.test",
+						"id",
+						randomName,
+					),
+				),
+			},
 		},
 	})
 }
@@ -200,6 +211,15 @@ func testAccOpenDistroUserResource(resourceName string) string {
 	`, resourceName)
 }
 
+func testAccOpenDistroUserResourceHash(resourceName string) string {
+	return fmt.Sprintf(`
+	resource "elasticsearch_opendistro_user" "test" {
+		username      = "%s"
+		password_hash = "$2a$04$jQcEXpODnTFoGDuA7DPdSevA84CuH/7MOYkb80M3XZIrH76YMWS9G"
+	}
+	`, resourceName)
+}
+
 func testAccOpenDistroUserResourceUpdated(resourceName string) string {
 	return fmt.Sprintf(`
 	resource "elasticsearch_opendistro_user" "test" {