Merge branch 'master' into accept-atleast-once-resolutions

Author: kumar-avijit

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.12.1 (Unreleased)
+
+ENHANCEMENTS:
+* Add support for importing folder resource (GH-345)
+
 ## 2.12.0 (February 7, 2022)
 
 FEATURES:

sumologic/resource_sumologic_folder.go

@@ -13,9 +13,9 @@ func resourceSumologicFolder() *schema.Resource {
 		Read:   resourceSumologicFolderRead,
 		Delete: resourceSumologicFolderDelete,
 		Update: resourceSumologicFolderUpdate,
-		//		Importer: &schema.ResourceImporter{
-		//			State: resourceSumologicFolderImport,
-		//		},
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"parent_id": {

sumologic/resource_sumologic_folder_test.go

@@ -9,6 +9,27 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
+func TestAccFolder_basic(t *testing.T) {
+	var folder Folder
+	rName := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckFolderDestroy(folder),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSumologicFolder(rName),
+			},
+			{
+				ResourceName:      "sumologic_folder.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccFolder_create(t *testing.T) {
 	var folder Folder
 	rName := acctest.RandString(10)

sumologic/sumologic_client.go

@@ -313,6 +313,8 @@ func NewClient(accessID, accessKey, authJwt, environment, base_url string, admin
 	retryClient := retryablehttp.NewClient()
 	retryClient.RetryMax = 10
 	retryClient.CheckRetry = checkRetry
+	// Disable DEBUG logs (https://github.com/hashicorp/go-retryablehttp/issues/31)
+	retryClient.Logger = nil
 
 	client := Client{
 		AccessID:      accessID,

website/docs/r/folder.html.markdown

@@ -27,6 +27,13 @@ The following arguments are supported:
 - `parent_id` - (Required) The ID of the folder in which you want to create the new folder.
 - `description` - (Optional) The description of the folder.
 
+## Import
+Folders can be imported using the folder id, e.g.:
+
+```hcl
+terraform import sumologic_folder.folder 00000000094D2B18
+```
+
 ### Timeouts
 
 `sumologic_folder` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: