Skip to content

Commit 3be9c14

Browse files
authored
Update go version and go-gitlab version (#523)
* Bump go-gitlab version to 0.42.0 and run `go mod vendor` * Bump Go version and fix for resource_gitlab_project_test * Additional go version updates
1 parent ea6de45 commit 3be9c14

36 files changed

+934
-218
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# This GitHub action can publish assets for release when a tag is created.
22
# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0).
33
#
4-
# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
4+
# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
55
# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE`
66
# secret. If you would rather own your own GPG handling, please fork this action
77
# or use an alternative one for key handling.
88
#
9-
# You will need to pass the `--batch` flag to `gpg` in your signing step
9+
# You will need to pass the `--batch` flag to `gpg` in your signing step
1010
# in `goreleaser` to indicate this is being used in a non-interactive mode.
1111
#
1212
name: release
@@ -28,7 +28,7 @@ jobs:
2828
name: Set up Go
2929
uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.14
31+
go-version: 1.15
3232
-
3333
name: Import GPG key
3434
id: import_gpg
@@ -44,4 +44,4 @@ jobs:
4444
args: release --rm-dist
4545
env:
4646
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.15.2
1+
1.15.6

gitlab/resource_gitlab_project_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,11 +867,20 @@ func testAccGitlabProjectConfigDefaultBranchSkipFunc(project *gitlab.Project, de
867867
conn := testAccProvider.Meta().(*gitlab.Client)
868868

869869
commitMessage := "Initial Commit"
870+
commitFile := "file.txt"
871+
commitFileAction := gitlab.FileCreate
872+
commitActions := []*gitlab.CommitActionOptions{
873+
{
874+
Action: &commitFileAction,
875+
FilePath: &commitFile,
876+
Content: &commitMessage,
877+
},
878+
}
870879

871880
options := &gitlab.CreateCommitOptions{
872881
Branch: &defaultBranch,
873882
CommitMessage: &commitMessage,
874-
Actions: []*gitlab.CommitAction{},
883+
Actions: commitActions,
875884
}
876885

877886
_, _, err := conn.Commits.CreateCommit(project.ID, options)

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/gitlabhq/terraform-provider-gitlab
22

3+
go 1.15
4+
35
require (
46
github.com/hashicorp/go-retryablehttp v0.6.4
57
github.com/hashicorp/terraform-plugin-sdk v1.15.0
68
github.com/mitchellh/hashstructure v1.0.0
7-
github.com/xanzy/go-gitlab v0.38.1
9+
github.com/xanzy/go-gitlab v0.42.0
810
)
9-
10-
go 1.14

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
199199
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
200200
github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
201201
github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
202-
github.com/xanzy/go-gitlab v0.38.1 h1:st5/Ag4h8CqVfp3LpOWW0Jd4jYHTGETwu0KksYDPnYE=
203-
github.com/xanzy/go-gitlab v0.38.1/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
202+
github.com/xanzy/go-gitlab v0.42.0 h1:daNdMFnw2FG+lDRBcX+YLnKbqIKMdefVyVztMHwsFhk=
203+
github.com/xanzy/go-gitlab v0.42.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
204204
github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
205205
github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
206206
github.com/zclconf/go-cty v1.2.1 h1:vGMsygfmeCl4Xb6OA5U5XVAaQZ69FvoG7X2jUtQujb8=

vendor/github.com/xanzy/go-gitlab/.golangci.yml

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xanzy/go-gitlab/.travis.yml

Lines changed: 10 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xanzy/go-gitlab/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xanzy/go-gitlab/applications.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xanzy/go-gitlab/commits.go

Lines changed: 36 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)