Skip to content

Commit 0553235

Browse files
seansainseansain
authored
Merge pull request #115 from SumoLogic/ssain-remove-SUMOLOGIC_PF
remove SUMOLOGIC_PF by adding the datasource to the tests
2 parents a508371 + 1256aa9 commit 0553235

File tree

3 files changed

+26
-50
lines changed

3 files changed

+26
-50
lines changed

‎sumologic/provider_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,4 @@ func testAccPreCheck(t *testing.T) {
3838
if v := os.Getenv("SUMOLOGIC_ENVIRONMENT"); v == "" {
3939
t.Fatal("SUMOLOGIC_ENVIRONMENT must be set for acceptance tests")
4040
}
41-
if v := os.Getenv("SUMOLOGIC_PF"); v == "" {
42-
t.Fatal("SUMOLOGIC_PF must be set for acceptance tests")
43-
}
4441
}

‎sumologic/resource_sumologic_content_test.go‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package sumologic
22

33
import (
44
"fmt"
5-
"log"
6-
"os"
75
"testing"
86

97
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -13,20 +11,17 @@ import (
1311
//Testing create functionality for Content resources
1412
func TestAccContent_create(t *testing.T) {
1513
var content Content
16-
personalContentId := os.Getenv("SUMOLOGIC_PF")
1714

1815
resource.Test(t, resource.TestCase{
1916
PreCheck: func() { testAccPreCheck(t) },
2017
Providers: testAccProviders,
21-
CheckDestroy: testAccCheckContentDestroy,
18+
CheckDestroy: testAccCheckContentDestroy(content),
2219
Steps: []resource.TestStep{
2320
{
24-
Config: testAccSumologicContent(personalContentId, configJson),
21+
Config: testAccSumologicContent(configJson),
2522
Check: resource.ComposeTestCheckFunc(
2623
testAccCheckContentExists("sumologic_content.test", &content, t),
2724
testAccCheckContentAttributes("sumologic_content.test"),
28-
// testAccCheckContentConfig(&content),
29-
resource.TestCheckResourceAttr("sumologic_content.test", "parent_id", personalContentId),
3025
),
3126
},
3227
},
@@ -35,28 +30,23 @@ func TestAccContent_create(t *testing.T) {
3530

3631
func TestAccContent_update(t *testing.T) {
3732
var content Content
38-
personalContentId := os.Getenv("SUMOLOGIC_PF")
3933

4034
resource.Test(t, resource.TestCase{
4135
PreCheck: func() { testAccPreCheck(t) },
4236
Providers: testAccProviders,
43-
CheckDestroy: testAccCheckContentDestroy,
37+
CheckDestroy: testAccCheckContentDestroy(content),
4438
Steps: []resource.TestStep{
4539
{
46-
Config: testAccSumologicContent(personalContentId, configJson),
40+
Config: testAccSumologicContent(configJson),
4741
Check: resource.ComposeTestCheckFunc(
4842
testAccCheckContentExists("sumologic_content.test", &content, t),
4943
testAccCheckContentAttributes("sumologic_content.test"),
50-
// testAccCheckContentConfig(&content),
51-
resource.TestCheckResourceAttr("sumologic_content.test", "parent_id", personalContentId),
5244
),
5345
}, {
54-
Config: testAccSumologicContent(personalContentId, updateConfigJson),
46+
Config: testAccSumologicContent(updateConfigJson),
5547
Check: resource.ComposeTestCheckFunc(
5648
testAccCheckContentExists("sumologic_content.test", &content, t),
5749
testAccCheckContentAttributes("sumologic_content.test"),
58-
// testAccCheckContentConfig(&content),
59-
resource.TestCheckResourceAttr("sumologic_content.test", "parent_id", personalContentId),
6050
),
6151
},
6252
},
@@ -88,29 +78,21 @@ func testAccCheckContentExists(name string, content *Content, t *testing.T) reso
8878
func testAccCheckContentAttributes(name string) resource.TestCheckFunc {
8979
return func(s *terraform.State) error {
9080
f := resource.ComposeTestCheckFunc(
91-
// resource.TestCheckResourceAttrSet(name, "config"),
9281
resource.TestCheckResourceAttrSet(name, "parent_id"),
9382
)
9483
return f(s)
9584
}
9685
}
9786

98-
func testAccCheckContentDestroy(s *terraform.State) error {
99-
client := testAccProvider.Meta().(*Client)
100-
for _, r := range s.RootModule().Resources {
101-
id := r.Primary.ID
102-
log.Printf("Checking if ID is Destroyed: %s", id)
103-
c, err := client.GetContent(id)
104-
105-
if err != nil {
106-
return fmt.Errorf("Encountered an error: " + err.Error())
107-
}
108-
109-
if c != nil {
87+
func testAccCheckContentDestroy(content Content) resource.TestCheckFunc {
88+
return func(s *terraform.State) error {
89+
client := testAccProvider.Meta().(*Client)
90+
_, err := client.GetContent(content.ID)
91+
if err == nil {
11092
return fmt.Errorf("Content still exists")
11193
}
94+
return nil
11295
}
113-
return nil
11496
}
11597

11698
var updateConfigJson = `{
@@ -195,13 +177,14 @@ var configJson = `{
195177
"description": "Runs every hour with timerange of 15m and sends email notifications"
196178
}`
197179

198-
func testAccSumologicContent(parentId string, configJson string) string {
180+
func testAccSumologicContent(configJson string) string {
199181
return fmt.Sprintf(`
182+
data "sumologic_personal_folder" "personalFolder" {}
200183
resource "sumologic_content" "test" {
201-
parent_id = "%s"
184+
parent_id = "${data.sumologic_personal_folder.personalFolder.id}"
202185
config = <<JSON
203186
%s
204187
JSON
205188
}
206-
`, parentId, configJson)
189+
`, configJson)
207190
}

‎sumologic/resource_sumologic_folder_test.go‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package sumologic
22

33
import (
44
"fmt"
5-
"os"
65
"testing"
76

87
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
@@ -13,21 +12,19 @@ import (
1312
func TestAccFolder_create(t *testing.T) {
1413
var folder Folder
1514
rName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
16-
personalFolderId := os.Getenv("SUMOLOGIC_PF")
1715

1816
resource.Test(t, resource.TestCase{
1917
PreCheck: func() { testAccPreCheck(t) },
2018
Providers: testAccProviders,
2119
CheckDestroy: testAccCheckFolderDestroy(folder),
2220
Steps: []resource.TestStep{
2321
{
24-
Config: testAccSumologicFolder(rName, personalFolderId),
22+
Config: testAccSumologicFolder(rName),
2523
Check: resource.ComposeTestCheckFunc(
2624
testAccCheckFolderExists("sumologic_folder.test", &folder, t),
2725
testAccCheckFolderAttributes("sumologic_folder.test"),
2826
resource.TestCheckResourceAttr("sumologic_folder.test", "description", "test"),
2927
resource.TestCheckResourceAttr("sumologic_folder.test", "name", rName),
30-
resource.TestCheckResourceAttr("sumologic_folder.test", "parent_id", personalFolderId),
3128
),
3229
},
3330
},
@@ -37,31 +34,28 @@ func TestAccFolder_create(t *testing.T) {
3734
func TestAccFolder_update(t *testing.T) {
3835
var folder Folder
3936
rName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
40-
personalFolderId := os.Getenv("SUMOLOGIC_PF")
4137

4238
resource.Test(t, resource.TestCase{
4339
PreCheck: func() { testAccPreCheck(t) },
4440
Providers: testAccProviders,
4541
CheckDestroy: testAccCheckFolderDestroy(folder),
4642
Steps: []resource.TestStep{
4743
{
48-
Config: testAccSumologicFolder(rName, personalFolderId),
44+
Config: testAccSumologicFolder(rName),
4945
Check: resource.ComposeTestCheckFunc(
5046
testAccCheckFolderExists("sumologic_folder.test", &folder, t),
5147
testAccCheckFolderAttributes("sumologic_folder.test"),
5248
resource.TestCheckResourceAttr("sumologic_folder.test", "description", "test"),
5349
resource.TestCheckResourceAttr("sumologic_folder.test", "name", rName),
54-
resource.TestCheckResourceAttr("sumologic_folder.test", "parent_id", personalFolderId),
5550
),
5651
},
5752
{
58-
Config: testAccSumologicFolderUpdate(rName, personalFolderId),
53+
Config: testAccSumologicFolderUpdate(rName),
5954
Check: resource.ComposeTestCheckFunc(
6055
testAccCheckFolderExists("sumologic_folder.test", &folder, t),
6156
testAccCheckFolderAttributes("sumologic_folder.test"),
6257
resource.TestCheckResourceAttr("sumologic_folder.test", "description", "Update test"),
6358
resource.TestCheckResourceAttr("sumologic_folder.test", "name", rName),
64-
resource.TestCheckResourceAttr("sumologic_folder.test", "parent_id", personalFolderId),
6559
),
6660
},
6761
},
@@ -112,22 +106,24 @@ func testAccCheckFolderDestroy(folder Folder) resource.TestCheckFunc {
112106
}
113107
}
114108

115-
func testAccSumologicFolder(name string, parentId string) string {
109+
func testAccSumologicFolder(name string) string {
116110
return fmt.Sprintf(`
111+
data "sumologic_personal_folder" "personalFolder" {}
117112
resource "sumologic_folder" "test" {
118113
name = "%s"
119-
parent_id = "%s"
114+
parent_id = "${data.sumologic_personal_folder.personalFolder.id}"
120115
description = "test"
121116
}
122-
`, name, parentId)
117+
`, name)
123118
}
124119

125-
func testAccSumologicFolderUpdate(name string, parentId string) string {
120+
func testAccSumologicFolderUpdate(name string) string {
126121
return fmt.Sprintf(`
122+
data "sumologic_personal_folder" "personalFolder" {}
127123
resource "sumologic_folder" "test" {
128124
name = "%s"
129-
parent_id = "%s"
125+
parent_id = "${data.sumologic_personal_folder.personalFolder.id}"
130126
description = "Update test"
131127
}
132-
`, name, parentId)
128+
`, name)
133129
}

0 commit comments

Comments
 (0)