@@ -28,7 +28,7 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
28
28
29
29
// Create a group LDAP link as a developer (uses testAccGitlabGroupLdapLinkCreateConfig for Config)
30
30
{
31
- SkipFunc : testAccGitlabGroupLdapLinkSkipFunc ( testLdapLink . CN , testLdapLink . Provider ) ,
31
+ SkipFunc : isRunningInCE ,
32
32
Config : testAccGitlabGroupLdapLinkCreateConfig (rInt , & testLdapLink ),
33
33
Check : resource .ComposeTestCheckFunc (
34
34
testAccCheckGitlabGroupLdapLinkExists ("gitlab_group_ldap_link.foo" , & ldapLink ),
@@ -39,7 +39,7 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
39
39
40
40
// Update the group LDAP link to change the access level (uses testAccGitlabGroupLdapLinkUpdateConfig for Config)
41
41
{
42
- SkipFunc : testAccGitlabGroupLdapLinkSkipFunc ( testLdapLink . CN , testLdapLink . Provider ) ,
42
+ SkipFunc : isRunningInCE ,
43
43
Config : testAccGitlabGroupLdapLinkUpdateConfig (rInt , & testLdapLink ),
44
44
Check : resource .ComposeTestCheckFunc (
45
45
testAccCheckGitlabGroupLdapLinkExists ("gitlab_group_ldap_link.foo" , & ldapLink ),
@@ -50,7 +50,7 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
50
50
51
51
// Force create the same group LDAP link in a different resource (uses testAccGitlabGroupLdapLinkForceCreateConfig for Config)
52
52
{
53
- SkipFunc : testAccGitlabGroupLdapLinkSkipFunc ( testLdapLink . CN , testLdapLink . Provider ) ,
53
+ SkipFunc : isRunningInCE ,
54
54
Config : testAccGitlabGroupLdapLinkForceCreateConfig (rInt , & testLdapLink ),
55
55
Check : resource .ComposeTestCheckFunc (
56
56
testAccCheckGitlabGroupLdapLinkExists ("gitlab_group_ldap_link.bar" , & ldapLink ),
@@ -62,16 +62,6 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
62
62
})
63
63
}
64
64
65
- func testAccGitlabGroupLdapLinkSkipFunc (testCN string , testProvider string ) func () (bool , error ) {
66
- return func () (bool , error ) {
67
- if testCN == "default" || testProvider == "default" {
68
- return true , nil
69
- }
70
-
71
- return isRunningInCE ()
72
- }
73
- }
74
-
75
65
func testAccCheckGitlabGroupLdapLinkExists (resourceName string , ldapLink * gitlab.LDAPGroupLink ) resource.TestCheckFunc {
76
66
return func (s * terraform.State ) error {
77
67
// Clear the "found" LDAP link before checking for existence
0 commit comments