Merge pull request #811 from SumoLogic/absingh-267795

SUMO-267795:Changing Capabilities from List to Set for Capabilities in RoleV2

Author: AbhishekSumo

sumologic/data_source_sumologic_role_v2.go

@@ -63,9 +63,9 @@ func dataSourceSumologicRoleV2() *schema.Resource {
 				Computed: true,
 			},
 			"capabilities": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Computed:    true,
-				Description: "List of [capabilities](https://help.sumologic.com/docs/manage/users-roles/roles/role-capabilities/) associated with this role",
+				Description: "Set of [capabilities](https://help.sumologic.com/docs/manage/users-roles/roles/role-capabilities/) associated with this role",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
@@ -110,9 +110,11 @@ func dataSourceSumologicRoleV2Read(d *schema.ResourceData, meta interface{}) err
 	d.Set("description", roleV2.Description)
 	d.Set("security_data_filter", roleV2.SecurityDataFilter)
 	d.Set("log_analytics_filter", roleV2.LogAnalyticsFilter)
-	if err := d.Set("capabilities", roleV2.Capabilities); err != nil {
+
+	if err := d.Set("capabilities", schema.NewSet(schema.HashString, convertStringsToInterfaces(roleV2.Capabilities))); err != nil {
 		return fmt.Errorf("error setting capabilities for datasource %s: %s", d.Id(), err)
 	}
+
 	if err := d.Set("selected_views", flattenSelectedViews(roleV2.SelectedViews)); err != nil {
 		return fmt.Errorf("error setting selected views for datasource %s: %s", d.Id(), err)
 	}
@@ -142,6 +144,14 @@ func (s *Client) GetRoleNameV2(name string) (*RoleV2, error) {
 	return &response.RolesV2[0], nil
 }
 
+func convertStringsToInterfaces(strs []string) []interface{} {
+	result := make([]interface{}, len(strs))
+	for i, s := range strs {
+		result[i] = s
+	}
+	return result
+}
+
 type RoleResponseV2 struct {
 	RolesV2 []RoleV2 `json:"data"`
 }

sumologic/resource_sumologic_role_v2.go

@@ -71,9 +71,9 @@ func resourceSumologicRoleV2() *schema.Resource {
 			},
 
 			"capabilities": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Optional:    true,
-				Description: "List of [capabilities](https://help.sumologic.com/docs/manage/users-roles/roles/role-capabilities/) associated with this role",
+				Description: "Set of [capabilities](https://help.sumologic.com/docs/manage/users-roles/roles/role-capabilities/) associated with this role",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
@@ -168,10 +168,10 @@ func resourceToRoleV2(d *schema.ResourceData) RoleV2 {
 		selectedViews = append(selectedViews, resourceToViewFilterDefinition([]interface{}{data}))
 	}
 
-	capabilitiesData := d.Get("capabilities").([]interface{})
-	var capabilities []string
-	for _, data := range capabilitiesData {
-		capabilities = append(capabilities, data.(string))
+	capabilitiesSet := d.Get("capabilities").(*schema.Set)
+	capabilities := make([]string, 0, capabilitiesSet.Len())
+	for _, v := range capabilitiesSet.List() {
+		capabilities = append(capabilities, v.(string))
 	}
 
 	return RoleV2{

sumologic/resource_sumologic_role_v2_test.go

@@ -59,7 +59,7 @@ func TestAccSumologicRoleV2_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "audit_data_filter", testAuditDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "selection_type", testSelectionType),
-					resource.TestCheckResourceAttr("sumologic_role_v2.test", "capabilities.0", strings.Replace(testCapabilities[0], "\"", "", 2)),
+					resource.TestCheckTypeSetElemAttr("sumologic_role_v2.test", "capabilities.*", strings.Replace(testCapabilities[0], "\"", "", 2)),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "description", testDescription),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "security_data_filter", testSecurityDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "log_analytics_filter", testLogAnalyticsFilter),
@@ -100,7 +100,7 @@ func TestAccSumologicRoleV2_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "audit_data_filter", testAuditDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "selection_type", testSelectionType),
-					resource.TestCheckResourceAttr("sumologic_role_v2.test", "capabilities.0", strings.Replace(testCapabilities[0], "\"", "", 2)),
+					resource.TestCheckTypeSetElemAttr("sumologic_role_v2.test", "capabilities.*", strings.Replace(testCapabilities[0], "\"", "", 2)),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "description", testDescription),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "security_data_filter", testSecurityDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "log_analytics_filter", testLogAnalyticsFilter),
@@ -112,7 +112,7 @@ func TestAccSumologicRoleV2_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "name", testUpdatedName),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "audit_data_filter", testUpdatedAuditDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "selection_type", testUpdatedSelectionType),
-					resource.TestCheckResourceAttr("sumologic_role_v2.test", "capabilities.0", strings.Replace(testUpdatedCapabilities[0], "\"", "", 2)),
+					resource.TestCheckTypeSetElemAttr("sumologic_role_v2.test", "capabilities.*", strings.Replace(testUpdatedCapabilities[0], "\"", "", 2)),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "description", testUpdatedDescription),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "security_data_filter", testUpdatedSecurityDataFilter),
 					resource.TestCheckResourceAttr("sumologic_role_v2.test", "log_analytics_filter", testUpdatedLogAnalyticsFilter),