Merge branch 'master' into deploy-token

borgoat · borgoat · commit 46f02025589b · 2020-03-24T11:33:23.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* -text
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -0,0 +1,29 @@
+name: Acceptance Tests
+on: [push,pull_request]
+
+jobs:
+  acceptance-ce:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code repository source code
+      uses: actions/checkout@v2
+
+    # 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"
+
+    - name: Start Gitlab and run acceptance tests
+      run: |
+        bash scripts/start-gitlab.sh
+        make $MAKE_TARGET
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -0,0 +1,33 @@
+name: Unit Tests
+on: [push,pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        go: [1.12, 1.13, 1.14]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        make_target: [test, vet]
+
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go }}
+      id: go
+
+    - name: Check out code repository source code
+      uses: actions/checkout@v2
+
+    # https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
+    - name: Set build variables
+      run: |
+        echo "::set-env name=MAKE_TARGET::${{ matrix.make_target }}"
+        echo "::set-env name=GO_FLAGS::-mod=vendor"
+        echo "::set-env name=GO111MODULE::on"
+
+    - name: Run ${{matrix.make_target}}
+      run: |
+        make $MAKE_TARGET
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -0,0 +1,33 @@
+name: Website Build
+on: [push,pull_request]
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    # https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
+    - name: Set Go variables for backwards compatibility
+      run: |
+        echo "::set-env name=GOPATH::$GITHUB_WORKSPACE/go"
+        echo "::set-env name=GOBIN::$GITHUB_WORKSPACE/go/bin"
+        echo "::add-path::$GITHUB_WORKSPACE/go/bin"
+    
+    - name: Check out code repository source code
+      uses: actions/checkout@v2
+      with:
+        path: go/src/github.com/${{ github.repository }}
+
+    - name: Run website-test
+      run: |
+        cd $GOPATH/src/github.com/${{ github.repository }}
+        export MAKE_TARGET=${{ matrix.make_target }}
+        export GOFLAGS=-mod=vendor
+        export GO111MODULE=on
+        make website-test
diff --git a/.travis.yml b/.travis.yml
@@ -2,34 +2,13 @@ language: go
 matrix:
   fast_finish: false
   include:
-  - name: unit tests
-    env: MAKE_TARGET=test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: "1.12.x"
   - name: acceptance tests EE
     env: MAKE_TARGET=testacc GITLAB_LICENSE_FILE=JulienPivotto.gitlab-license GOFLAGS=-mod=vendor GO111MODULE=on GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4 GITLAB_TOKEN=ACCTEST
     go: "1.12.x"
   - name: acceptance tests CE
     env: MAKE_TARGET=testacc GOFLAGS=-mod=vendor GO111MODULE=on GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4 GITLAB_TOKEN=ACCTEST
     go: "1.12.x"
-  - name: govet tests
-    env: MAKE_TARGET=vet GOFLAGS=-mod=vendor GO111MODULE=on
-    go: "1.12.x"
-  - name: website tests
-    env: MAKE_TARGET=website-test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: "1.12.x"
-  - name: unit tests (go 1.12)
-    env: MAKE_TARGET=test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: "1.13.x"
-  - name: unit tests (go tip)
-    env: MAKE_TARGET=test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: tip
   allow_failures:
-  - name: unit tests (go tip)
-    env: MAKE_TARGET=test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: tip
-  - name: unit tests (go 1.12)
-    env: MAKE_TARGET=test GOFLAGS=-mod=vendor GO111MODULE=on
-    go: "1.13.x"
   - name: acceptance tests EE
     env: MAKE_TARGET=testacc GITLAB_LICENSE_FILE=JulienPivotto.gitlab-license GOFLAGS=-mod=vendor GO111MODULE=on GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4 GITLAB_TOKEN=ACCTEST
     go: "1.12.x"
diff --git a/README.md b/README.md
@@ -1,17 +1,22 @@
-Terraform Provider
-==================
+Terraform Provider for Gitlab
+=============================
 
-- Website: https://www.terraform.io
+- [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">
 
 Requirements
 ------------
 
--	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
--	[Go](https://golang.org/doc/install) 1.11 (to build the provider plugin)
+-	[Terraform](https://www.terraform.io/downloads.html) 0.12.x
+-	[Go](https://golang.org/doc/install) 1.12 (to build the provider plugin)
 
 Building The Provider
 ---------------------
diff --git a/go.sum b/go.sum
@@ -220,16 +220,9 @@ github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6Ac
 github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/xanzy/go-gitlab v0.22.2 h1:KYPewSm3Tl7WHrVON7BOwX6FZ1gaiFEdpOt0DNIYySA=
-github.com/xanzy/go-gitlab v0.22.2/go.mod h1:t4Bmvnxj7k37S4Y17lfLx+nLqkf/oQwT2HagfWKv5Og=
-github.com/xanzy/go-gitlab v0.22.3 h1:/rNlZ2hquUWNc6rJdntVM03tEOoTmnZ1lcNyJCl0WlU=
-github.com/xanzy/go-gitlab v0.22.3/go.mod h1:t4Bmvnxj7k37S4Y17lfLx+nLqkf/oQwT2HagfWKv5Og=
-github.com/xanzy/go-gitlab v0.28.1-0.20200316171023-390fda840a9c h1:tO2lQ5cSDK3QXVf7utVpuyf77wTGnIC6LDQZp0zpxOw=
-github.com/xanzy/go-gitlab v0.28.1-0.20200316171023-390fda840a9c/go.mod h1:t4Bmvnxj7k37S4Y17lfLx+nLqkf/oQwT2HagfWKv5Og=
 github.com/xanzy/go-gitlab v0.29.0 h1:9tMvAkG746eIlzcdpnRgpcKPA1woUDmldMIjR/E5OWM=
 github.com/xanzy/go-gitlab v0.29.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
 github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
-github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v1.1.1 h1:Shl2p9Dat0cqJfXu0DZa+cOTRPhXQjK8IYWD6GVfiqo=
 github.com/zclconf/go-cty v1.1.1/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
@@ -261,7 +254,6 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
@@ -282,21 +274,12 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a h1:+HHJiFUXVOIS9mr1ThqkQD1N8vpFCfCShqADBM12KTc=
-golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8 h1:1+zQlQqEEhUeStBTi653GZAnAuivZq/2hz+Iz+OP7rg=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 h1:pE8b58s1HRDMi8RDc79m0HISf9D4TzseP40cEA6IGfs=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/website/docs/r/group.html.markdown b/website/docs/r/group.html.markdown
@@ -24,7 +24,7 @@ resource "gitlab_group" "example" {
 resource "gitlab_project" "example" {
   name         = "example"
   description  = "An example project"
-  parent_id = "${gitlab_group.example.id}"
+  namespace_id = "${gitlab_group.example.id}"
 }
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ resource "gitlab_group" "example" {`
`24`	`24`	`resource "gitlab_project" "example" {`
`25`	`25`	`name = "example"`
`26`	`26`	`description = "An example project"`
`27`		`- parent_id = "${gitlab_group.example.id}"`
	`27`	`+ namespace_id = "${gitlab_group.example.id}"`
`28`	`28`	`}`
`29`	`29`	```
`30`	`30`