Skip to content

Commit 81d94ab

Browse files
authored
Merge pull request #859 from timofurrer/cleanup/ldap-testdata
Remove over-engineered testdata JSON file and just create the struct in the test
2 parents 88f82db + 02e1bde commit 81d94ab

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

internal/provider/resource_gitlab_group_ldap_link_test.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package provider
22

33
import (
4-
"encoding/json"
54
"errors"
65
"fmt"
7-
"io/ioutil"
86
"testing"
97

108
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -14,15 +12,13 @@ import (
1412
)
1513

1614
func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
17-
var testLdapLink gitlab.LDAPGroupLink
18-
var ldapLink gitlab.LDAPGroupLink
1915
rInt := acctest.RandInt()
20-
testDataFile := "testdata/resource_gitlab_group_ldap_link.json"
2116

2217
// PreCheck runs after Config so load test data here
23-
err := testAccLoadTestData(testDataFile, &testLdapLink)
24-
if err != nil {
25-
t.Fatalf("[ERROR] Failed to load test data: %s", err.Error())
18+
var ldapLink gitlab.LDAPGroupLink
19+
testLdapLink := gitlab.LDAPGroupLink{
20+
CN: "default",
21+
Provider: "default",
2622
}
2723

2824
resource.Test(t, resource.TestCase{
@@ -191,20 +187,6 @@ func testAccGetGitlabGroupLdapLink(ldapLink *gitlab.LDAPGroupLink, resourceState
191187
return nil
192188
}
193189

194-
func testAccLoadTestData(testdatafile string, ldapLink *gitlab.LDAPGroupLink) error {
195-
testLdapLinkBytes, err := ioutil.ReadFile(testdatafile)
196-
if err != nil {
197-
return err
198-
}
199-
200-
err = json.Unmarshal(testLdapLinkBytes, ldapLink)
201-
if err != nil {
202-
return err
203-
}
204-
205-
return nil
206-
}
207-
208190
func testAccGitlabGroupLdapLinkCreateConfig(rInt int, testLdapLink *gitlab.LDAPGroupLink) string {
209191
return fmt.Sprintf(`
210192
resource "gitlab_group" "foo" {

internal/provider/testdata/resource_gitlab_group_ldap_link.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)