Merge pull request #45 from rlmartin/usergroup-channels-fix

Pull in slack_usergroup_channels.channels from both channels and groups
jmatsu · Jun 17, 2021 · 9e4ecfb · 9e4ecfb
2 parents fbbf9e3 + 7be3369
commit 9e4ecfb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/slack/resource_usergroup_channels.go b/slack/resource_usergroup_channels.go
@@ -28,7 +28,7 @@ func resourceSlackUserGroupChannels() *schema.Resource {
 				Required: true,
 			},
 			"channels": {
-				Type: schema.TypeList,
+				Type: schema.TypeSet,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
@@ -40,7 +40,7 @@ func resourceSlackUserGroupChannels() *schema.Resource {
 
 func configureSlackUserGroupChannels(d *schema.ResourceData, userGroup slack.UserGroup) {
 	d.SetId(userGroup.ID)
-	_ = d.Set("channels", userGroup.Prefs.Channels)
+	_ = d.Set("channels", append(userGroup.Prefs.Channels, userGroup.Prefs.Groups...))
 }
 
 func resourceSlackUserGroupChannelsCreate(d *schema.ResourceData, meta interface{}) error {