Skip to content

Commit

Permalink
Added go 1.17 support (#3224)
Browse files Browse the repository at this point in the history
- updated CI/CD docker build image
- updated tags to support go 1.17
- go mod tidy for go 1.17

Signed-off-by: David Deal <[email protected]>
  • Loading branch information
dealako authored Aug 31, 2021
1 parent e229702 commit 511d4d4
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 154 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:

buildGoBackend: &buildGoBackendAnchor
docker:
- image: circleci/golang:1.16.5
- image: circleci/golang:1.17
working_directory: /go/src/github.com/communitybridge/easycla/
steps:
- checkout
Expand All @@ -217,7 +217,7 @@ jobs:
sudo apt-get update
sudo apt install -y software-properties-common
sudo add-apt-repository ppa:deadsnakes/ppa -y
sudo apt-get install -y python3.7 python3-pip
sudo apt-get install -y python3 python3-pip
echo "Upgrading pip..."
python3 -m pip install --upgrade pip
echo "Python 3 version:"
Expand Down Expand Up @@ -879,7 +879,7 @@ jobs:
functionalTestsGo: &functionalTestsGo
docker:
- image: circleci/golang:1.16.5
- image: circleci/golang:1.17
steps:
- attach_workspace:
at: ~/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aws_lambda
// +build aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !aws_lambda
// +build !aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
1 change: 1 addition & 0 deletions cla-backend-go/cmd/server_aws_lambda.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aws_lambda
// +build aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
1 change: 1 addition & 0 deletions cla-backend-go/cmd/server_standalone.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !aws_lambda
// +build !aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
49 changes: 47 additions & 2 deletions cla-backend-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT
module github.com/communitybridge/easycla/cla-backend-go

go 1.16
go 1.17

replace github.com/awslabs/aws-lambda-go-api-proxy => github.com/LF-Engineering/aws-lambda-go-api-proxy v0.3.2

Expand Down Expand Up @@ -56,7 +56,6 @@ require (
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
github.com/tencentyun/scf-go-lib v0.0.0-20200116145541-9a6ea1bf75b8
github.com/ugorji/go v1.2.6 // indirect
github.com/verdverm/frisby v0.0.0-20170604211311-b16556248a9a
github.com/xanzy/go-gitlab v0.50.1
go.uber.org/ratelimit v0.1.0
Expand All @@ -69,3 +68,49 @@ require (
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
google.golang.org/protobuf v1.27.1 // indirect
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-openapi/analysis v0.19.10 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-playground/locales v0.13.0 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-github/v29 v29.0.2 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hhrutter/lzw v0.0.0-20190829144645-6f07a24e8650 // indirect
github.com/hhrutter/tiff v0.0.0-20190829141212-736cae8d0bc7 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.1 // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pelletier/go-toml v1.9.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/ugorji/go/codec v1.2.6 // indirect
go.mongodb.org/mongo-driver v1.3.4 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
149 changes: 0 additions & 149 deletions cla-backend-go/go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cla-backend-go/userSubscribeLambda/cmd/serve_lambda.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aws_lambda
// +build aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
1 change: 1 addition & 0 deletions cla-backend-go/userSubscribeLambda/cmd/serve_local.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !aws_lambda
// +build !aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
1 change: 1 addition & 0 deletions cla-backend-go/utils/utils_user_auth_lambda.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aws_lambda
// +build aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down
1 change: 1 addition & 0 deletions cla-backend-go/utils/utils_user_auth_standalone.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !aws_lambda
// +build !aws_lambda

// Copyright The Linux Foundation and each contributor to CommunityBridge.
Expand Down

0 comments on commit 511d4d4

Please sign in to comment.