Move isRunningInCE and isRunningInEE in their own helper

Signed-off-by: Julien Pivotto <[email protected]>

Author: Julien Pivotto

README.md

@@ -38,10 +38,9 @@ Using the provider
 ----------------------
 ## Fill in for each provider
 
-Developing the Provider
----------------------------
+# Developing the Provider
 
-If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.11+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.14+ is *required*).
 
 To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 
@@ -53,7 +52,8 @@ $ $GOPATH/bin/terraform-provider-gitlab
 ```
 
 ### Running tests
-The Terraform Provider only has acceptance tests, these can run against a gitlab instance where you have a token with administrator permissions (likely not gitlab.com). 
+
+The Terraform Provider only has acceptance tests, these can run against a gitlab instance where you have a token with administrator permissions (likely not gitlab.com).
 There is excellent documentation on [how to run gitlab from docker at gitlab.com](https://docs.gitlab.com/omnibus/docker/)
 
 In order to run the full suite of acceptance tests, export the environment variables: 
@@ -66,3 +66,13 @@ and run `make testacc`.
 ```sh
 $ make testacc
 ```
+
+### Gitlab Community Edition and Gitlab Entreprise Edition
+
+This module supports both Gitlab CE and Gitlab EE. We run tests on Gitlab EE,
+but can't run them on pull requests from forks.
+
+Features that only work on one flavour can use the following helpers as
+SkipFunc: `isRunningInEE` and `isRunningInCE`. You can see an exemple of this
+for [gitlab_project_push_rules](gitlab/resource_gitlab_project_push_rules_test.go)
+tests.

gitlab/helper_test.go

@@ -1,9 +1,12 @@
 package gitlab
 
 import (
+	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/xanzy/go-gitlab"
 )
 
 // testAccCompareGitLabAttribute compares an attribute in two ResourceData's for
@@ -36,3 +39,27 @@ func testAccIsSkippedAttribute(needle string, haystack []string) bool {
 	}
 	return false
 }
+
+// Returns true if the acceptance test is running Gitlab EE.
+// Meant to be used as SkipFunc to skip tests that work only on Gitlab CE.
+func isRunningInEE() (bool, error) {
+	if conn, ok := testAccProvider.Meta().(*gitlab.Client); ok {
+		version, _, err := conn.Version.GetVersion()
+		if err != nil {
+			return false, err
+		}
+		if strings.Contains(version.String(), "-ee") {
+			return true, nil
+		}
+	} else {
+		return false, errors.New("Provider not initialized, unable to get GitLab connection")
+	}
+	return false, nil
+}
+
+// Returns true if the acceptance test is running Gitlab CE.
+// Meant to be used as SkipFunc to skip tests that work only on Gitlab EE.
+func isRunningInCE() (bool, error) {
+	isEE, err := isRunningInEE()
+	return !isEE, err
+}

gitlab/resource_gitlab_project_push_rules_test.go

@@ -1,9 +1,7 @@
 package gitlab
 
 import (
-	"errors"
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -13,26 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 )
 
-func isRunningInEE() (bool, error) {
-	if conn, ok := testAccProvider.Meta().(*gitlab.Client); ok {
-		version, _, err := conn.Version.GetVersion()
-		if err != nil {
-			return false, err
-		}
-		if strings.Contains(version.String(), "-ee") {
-			return true, nil
-		}
-	} else {
-		return false, errors.New("Provider not initialized, unable to get GitLab connection")
-	}
-	return false, nil
-}
-
-func isRunningInCE() (bool, error) {
-	isEE, err := isRunningInEE()
-	return !isEE, err
-}
-
 func TestAccGitlabProjectPushRules_basic(t *testing.T) {
 	var pushRules gitlab.ProjectPushRules
 	rInt := acctest.RandInt()