Merge pull request #49 from jmatsu/fix/channel_deletion

Allow users to choose which change should happen to channels when destroying them

README.md

@@ -4,10 +4,6 @@
 
 This is a [Terraform](https://www.terraform.io/) provider for [Slack](https://slack.com)
 
-## Maintainers
-
-@jmatsu, @billcchung
-
 # Installation
 
 ref: https://registry.terraform.io/providers/jmatsu/slack/latest
@@ -31,7 +27,7 @@ See https://www.terraform.io/docs/configuration/providers.html#third-party-plugi
 
 ## Limitations
 
-**I do not have any Plus or Enterprise Grid workspace which I'm free to use unfortunately.**
+**I do not have any Plus or Enterprise Grid workspace which I'm free to use, unfortunately.**
 
 That's why several resources, e.g. a slack user, have not been supported yet. 
 
@@ -61,6 +57,7 @@ resource "slack_conversation" "..." {
   name = "<name>"
   topic = "..."
   purpose = "..."
+  action_on_destroy = "<archive|none>" # this is required since v0.8.0
   is_archive = <true|false>
   is_private = <true|false>
 }
@@ -106,4 +103,8 @@ git push "v$version"
 
 ## LICENSE
 
-Under [MIT](./LICENSE)
+Under [MIT](./LICENSE)
+
+## Maintainers
+
+@jmatsu, @billcchung

slack/resource_channel.go

@@ -2,6 +2,7 @@ package slack
 
 import (
 	"context"
+	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/slack-go/slack"
 	"log"
@@ -38,6 +39,12 @@ func resourceSlackChannel() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"action_on_destroy": {
+				Type:         schema.TypeString,
+				Description:  "Either of none or archive",
+				Required:     true,
+				ValidateFunc: validateConversationActionOnDestroyValue,
+			},
 			"is_shared": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -174,10 +181,20 @@ func resourceSlackChannelDelete(d *schema.ResourceData, meta interface{}) error
 	ctx := context.WithValue(context.Background(), ctxId, d.Id())
 	id := d.Id()
 
-	log.Printf("[DEBUG] Deleting(archive) Channel: %s (%s)", id, d.Get("name"))
+	action := d.Get("action_on_destroy").(string)
 
-	if err := client.ArchiveChannelContext(ctx, id); err != nil {
-		return err
+	switch action {
+	case conversationActionOnDestroyNone:
+		log.Printf("[DEBUG] Do nothing on Channel: %s (%s)", id, d.Get("name"))
+	case conversationActionOnDestroyArchive:
+		log.Printf("[DEBUG] Deleting(archive) Channel: %s (%s)", id, d.Get("name"))
+		if err := client.ArchiveChannelContext(ctx, id); err != nil {
+			if err.Error() != "already_archived" {
+				return err
+			}
+		}
+	default:
+		return fmt.Errorf("unknown action was provided. (%s)", action)
 	}
 
 	d.SetId("")

slack/resource_conversation.go

@@ -2,11 +2,23 @@ package slack
 
 import (
 	"context"
+	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/slack-go/slack"
 	"log"
 )
 
+const (
+	conversationActionOnDestroyNone    = "none"
+	conversationActionOnDestroyArchive = "archive"
+)
+
+var validateConversationActionOnDestroyValue = validation.StringInSlice([]string{
+	conversationActionOnDestroyNone,
+	conversationActionOnDestroyArchive,
+}, false)
+
 func resourceSlackConversation() *schema.Resource {
 	return &schema.Resource{
 		Read:   resourceSlackConversationRead,
@@ -40,6 +52,12 @@ func resourceSlackConversation() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"action_on_destroy": {
+				Type:         schema.TypeString,
+				Description:  "Either of none or archive",
+				Required:     true,
+				ValidateFunc: validateConversationActionOnDestroyValue,
+			},
 			"is_shared": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -173,10 +191,20 @@ func resourceSlackConversationDelete(d *schema.ResourceData, meta interface{}) e
 	ctx := context.WithValue(context.Background(), ctxId, d.Id())
 	id := d.Id()
 
-	log.Printf("[DEBUG] Deleting(archive) Conversation: %s (%s)", id, d.Get("name"))
+	action := d.Get("action_on_destroy").(string)
 
-	if err := client.ArchiveConversationContext(ctx, id); err != nil {
-		return err
+	switch action {
+	case conversationActionOnDestroyNone:
+		log.Printf("[DEBUG] Do nothing on Conversation: %s (%s)", id, d.Get("name"))
+	case conversationActionOnDestroyArchive:
+		log.Printf("[DEBUG] Deleting(archive) Conversation: %s (%s)", id, d.Get("name"))
+		if err := client.ArchiveConversationContext(ctx, id); err != nil {
+			if err.Error() != "already_archived" {
+				return err
+			}
+		}
+	default:
+		return fmt.Errorf("unknown action was provided. (%s)", action)
 	}
 
 	d.SetId("")

slack/resource_group.go

@@ -2,6 +2,7 @@ package slack
 
 import (
 	"context"
+	"fmt"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/slack-go/slack"
 	"log"
@@ -44,6 +45,12 @@ func resourceSlackGroup() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"action_on_destroy": {
+				Type:         schema.TypeString,
+				Description:  "Either of none or archive",
+				Required:     true,
+				ValidateFunc: validateConversationActionOnDestroyValue,
+			},
 			"is_shared": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -175,10 +182,20 @@ func resourceSlackGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	ctx := context.WithValue(context.Background(), ctxId, d.Id())
 	id := d.Id()
 
-	log.Printf("[DEBUG] Deleting(archive) Group: %s (%s)", id, d.Get("name"))
+	action := d.Get("action_on_destroy").(string)
 
-	if err := client.ArchiveGroupContext(ctx, id); err != nil {
-		return err
+	switch action {
+	case conversationActionOnDestroyNone:
+		log.Printf("[DEBUG] Do nothing on Group: %s (%s)", id, d.Get("name"))
+	case conversationActionOnDestroyArchive:
+		log.Printf("[DEBUG] Deleting(archive) Group: %s (%s)", id, d.Get("name"))
+		if err := client.ArchiveGroupContext(ctx, id); err != nil {
+			if err.Error() != "already_archived" {
+				return err
+			}
+		}
+	default:
+		return fmt.Errorf("unknown action was provided. (%s)", action)
 	}
 
 	d.SetId("")