Merge branch 'master' into deploy-token

Author: borgoat

.github/workflows/acceptance-tests.yml

@@ -3,12 +3,13 @@ on: [push,pull_request]
 
 jobs:
   acceptance-ce:
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.14
       id: go
 
     - name: Check out code repository source code
@@ -27,3 +28,40 @@ jobs:
       run: |
         bash scripts/start-gitlab.sh
         make $MAKE_TARGET
+
+  acceptance-ee:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.14
+      id: go
+
+    - name: Check out code repository source code
+      uses: actions/checkout@v2
+
+    - name: Set up Enterprise Edition License file
+      run: |
+        openssl version
+        mkdir license
+        [[ -n "${{ secrets.ENCRYPT_PASSWORD }}" ]] && echo decrypt
+        [[ -n "${{ secrets.ENCRYPT_PASSWORD }}" ]] && openssl enc  -d -aes-256-cbc -pbkdf2 -iter 20000 -in Gitlab-license.encrypted -out license/Gitlab-license.txt -pass "pass:${{ secrets.ENCRYPT_PASSWORD }}"
+        chmod 666 license/Gitlab-license.txt || true
+        echo "::set-env name=GITLAB_LICENSE_FILE::Gitlab-license.txt"
+
+    # https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
+    - name: Set build variables
+      run: |
+        echo "::set-env name=MAKE_TARGET::testacc"
+        echo "::set-env name=GO_FLAGS::-mod=vendor"
+        echo "::set-env name=GO111MODULE::on"
+        echo "::set-env name=GITLAB_TOKEN::20char-testing-token"
+        echo "::set-env name=GITLAB_BASE_URL::http://127.0.0.1:8080/api/v4"
+        echo "::set-env name=TF_LOG::DEBUG"
+
+    - name: Start Gitlab and run acceptance tests
+      run: |
+        bash scripts/start-gitlab.sh
+        make $MAKE_TARGET

.github/workflows/unit-tests.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [1.12, 1.13, 1.14]
+        go: [1.13, 1.14]
         os: [ubuntu-latest, macos-latest, windows-latest]
         make_target: [test, vet]
 

.github/workflows/website.yml

@@ -9,7 +9,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.14
       id: go
 
     # https://help.github.com/en/actions/reference/workflow-commands-for-github-actions

.gitignore

@@ -30,4 +30,4 @@ website/vendor
 !command/test-fixtures/**/*.tfstate
 !command/test-fixtures/**/.terraform/
 
-license/JulienPivotto.gitlab-license
+license/*

.go-version

@@ -1 +1 @@
-1.11.5
+1.14.1

.travis.yml

@@ -1,4 +1,23 @@
-## 2.5.1 (Unreleased)
+## 2.7.0 (Unreleased)
+## 2.6.0 (April 08, 2020)
+
+ENHANCEMENTS:
+* Add jira flags
+  ([[#274](https://github.com/terraform-providers/terraform-provider-gitlab/issues/274)])
+
+## 2.5.1 (April 06, 2020)
+
+BUGFIXES:
+* Support for soft-delete of groups and projects in Gitlab Enterprise Edition 
+  ([#282](https://github.com/terraform-providers/terraform-provider-gitlab/issues/282),
+   [#283](https://github.com/terraform-providers/terraform-provider-gitlab/issues/283),
+   [#285](https://github.com/terraform-providers/terraform-provider-gitlab/issues/285),
+   [#291](https://github.com/terraform-providers/terraform-provider-gitlab/issues/291))
+
+ENHANCEMENTS:
+* Switched from Travis CI to Github Actions 
+  ([#216](https://github.com/terraform-providers/terraform-provider-gitlab/issues/216))
+
 ## 2.5.0 (December 05, 2019)
 
 ENHANCEMENTS:

CHANGELOG.md

@@ -1,4 +1,4 @@
-TEST?=$$(go list ./... |grep -v 'vendor')
+TEST?=./gitlab
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=gitlab
@@ -14,7 +14,7 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+	TF_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout 40m
 
 vet:
 	@echo "go vet ."

GNUmakefile

@@ -1,22 +1,21 @@
+<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
+
 Terraform Provider for Gitlab
 =============================
 
 - [Documentation](https://www.terraform.io/docs/providers/gitlab/index.html)
 - [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
 - Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 - Build status:
-  - ![Unit Tests](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Unit%20Tests/badge.svg)
-  - ![Acceptance Tests](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Acceptance%20Tests/badge.svg)
-  - ![Website Build](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Website%20Build/badge.svg)
-
-
-<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
+  - ![Unit Tests](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Unit%20Tests/badge.svg?branch=master)
+  - ![Acceptance Tests](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Acceptance%20Tests/badge.svg?branch=master)
+  - ![Website Build](https://github.com/terraform-providers/terraform-provider-gitlab/workflows/Website%20Build/badge.svg?branch=master)
 
 Requirements
 ------------
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.12.x
--	[Go](https://golang.org/doc/install) 1.12 (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) >= 1.13 (to build the provider plugin)
 
 Building The Provider
 ---------------------