Upgrade to Go 1.19 (#208)

* Bump go version 1.19

Signed-off-by: Caleb Brown <[email protected]>

* Update the Go base image to 1.19.1 linux/amd64

Signed-off-by: Caleb Brown <[email protected]>

* Migrate to flag.TextVar in Go 1.19

Signed-off-by: Caleb Brown <[email protected]>

* Remove backport of textvarflag because we are now on Go 1.19.

Signed-off-by: Caleb Brown <[email protected]>

Signed-off-by: Caleb Brown <[email protected]>

Author: calebbrown

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
     - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
       with:
-        go-version: 1.18
+        go-version: 1.19
     - name: Run tests
       run: make test
   run-linter:
@@ -24,6 +24,6 @@ jobs:
     - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
     - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
       with:
-        go-version: 1.18
+        go-version: 1.19
     - name: golangci-lint
       uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc

cmd/collect_signals/main.go

@@ -41,7 +41,6 @@ import (
 	"github.com/ossf/criticality_score/internal/githubapi"
 	log "github.com/ossf/criticality_score/internal/log"
 	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/textvarflag"
 	"github.com/ossf/criticality_score/internal/workerpool"
 )
 
@@ -58,7 +57,7 @@ var (
 
 func init() {
 	flag.Var(&logLevel, "log", "set the `level` of logging.")
-	textvarflag.TextVar(flag.CommandLine, &logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
+	flag.TextVar(&logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
 	outfile.DefineFlags(flag.CommandLine, "force", "append", "OUT_FILE")
 	flag.Usage = func() {
 		cmdName := path.Base(os.Args[0])

cmd/enumerate_github/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang@sha256:684d791f8fd1b28485ee32239d92cde7099d97c88c5ed2e955f65f4adcf35d0f AS base
+FROM golang@sha256:122f3484f844467ebe0674cf57272e61981770eb0bc7d316d1f0be281a88229f AS base
 WORKDIR /src
 ENV CGO_ENABLED=0
 COPY go.mod go.sum ./

cmd/enumerate_github/main.go

@@ -37,7 +37,6 @@ import (
 	"github.com/ossf/criticality_score/internal/envflag"
 	log "github.com/ossf/criticality_score/internal/log"
 	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/textvarflag"
 	"github.com/ossf/criticality_score/internal/workerpool"
 )
 
@@ -106,8 +105,8 @@ func init() {
 	flag.Var(&startDateFlag, "start", "the start `date` to enumerate back to. Must be at or after 2008-01-01.")
 	flag.Var(&endDateFlag, "end", "the end `date` to enumerate from.")
 	flag.Var(&logLevel, "log", "set the `level` of logging.")
-	textvarflag.TextVar(flag.CommandLine, &format, "format", repowriter.WriterTypeText, "set output file `format`.")
-	textvarflag.TextVar(flag.CommandLine, &logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
+	flag.TextVar(&format, "format", repowriter.WriterTypeText, "set output file `format`.")
+	flag.TextVar(&logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
 	outfile.DefineFlags(flag.CommandLine, "force", "append", "FILE")
 	flag.Usage = func() {
 		cmdName := path.Base(os.Args[0])

cmd/scorer/main.go

@@ -51,7 +51,6 @@ import (
 	_ "github.com/ossf/criticality_score/cmd/scorer/algorithm/wam"
 	log "github.com/ossf/criticality_score/internal/log"
 	"github.com/ossf/criticality_score/internal/outfile"
-	"github.com/ossf/criticality_score/internal/textvarflag"
 )
 
 const defaultLogLevel = zapcore.InfoLevel
@@ -65,7 +64,7 @@ var (
 
 func init() {
 	flag.Var(&logLevel, "log", "set the `level` of logging.")
-	textvarflag.TextVar(flag.CommandLine, &logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
+	flag.TextVar(&logEnv, "log-env", log.DefaultEnv, "set logging `env`.")
 	outfile.DefineFlags(flag.CommandLine, "force", "append", "OUT_FILE") // TODO: add the ability to disable "append"
 	flag.Usage = func() {
 		cmdName := path.Base(os.Args[0])

go.mod

@@ -1,6 +1,6 @@
 module github.com/ossf/criticality_score
 
-go 1.18
+go 1.19
 
 require (
 	cloud.google.com/go/bigquery v1.32.0