Merge pull request #14535 from Tensho/workspaces-empty-bundle-owner

aws_workspaces_bundle: Fix empty (private) owner
hashicorp · Nov 10, 2020 · 7d387a2 · 7d387a2
2 parents be8eff2 + 9617777
commit 7d387a2
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/aws/data_source_aws_workspaces_bundle.go b/aws/data_source_aws_workspaces_bundle.go
@@ -97,10 +97,13 @@ func dataSourceAwsWorkspaceBundleRead(d *schema.ResourceData, meta interface{})
 	}
 
 	if name, ok := d.GetOk("name"); ok {
-		name := name.(string)
-		input := &workspaces.DescribeWorkspaceBundlesInput{
-			Owner: aws.String(d.Get("owner").(string)),
+		input := &workspaces.DescribeWorkspaceBundlesInput{}
+
+		if owner, ok := d.GetOk("owner"); ok {
+			input.Owner = aws.String(owner.(string))
 		}
+
+		name := name.(string)
 		err := conn.DescribeWorkspaceBundlesPages(input, func(out *workspaces.DescribeWorkspaceBundlesOutput, lastPage bool) bool {
 			for _, b := range out.Bundles {
 				if aws.StringValue(b.Name) == name {

diff --git a/aws/data_source_aws_workspaces_bundle_test.go b/aws/data_source_aws_workspaces_bundle_test.go
@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"os"
 	"regexp"
 	"testing"
 
@@ -73,6 +74,33 @@ func TestAccDataSourceAwsWorkspaceBundle_bundleIDAndNameConflict(t *testing.T) {
 	})
 }
 
+func TestAccDataSourceAwsWorkspaceBundle_privateOwner(t *testing.T) {
+	dataSourceName := "data.aws_workspaces_bundle.test"
+	bundleName := os.Getenv("AWS_WORKSPACES_BUNDLE_NAME")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccWorkspacesBundlePreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceAwsWorkspaceBundleConfig_privateOwner(bundleName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(dataSourceName, "name", bundleName),
+				),
+			},
+		},
+	})
+}
+
+func testAccWorkspacesBundlePreCheck(t *testing.T) {
+	if os.Getenv("AWS_WORKSPACES_BUNDLE_NAME") == "" {
+		t.Skip("AWS_WORKSPACES_BUNDLE_NAME env var must be set for AWS WorkSpaces private bundle acceptance test. This is required until AWS provides bundle creation API.")
+	}
+}
+
 func testAccDataSourceAwsWorkspaceBundleConfig(bundleID string) string {
 	return fmt.Sprintf(`
 data "aws_workspaces_bundle" "test" {
@@ -99,3 +127,11 @@ data "aws_workspaces_bundle" "test" {
 }
 `, bundleID, owner, name)
 }
+
+func testAccDataSourceAwsWorkspaceBundleConfig_privateOwner(name string) string {
+	return fmt.Sprintf(`
+data "aws_workspaces_bundle" "test" {
+  name = %q
+}
+`, name)
+}
diff --git a/website/docs/d/workspaces_bundle.html.markdown b/website/docs/d/workspaces_bundle.html.markdown
@@ -12,12 +12,18 @@ Retrieve information about an AWS WorkSpaces bundle.
 
 ## Example Usage
 
+### By ID
+
 ```hcl
-data "aws_workspaces_bundle" "by_id" {
+data "aws_workspaces_bundle" "example" {
   bundle_id = "wsb-b0s22j3d7"
 }
+```
 
-data "aws_workspaces_bundle" "by_owner_and_name" {
+### By Owner & Name
+
+```hcl
+data "aws_workspaces_bundle" "example" {
   owner = "AMAZON"
   name  = "Value with Windows 10 and Office 2016"
 }