Merge pull request #747 from SumoLogic/erikatsumo-fix-rolev2

Preserve assigned users when updating RoleV2

Author: ErikAtSumo

CHANGELOG.md

@@ -4,6 +4,7 @@
 BUG FIXES:
 * Properly send optional webhook notification payload value
 * RoleV2 creation will no longer time out when selection_type is not specified
+* RoleV2 update will not remove all assigned users
 
 MAINTENANCE:
 * Bump version of golang.org/x/net to v0.35.0

sumologic/resource_sumologic_role_v2.go

@@ -1,14 +1,3 @@
-// ----------------------------------------------------------------------------
-//
-//	***     AUTO GENERATED CODE    ***    AUTO GENERATED CODE     ***
-//
-// ----------------------------------------------------------------------------
-//
-//	This file is automatically generated by Sumo Logic and manual
-//	changes will be clobbered when the file is regenerated. Do not submit
-//	changes to this file.
-//
-// ----------------------------------------------------------------------------
 package sumologic
 
 import (
@@ -133,6 +122,11 @@ func resourceSumologicRoleV2Update(d *schema.ResourceData, meta interface{}) err
 	c := meta.(*Client)
 
 	roleV2 := resourceToRoleV2(d)
+
+	id := d.Id()
+	retrievedRoleV2, _ := c.GetRole(id)
+	roleV2.Users = retrievedRoleV2.Users
+
 	err := c.UpdateRoleV2(roleV2)
 	if err != nil {
 		return err
@@ -181,6 +175,7 @@ func resourceToRoleV2(d *schema.ResourceData) RoleV2 {
 		SelectionType:      d.Get("selection_type").(string),
 		LogAnalyticsFilter: d.Get("log_analytics_filter").(string),
 		Capabilities:       capabilities,
+		Users:              make([]string, 0),
 	}
 }
 

sumologic/sumologic_role_v2.go

@@ -90,6 +90,7 @@ type RoleV2 struct {
 	SelectionType      string                 `json:"selectionType,omitempty"`
 	SelectedViews      []ViewFilterDefinition `json:"selectedViews,omitempty"`
 	Description        string                 `json:"description"`
+	Users              []string               `json:"users"`
 }
 
 type ViewFilterDefinition struct {