Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tools: update to Go 1.17 (#1003)

Guilherme Oenning17e360f77387
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d5f14fe8..e406e8bbf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,10 +45,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Use Go 1.16.6
+ - name: Use Go 1.17
uses: actions/setup-go@v2
with:
- go-version: 1.16.6
+ go-version: 1.17
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4bf48f73a..2884ef17c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ If you know these technologies or would like to learn them, lucky you! This is t
| Software | How to install | What is it used for |
| ----------- | -------------------------------------------------------------- | --------------------------------------------------------- |
-| Go 1.16+ | https://golang.org/ | To compile server side code |
+| Go 1.17+ | https://golang.org/ | To compile server side code |
| Node.js 16+ | https://nodejs.org/ or run `nvm use` if you have nvm installed | To compile TypeScript and bundle all the client side code |
| Docker | https://www.docker.com/ | To start local PostgreSQL instances |
diff --git a/Dockerfile b/Dockerfile
index cb9112363..f00c3a10b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
#####################
### Server Build Step
#####################
-FROM golang:1.16.6-buster AS server-builder
+FROM golang:1.17-buster AS server-builder
ARG buildnumber=local
diff --git a/app/middlewares/instrumentation_test.go b/app/middlewares/instrumentation_test.go
index 331bdbbd0..719a03014 100644
--- a/app/middlewares/instrumentation_test.go
+++ b/app/middlewares/instrumentation_test.go
@@ -17,10 +17,6 @@ import (
func TestInstrumentation_Disabled(t *testing.T) {
RegisterT(t)
- defer func() {
- env.Config.Metrics.Enabled = true
- }()
-
server := mock.NewServer()
env.Config.Metrics.Enabled = false
server.Use(middlewares.Instrumentation())
diff --git a/app/middlewares/maintenance_test.go b/app/middlewares/maintenance_test.go
index 74c46bf6e..ab7319172 100644
--- a/app/middlewares/maintenance_test.go
+++ b/app/middlewares/maintenance_test.go
@@ -29,10 +29,6 @@ func TestMaintenance_Disabled(t *testing.T) {
func TestMaintenance_Enabled(t *testing.T) {
RegisterT(t)
- defer func() {
- env.Config.Maintenance.Enabled = false
- }()
-
server := mock.NewServer()
env.Config.Maintenance.Enabled = true
server.Use(middlewares.ClientCache(30 * time.Hour))
diff --git a/app/middlewares/tenant_test.go b/app/middlewares/tenant_test.go
index 701a4b482..e0ec48746 100644
--- a/app/middlewares/tenant_test.go
+++ b/app/middlewares/tenant_test.go
@@ -250,10 +250,6 @@ func TestSingleTenant_WithTenants_ShouldSetFirstToContext(t *testing.T) {
func TestSingleTenant_HostMismatch(t *testing.T) {
RegisterT(t)
- host := env.Config.HostDomain
- defer func() {
- env.Config.HostDomain = host
- }()
env.Config.HostDomain = "yoursite.com"
bus.AddHandler(func(ctx context.Context, q *query.GetFirstTenant) error {
diff --git a/app/pkg/env/env_test.go b/app/pkg/env/env_test.go
index 50982f176..a2f3ac91e 100644
--- a/app/pkg/env/env_test.go
+++ b/app/pkg/env/env_test.go
@@ -21,11 +21,6 @@ var envs = []struct {
func TestIsEnvironment(t *testing.T) {
RegisterT(t)
- current := env.Config.Environment
- defer func() {
- env.Config.Environment = current
- }()
-
for _, testCase := range envs {
env.Config.Environment = testCase.go_env
actual := testCase.isEnv()
diff --git a/go.mod b/go.mod
index dcbc0672d..b7c38b233 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
-// +heroku goVersion go1.16
+// +heroku goVersion go1.17
module github.com/getfider/fider
-go 1.16
+go 1.17
require (
github.com/aws/aws-sdk-go v1.40.9
@@ -10,10 +10,8 @@ require (
github.com/goenning/imagic v0.0.1
github.com/goenning/letteravatar v0.0.0-20180605200324-553181ed4055
github.com/golang-jwt/jwt/v4 v4.0.0
- github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golangci/golangci-lint v1.41.1
github.com/gosimple/slug v1.10.0
- github.com/gotnospirit/makeplural v0.0.0-20180622080156-a5f48d94d976 // indirect
github.com/gotnospirit/messageformat v0.0.0-20190719172517-c1d0bdacdea2
github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd
github.com/joho/godotenv v1.3.0
@@ -29,3 +27,150 @@ require (
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
rogchap.com/v8go v0.6.0
)
+
+require (
+ 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
+ github.com/BurntSushi/toml v0.3.1 // indirect
+ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
+ github.com/Masterminds/semver v1.5.0 // indirect
+ github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
+ github.com/alexkohler/prealloc v1.0.0 // indirect
+ github.com/ashanbrown/forbidigo v1.2.0 // indirect
+ github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde // indirect
+ github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/bkielbasa/cyclop v1.2.0 // indirect
+ github.com/bombsimon/wsl/v3 v3.3.0 // indirect
+ github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/charithe/durationcheck v0.0.8 // indirect
+ github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect
+ github.com/creack/pty v1.1.11 // indirect
+ github.com/daixiang0/gci v0.2.8 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/denis-tingajkin/go-header v0.4.2 // indirect
+ github.com/disintegration/imaging v1.6.0 // indirect
+ github.com/esimonov/ifshort v1.0.2 // indirect
+ github.com/ettle/strcase v0.1.1 // indirect
+ github.com/fatih/color v1.12.0 // indirect
+ github.com/fatih/structtag v1.2.0 // indirect
+ github.com/fsnotify/fsnotify v1.4.9 // indirect
+ github.com/fzipp/gocyclo v0.3.1 // indirect
+ github.com/go-critic/go-critic v0.5.6 // indirect
+ github.com/go-toolsmith/astcast v1.0.0 // indirect
+ github.com/go-toolsmith/astcopy v1.0.0 // indirect
+ github.com/go-toolsmith/astequal v1.0.0 // indirect
+ github.com/go-toolsmith/astfmt v1.0.0 // indirect
+ github.com/go-toolsmith/astp v1.0.0 // indirect
+ github.com/go-toolsmith/strparse v1.0.0 // indirect
+ github.com/go-toolsmith/typep v1.0.2 // indirect
+ github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
+ github.com/gobwas/glob v0.2.3 // indirect
+ github.com/gofrs/flock v0.8.0 // indirect
+ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+ github.com/golang/protobuf v1.4.3 // indirect
+ github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
+ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
+ github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect
+ github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
+ github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
+ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
+ github.com/golangci/misspell v0.3.5 // indirect
+ github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect
+ github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
+ github.com/google/go-cmp v0.5.4 // indirect
+ github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect
+ github.com/gorilla/css v1.0.0 // indirect
+ github.com/gosimple/unidecode v1.0.0 // indirect
+ github.com/gostaticanalysis/analysisutil v0.4.1 // indirect
+ github.com/gostaticanalysis/comment v1.4.1 // indirect
+ github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect
+ github.com/gostaticanalysis/nilerr v0.1.1 // indirect
+ github.com/gotnospirit/makeplural v0.0.0-20180622080156-a5f48d94d976 // indirect
+ github.com/hashicorp/errwrap v1.0.0 // indirect
+ github.com/hashicorp/go-multierror v1.1.1 // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/jgautheron/goconst v1.5.1 // indirect
+ github.com/jingyugao/rowserrcheck v1.1.0 // indirect
+ github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
+ github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
+ github.com/kisielk/errcheck v1.6.0 // indirect
+ github.com/kisielk/gotool v1.0.0 // indirect
+ github.com/kulti/thelper v0.4.0 // indirect
+ github.com/kunwardeep/paralleltest v1.0.2 // indirect
+ github.com/kyoh86/exportloopref v0.1.8 // indirect
+ github.com/ldez/gomoddirectives v0.2.1 // indirect
+ github.com/ldez/tagliatelle v0.2.0 // indirect
+ github.com/magiconair/properties v1.8.1 // indirect
+ github.com/maratori/testpackage v1.0.1 // indirect
+ github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
+ github.com/mattn/go-colorable v0.1.8 // indirect
+ github.com/mattn/go-isatty v0.0.12 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/mbilski/exhaustivestruct v1.2.0 // indirect
+ github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect
+ github.com/mgechev/revive v1.0.7 // indirect
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/mapstructure v1.1.2 // indirect
+ github.com/moricho/tparallel v0.2.1 // indirect
+ github.com/nakabonne/nestif v0.3.0 // indirect
+ github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
+ github.com/nishanths/exhaustive v0.1.0 // indirect
+ github.com/nishanths/predeclared v0.2.1 // indirect
+ github.com/olekukonko/tablewriter v0.0.5 // indirect
+ github.com/pelletier/go-toml v1.8.1 // indirect
+ github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea // indirect
+ github.com/prometheus/common v0.10.0 // indirect
+ github.com/prometheus/procfs v0.1.3 // indirect
+ github.com/quasilyte/go-ruleguard v0.3.4 // indirect
+ github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
+ github.com/ryancurrah/gomodguard v1.2.2 // indirect
+ github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
+ github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
+ github.com/securego/gosec/v2 v2.8.0 // indirect
+ github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
+ github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/sonatard/noctx v0.0.1 // indirect
+ github.com/sourcegraph/go-diff v0.6.1 // indirect
+ github.com/spf13/afero v1.1.2 // indirect
+ github.com/spf13/cast v1.3.0 // indirect
+ github.com/spf13/cobra v1.1.3 // indirect
+ github.com/spf13/jwalterweatherman v1.0.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/spf13/viper v1.7.1 // indirect
+ github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect
+ github.com/stretchr/objx v0.1.1 // indirect
+ github.com/stretchr/testify v1.7.0 // indirect
+ github.com/subosito/gotenv v1.2.0 // indirect
+ github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect
+ github.com/tetafro/godot v1.4.7 // indirect
+ github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect
+ github.com/tomarrell/wrapcheck/v2 v2.1.0 // indirect
+ github.com/tommy-muehle/go-mnd/v2 v2.4.0 // indirect
+ github.com/ultraware/funlen v0.0.3 // indirect
+ github.com/ultraware/whitespace v0.0.4 // indirect
+ github.com/uudashr/gocognit v1.0.1 // indirect
+ github.com/yeya24/promlinter v0.1.0 // indirect
+ golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
+ golang.org/x/mod v0.4.2 // indirect
+ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+ golang.org/x/text v0.3.6 // indirect
+ golang.org/x/tools v0.1.3 // indirect
+ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+ google.golang.org/appengine v1.6.6 // indirect
+ google.golang.org/protobuf v1.25.0 // indirect
+ gopkg.in/ini.v1 v1.51.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ honnef.co/go/tools v0.2.0 // indirect
+ mvdan.cc/gofumpt v0.1.1 // indirect
+ mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
+ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
+ mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect
+)