From a870d28038babf165f51d559e70166628ce27bff Mon Sep 17 00:00:00 2001
From: Yarden Sachs <yrdnsa@gmail.com>
Date: Mon, 19 Oct 2020 11:06:07 -0700
Subject: [PATCH] Fixes

---
 aws/resource_aws_timestreamwrite_database.go  | 14 +++++++----
 ...ource_aws_timestreamwrite_database_test.go | 23 +++++++++++--------
 .../r/timestreamwrite_database.html.markdown  | 11 ++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/aws/resource_aws_timestreamwrite_database.go b/aws/resource_aws_timestreamwrite_database.go
index 62e2379feeb4..42b8282015c2 100644
--- a/aws/resource_aws_timestreamwrite_database.go
+++ b/aws/resource_aws_timestreamwrite_database.go
@@ -34,9 +34,10 @@ func resourceAwsTimestreamWriteDatabase() *schema.Resource {
 			},
 
 			"kms_key_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Optional: true,
+				Type:         schema.TypeString,
+				Computed:     true,
+				Optional:     true,
+				ValidateFunc: validateArn,
 			},
 
 			"tags": tagsSchema(),
@@ -58,12 +59,15 @@ func resourceAwsTimestreamWriteDatabaseCreate(d *schema.ResourceData, meta inter
 		input.Tags = keyvaluetags.New(attr.(map[string]interface{})).IgnoreAws().TimestreamwriteTags()
 	}
 
-	_, err := conn.CreateDatabase(input)
+	resp, err := conn.CreateDatabase(input)
+
 	if err != nil {
 		return err
 	}
 
-	d.SetId(d.Get("database_name").(string))
+	name := aws.StringValue(resp.Database.DatabaseName)
+
+	d.SetId(name)
 
 	return resourceAwsTimestreamWriteDatabaseRead(d, meta)
 }
diff --git a/aws/resource_aws_timestreamwrite_database_test.go b/aws/resource_aws_timestreamwrite_database_test.go
index c1d046b4a925..54d497040693 100644
--- a/aws/resource_aws_timestreamwrite_database_test.go
+++ b/aws/resource_aws_timestreamwrite_database_test.go
@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -12,7 +13,7 @@ import (
 )
 
 func TestAccAWSTimestreamWriteDatabase_basic(t *testing.T) {
-	resourceName := "aws_timestreamwrite_database.test_database"
+	resourceName := "aws_timestreamwrite_database.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -24,7 +25,9 @@ func TestAccAWSTimestreamWriteDatabase_basic(t *testing.T) {
 				Config: testAccAWSTimestreamWriteDatabaseConfigNoTags(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSTimestreamWriteDatabaseExists(resourceName),
+					testAccCheckResourceAttrRegionalARN(resourceName, "arn", "timestream", fmt.Sprintf("database/%s", rName)),
 					resource.TestCheckResourceAttr(resourceName, "database_name", rName),
+					testAccMatchResourceAttrRegionalARN(resourceName, "kms_key_id", "kms", regexp.MustCompile(`key/.+`)),
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
 				),
 			},
@@ -38,9 +41,9 @@ func TestAccAWSTimestreamWriteDatabase_basic(t *testing.T) {
 }
 
 func TestAccAWSTimestreamWriteDatabase_kmsKey(t *testing.T) {
-	resourceName := "aws_timestreamwrite_database.test_database"
+	resourceName := "aws_timestreamwrite_database.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
-	kmsResourceName := "aws_kms_key.foo"
+	kmsResourceName := "aws_kms_key.test"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -65,7 +68,7 @@ func TestAccAWSTimestreamWriteDatabase_kmsKey(t *testing.T) {
 }
 
 func TestAccAWSTimestreamWriteDatabase_Tags(t *testing.T) {
-	resourceName := "aws_timestreamwrite_database.test_database"
+	resourceName := "aws_timestreamwrite_database.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -158,7 +161,7 @@ func testAccCheckAWSTimestreamWriteDatabaseExists(n string) resource.TestCheckFu
 
 func testAccAWSTimestreamWriteDatabaseConfigNoTags(rName string) string {
 	return fmt.Sprintf(`
-resource "aws_timestreamwrite_database" "test_database" {
+resource "aws_timestreamwrite_database" "test" {
   database_name = %[1]q
 }
 `, rName)
@@ -166,7 +169,7 @@ resource "aws_timestreamwrite_database" "test_database" {
 
 func testAccAWSTimestreamWriteDatabaseConfigTags1(rName, tagKey1, tagValue1 string) string {
 	return fmt.Sprintf(`
-resource "aws_timestreamwrite_database" "test_database" {
+resource "aws_timestreamwrite_database" "test" {
   database_name = %[1]q
 
   tags = {
@@ -178,7 +181,7 @@ resource "aws_timestreamwrite_database" "test_database" {
 
 func testAccAWSTimestreamWriteDatabaseConfigTags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
 	return fmt.Sprintf(`
-resource "aws_timestreamwrite_database" "test_database" {
+resource "aws_timestreamwrite_database" "test" {
   database_name = %[1]q
 
   tags = {
@@ -191,7 +194,7 @@ resource "aws_timestreamwrite_database" "test_database" {
 
 func testAccAWSTimestreamWriteDatabaseConfigKmsKey(rName string) string {
 	return fmt.Sprintf(`
-resource "aws_kms_key" "foo" {
+resource "aws_kms_key" "test" {
   description = "Terraform acc test"
 
   policy = <<POLICY
@@ -211,9 +214,9 @@ resource "aws_kms_key" "foo" {
 POLICY
 }
 
-resource "aws_timestreamwrite_database" "test_database" {
+resource "aws_timestreamwrite_database" "test" {
   database_name = %[1]q
-  kms_key_id    = aws_kms_key.foo.arn
+  kms_key_id    = aws_kms_key.test.arn
 }
 `, rName)
 }
diff --git a/website/docs/r/timestreamwrite_database.html.markdown b/website/docs/r/timestreamwrite_database.html.markdown
index f0785cc9cff8..1341d2c035f1 100644
--- a/website/docs/r/timestreamwrite_database.html.markdown
+++ b/website/docs/r/timestreamwrite_database.html.markdown
@@ -1,5 +1,5 @@
 ---
-subcategory: "TimestreamWrite"
+subcategory: "Timestream Write"
 layout: "aws"
 page_title: "AWS: aws_timestreamwrite_database"
 description: |-
@@ -38,14 +38,8 @@ resource "aws_timestreamwrite_database" "test_database" {
 The following arguments are supported:
 
 * `database_name` – (Required) The name of the Timestream database. Minimum length of 3. Maximum length of 64.
-
-* `kms_key_id` - (Optional) The KMS key for the database. You can specify a key ID using any of the following:
-    * Key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
-    * Key ARN: `arn:aws:kms:us-east-1:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
-    * Alias name: `alias/ExampleAlias`
-    * Alias ARN: `arn:aws:kms:us-east-1:111122223333:alias/ExampleAlias`
+* `kms_key_id` - (Optional) The KMS key for the database. You can specify a key ARN.
     If the KMS key is not specified, the database will be encrypted with a Timestream managed KMS key located in your account. Refer to [AWS managed KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk) for more info.
-
 * `tags` - (Optional) A map of tags to assign to the resource
 
 
@@ -54,7 +48,6 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 * `arn` - The Amazon Resource Name that uniquely identifies this database.
-
 * `kms_key_id` - The identifier of the KMS key used to encrypt the data stored in the database.
 
 ## Import