enhancement(is_region): made name as optional in ibm_is_region dataso…

…urce
IBM-Cloud · Mar 3, 2022 · d174b47 · d174b47
1 parent 7cfc9b6
commit d174b47
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/ibm/service/vpc/data_source_ibm_is_region.go b/ibm/service/vpc/data_source_ibm_is_region.go
@@ -4,6 +4,7 @@
 package vpc
 
 import (
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
 	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -27,7 +28,7 @@ func DataSourceIBMISRegion() *schema.Resource {
 
 			isRegionName: {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 			},
 
 			isRegionStatus: {
@@ -41,6 +42,13 @@ func DataSourceIBMISRegion() *schema.Resource {
 func dataSourceIBMISRegionRead(d *schema.ResourceData, meta interface{}) error {
 	name := d.Get("name").(string)
 
+	if name == "" {
+		bmxSess, err := meta.(conns.ClientSession).BluemixSession()
+		if err != nil {
+			return err
+		}
+		name = bmxSess.Config.Region
+	}
 	return regionGet(d, meta, name)
 }
 

diff --git a/ibm/service/vpc/data_source_ibm_is_region_test.go b/ibm/service/vpc/data_source_ibm_is_region_test.go
@@ -22,6 +22,7 @@ func TestAccIBMISRegionDataSource_basic(t *testing.T) {
 				Config: testAccCheckIBMISRegionDataSourceConfig(),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.ibm_is_region.testacc_ds_region", "name", acc.RegionName),
+					resource.TestCheckResourceAttr("data.ibm_is_region.testacc_default_region", "name", acc.RegionName),
 				),
 			},
 		},
@@ -33,6 +34,9 @@ func testAccCheckIBMISRegionDataSourceConfig() string {
 
 data "ibm_is_region" "testacc_ds_region" {
 	name = "%s"
-}`, acc.RegionName)
+}
+data "ibm_is_region" "testacc_default_region" {
+}
+`, acc.RegionName)
 
 }
diff --git a/website/docs/d/is_region.html.markdown b/website/docs/d/is_region.html.markdown
@@ -29,10 +29,18 @@ data "ibm_is_region" "example" {
 }
 
 ```
+
+```terraform
+
+data "ibm_is_region" "default_region" {
+}
+
+```
+
 ## Argument reference
 Review the argument references that you can specify for your data source. 
 
-- `name` - (Required, String) The name of the region.
+- `name` - (Optional, String) The name of the region. If no `name` is provided then default region `name` is taken from the provider block.
 
 ## Attribute reference
 In addition to the argument reference list, you can access the following attribute references after your data source is created.