Adding sort feature in terraform (#2227)

* Adding sort feature in terraform Co-authored-by: Rajesh Pirati <Rajesh.Pirati@ibm.com> Co-authored-by: Rudrasish Pradhan <rudrasish.pradhan@ibm.com> Co-authored-by: Bhavana Bellamgari <bhavana.bellamgari@ibm.com> * Adding sort arguments in policies * Adding sort in service policy instead of id Co-authored-by: Rajesh Pirati <Rajesh.Pirati@ibm.com> Co-authored-by: Bhavana Bellamgari <bhavana.bellamgari@ibm.com>
IBM-Cloud · Feb 19, 2021 · 73c3454 · 73c3454
1 parent 9ba88a2
commit 73c3454
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/ibm/data_source_ibm_iam_service_policy.go b/ibm/data_source_ibm_iam_service_policy.go
@@ -18,6 +18,11 @@ func dataSourceIBMIAMServicePolicy() *schema.Resource {
 				Type:        schema.TypeString,
 				Required:    true,
 			},
+			"sort": {
+				Description: "Sort query for policies",
+				Type:        schema.TypeString,
+				Optional:    true,
+			},
 			"policies": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -102,11 +107,17 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
-	policies, err := iampapClient.V1Policy().List(iampapv1.SearchParams{
+	query := iampapv1.SearchParams{
 		AccountID: userDetails.userAccount,
 		Type:      iampapv1.AccessPolicyType,
 		IAMID:     serviceID.IAMID,
-	})
+	}
+
+	if v, ok := d.GetOk("sort"); ok {
+		query.Sort = v.(string)
+	}
+
+	policies, err := iampapClient.V1Policy().List(query)
 	if err != nil {
 		return err
 	}

diff --git a/ibm/data_source_ibm_iam_service_policy_test.go b/ibm/data_source_ibm_iam_service_policy_test.go
@@ -115,6 +115,7 @@ resource "ibm_iam_service_policy" "policy1" {
 
 data "ibm_iam_service_policy" "testacc_ds_service_policy" {
   iam_service_id = ibm_iam_service_policy.policy.iam_service_id
+  sort = "id"
 }`, name, name)
 
 }
diff --git a/ibm/data_source_ibm_iam_user_policy.go b/ibm/data_source_ibm_iam_user_policy.go
@@ -18,6 +18,11 @@ func dataSourceIBMIAMUserPolicy() *schema.Resource {
 				Type:        schema.TypeString,
 				Required:    true,
 			},
+			"sort": {
+				Description: "Sort query for policies",
+				Type:        schema.TypeString,
+				Optional:    true,
+			},
 			"policies": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -99,11 +104,21 @@ func dataSourceIBMIAMUserPolicyRead(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
-	policies, err := iampapClient.V1Policy().List(iampapv1.SearchParams{
+	query := iampapv1.SearchParams{
 		AccountID: accountID,
-		IAMID:     ibmUniqueID,
-		Type:      iampapv1.AccessPolicyType,
-	})
+		Type:      ibmUniqueID,
+		IAMID:     iampapv1.AccessPolicyType,
+	}
+
+	if v, ok := d.GetOk("sort"); ok {
+		query.Sort = v.(string)
+	}
+
+	policies, err := iampapClient.V1Policy().List(query)
+	if err != nil {
+		return err
+	}
+
 	if err != nil {
 		return err
 	}

diff --git a/ibm/data_source_ibm_iam_user_policy_test.go b/ibm/data_source_ibm_iam_user_policy_test.go
@@ -106,6 +106,7 @@ resource "ibm_iam_user_policy" "policy1" {
 
 data "ibm_iam_user_policy" "testacc_ds_user_policy" {
   ibm_id = ibm_iam_user_policy.policy.ibm_id
+  sort = "-id"
 }`, name, IAMUser, IAMUser)
 
 }
diff --git a/website/docs/d/iam_service_policy.html.markdown b/website/docs/d/iam_service_policy.html.markdown
@@ -35,6 +35,7 @@ data "ibm_iam_service_policy" "testacc_ds_service_policy" {
 The following arguments are supported:
 
 * `iam_service_id` - (Required, string) The UUID of the serviceID.
+* `sort` - (Optional, string) Single field sort query for policies.
 
 ## Attribute Reference
 

diff --git a/website/docs/d/iam_user_policy.html.markdown b/website/docs/d/iam_user_policy.html.markdown
@@ -34,6 +34,7 @@ data "ibm_iam_user_policy" "testacc_ds_user_policy" {
 The following arguments are supported:
 
 * `ibm_id` - (Required, string) The ibm id or email of user.
+* `sort` - (Optional, string) Single field sort query for policies.
 
 ## Attribute Reference