Merge branch 'project-approval-rules'

Author: David Townshend

gitlab/helper_test.go

@@ -29,14 +29,14 @@ func testAccCompareGitLabAttribute(attr string, expected, received *schema.Resou
 }
 
 func testAccIsSkippedAttribute(needle string, haystack []string) bool {
-	if needle == "" {
-		return false
-	}
-	for _, hay := range haystack {
-		if hay == needle {
-			return true
+	if needle != "" {
+		for _, hay := range haystack {
+			if hay == needle {
+				return true
+			}
 		}
 	}
+
 	return false
 }
 

gitlab/provider.go

@@ -88,6 +88,7 @@ func Provider() terraform.ResourceProvider {
 			"gitlab_project_share_group":        resourceGitlabProjectShareGroup(),
 			"gitlab_group_cluster":              resourceGitlabGroupCluster(),
 			"gitlab_group_ldap_link":            resourceGitlabGroupLdapLink(),
+			"gitlab_project_approval_rule":      resourceGitlabProjectApprovalRule(),
 		},
 
 		ConfigureFunc: providerConfigure,

gitlab/provider_test.go

@@ -33,3 +33,9 @@ func testAccPreCheck(t *testing.T) {
 		t.Fatal("GITLAB_TOKEN must be set for acceptance tests")
 	}
 }
+
+func testGitLabLicensePreCheck(t *testing.T) {
+	if v := os.Getenv("GITLAB_LICENSE_FILE"); v == "" {
+		t.Skipf("GITLAB_LICENSE_FILE must be set to run EE tests.")
+	}
+}