ds: Build on previous work

hashicorp · Jun 27, 2022 · 97d97c9 · 97d97c9
1 parent bdee7d4
commit 97d97c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/internal/service/ds/directory_share.go b/internal/service/ds/directory_share.go
@@ -43,6 +43,10 @@ func ResourceDirectoryShare() *schema.Resource {
 				ForceNew:  true,
 				Sensitive: true,
 			},
+			"shared_directory_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"target": {
 				Type:     schema.TypeList,
 				MaxItems: 1,
@@ -64,10 +68,6 @@ func ResourceDirectoryShare() *schema.Resource {
 					},
 				},
 			},
-			"shared_directory_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -84,6 +84,7 @@ func resourceDirectoryShareCreate(ctx context.Context, d *schema.ResourceData, m
 			Type: aws.String(d.Get("target.type").(string)),
 		},
 	}
+
 	if v, ok := d.GetOk("share_notes"); ok {
 		input.ShareNotes = aws.String(v.(string))
 	}
@@ -93,6 +94,7 @@ func resourceDirectoryShareCreate(ctx context.Context, d *schema.ResourceData, m
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
 	log.Printf("[DEBUG] Shared Directory created: %s", out)
 	d.SetId(fmt.Sprintf("%s/%s", dirId, aws.StringValue(out.SharedDirectoryId)))
 

diff --git a/internal/service/ds/directory_share_test.go b/internal/service/ds/directory_share_test.go
@@ -7,31 +7,33 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/directoryservice"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
 
-func TestAccDirectoryShare_basic(t *testing.T) {
+func TestAccDSDirectoryShare_basic(t *testing.T) {
 	var providers []*schema.Provider
 	var sharedDirectory directoryservice.SharedDirectory
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	resourceName := "aws_directory_service_directory_share.test"
 
 	domainName := acctest.RandomDomainName()
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			acctest.PreCheck(t)
-			acctest.PreCheckOrganizationsAccount(t)
+			//acctest.PreCheckOrganizationsAccount(t)
 		},
 		ErrorCheck:        acctest.ErrorCheck(t, directoryservice.EndpointsID),
 		ProviderFactories: acctest.FactoriesAlternate(&providers),
 		CheckDestroy:      testAccCheckDirectoryShareDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDirectoryShareConfig(domainName),
+				Config: testAccDirectoryShareConfig(rName, domainName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "shared_directory_id"),
 					testAccCheckDirectoryShareExists(resourceName, &sharedDirectory),
@@ -126,12 +128,12 @@ func testAccCheckDirectoryShareDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDirectoryShareConfig(domain string) string {
+func testAccDirectoryShareConfig(rName, domain string) string {
 	return acctest.ConfigCompose(
 		acctest.ConfigAlternateAccountProvider(),
-		testAccDirectoryServiceDirectoryConfig(domain),
+		testAccDirectoryConfig_basic(rName, domain),
 		`
-resource "aws_directoryservice_directory_share" "test" {
+resource "aws_directory_service_directory_share" "test" {
   directory_id = aws_directory_service_directory.test.id
   share_notes  = "test"
   target {
@@ -142,6 +144,5 @@ resource "aws_directoryservice_directory_share" "test" {
 data "aws_caller_identity" "receiver" {
   provider = "awsalternate"
 }
-`,
-	)
+`)
 }