r/aws_securityhub: Address review comments for aws_securityhub_account

aws/resource_aws_securityhub_account.go

@@ -31,7 +31,7 @@ func resourceAwsSecurityHubAccountCreate(d *schema.ResourceData, meta interface{
 		return fmt.Errorf("Error enabling Security Hub for account: %s", err)
 	}
 
-	d.SetId("securityhub-account")
+	d.SetId(meta.(*AWSClient).accountid)
 
 	return resourceAwsSecurityHubAccountRead(d, meta)
 }

aws/resource_aws_securityhub_account_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-func TestAccAWSSecurityHubAccount_basic(t *testing.T) {
+func testAccAWSSecurityHubAccount_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,

aws/resource_aws_securityhub_test.go

@@ -0,0 +1,25 @@
+package aws
+
+import (
+	"testing"
+)
+
+func TestAccAWSSecurityHub(t *testing.T) {
+	testCases := map[string]map[string]func(t *testing.T){
+		"Account": {
+			"basic": testAccAWSSecurityHubAccount_basic,
+		},
+	}
+
+	for group, m := range testCases {
+		m := m
+		t.Run(group, func(t *testing.T) {
+			for name, tc := range m {
+				tc := tc
+				t.Run(name, func(t *testing.T) {
+					tc(t)
+				})
+			}
+		})
+	}
+}

website/docs/r/securityhub_account.markdown

@@ -3,19 +3,19 @@ layout: "aws"
 page_title: "AWS: aws_securityhub_account"
 sidebar_current: "docs-aws-resource-securityhub-account"
 description: |-
-  Enables Security Hub.
+  Enables Security Hub for an AWS account.
 ---
 
 # aws_securityhub_account
 
--> **Note:** Destroying this resource will disable Security Hub.
+-> **Note:** Destroying this resource will disable Security Hub for this AWS account.
 
-Enables Security Hub.
+Enables Security Hub for this AWS account.
 
 ## Example Usage
 
 ```hcl
-resource "aws_securityhub_member" "example" {}
+resource "aws_securityhub_account" "example" {}
 ```
 
 ## Argument Reference
@@ -26,12 +26,12 @@ The resource does not support any arguments.
 
 The following attributes are exported in addition to the arguments listed above:
 
-* `id` - Returns `securityhub-account`.
+* `id` - AWS Account ID.
 
 ## Import
 
-Security Hub account enablemenet can be imported using the word `securityhub-account`, e.g.
+An existing Security Hub enabled account can be imported using the AWS account ID, e.g.
 
 ```
-$ terraform import aws_securityhub_account.example securityhub-account
+$ terraform import aws_securityhub_account.example 123456789012
 ```