Skip to content

Commit bc54838

Browse files
authored
Merge pull request #67 from uoregon-libraries/feature/tooling
Feature/tooling
2 parents bc9c9fd + 32a7626 commit bc54838

File tree

4 files changed

+120
-22
lines changed

4 files changed

+120
-22
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ BUILD := $(shell git describe --tags)
88
# Default target builds binaries
99
all: binaries
1010

11+
# Security check
12+
.PHONY: audit
13+
audit:
14+
go tool govulncheck ./src/...
15+
1116
# Generated code
1217
generate: src/transform/rotation.go
1318

@@ -35,7 +40,7 @@ format:
3540
find src/ -name "*.go" | xargs gofmt -l -w -s
3641

3742
lint:
38-
revive src/...
43+
go tool revive src/...
3944
go vet rais/src/...
4045

4146
# Cleanup

docker/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ LABEL maintainer="Jeremy Echols <jechols@uoregon.edu>"
1414
RUN apt-get update -y && apt-get upgrade -y && \
1515
apt-get install -y libopenjp2-7-dev libmagickcore-dev git gcc make tar findutils
1616

17-
# Make sure the build box can lint code
18-
RUN go install github.com/mgechev/revive@latest
19-
2017
# Add the go mod stuff first so we aren't re-downloading dependencies except
2118
# when they actually change
2219
WORKDIR /opt/rais-src

go.mod

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module rais
22

3-
go 1.20
3+
go 1.23.0
4+
5+
toolchain go1.24.2
46

57
require (
6-
github.com/BurntSushi/toml v0.3.1
8+
github.com/BurntSushi/toml v1.5.0
79
github.com/aws/aws-sdk-go v1.50.36
810
github.com/google/go-cmp v0.6.0
911
github.com/gorilla/mux v1.8.0
@@ -49,6 +51,9 @@ require (
4951
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect
5052
github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect
5153
github.com/aws/smithy-go v1.20.1 // indirect
54+
github.com/chavacava/garif v0.1.0 // indirect
55+
github.com/fatih/color v1.18.0 // indirect
56+
github.com/fatih/structtag v1.2.0 // indirect
5257
github.com/felixge/httpsnoop v1.0.4 // indirect
5358
github.com/fsnotify/fsnotify v1.7.0 // indirect
5459
github.com/go-logr/logr v1.4.1 // indirect
@@ -61,16 +66,24 @@ require (
6166
github.com/google/wire v0.6.0 // indirect
6267
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
6368
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
69+
github.com/hashicorp/go-version v1.7.0 // indirect
6470
github.com/hashicorp/hcl v1.0.0 // indirect
6571
github.com/jmespath/go-jmespath v0.4.0 // indirect
6672
github.com/kylelemons/godebug v1.1.0 // indirect
6773
github.com/magiconair/properties v1.8.7 // indirect
74+
github.com/mattn/go-colorable v0.1.14 // indirect
75+
github.com/mattn/go-isatty v0.0.20 // indirect
76+
github.com/mattn/go-runewidth v0.0.16 // indirect
77+
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
78+
github.com/mgechev/revive v1.8.0 // indirect
6879
github.com/mitchellh/mapstructure v1.5.0 // indirect
80+
github.com/olekukonko/tablewriter v0.0.5 // indirect
6981
github.com/opentracing/opentracing-go v1.2.0 // indirect
7082
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
7183
github.com/philhofer/fwd v1.0.0 // indirect
7284
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
73-
github.com/spf13/afero v1.9.3 // indirect
85+
github.com/rivo/uniseg v0.4.7 // indirect
86+
github.com/spf13/afero v1.14.0 // indirect
7487
github.com/spf13/cast v1.5.0 // indirect
7588
github.com/spf13/jwalterweatherman v1.1.0 // indirect
7689
github.com/subosito/gotenv v1.4.2 // indirect
@@ -81,13 +94,17 @@ require (
8194
go.opentelemetry.io/otel v1.24.0 // indirect
8295
go.opentelemetry.io/otel/metric v1.24.0 // indirect
8396
go.opentelemetry.io/otel/trace v1.24.0 // indirect
84-
golang.org/x/crypto v0.27.0 // indirect
85-
golang.org/x/net v0.29.0 // indirect
97+
golang.org/x/crypto v0.36.0 // indirect
98+
golang.org/x/mod v0.24.0 // indirect
99+
golang.org/x/net v0.37.0 // indirect
86100
golang.org/x/oauth2 v0.18.0 // indirect
87-
golang.org/x/sync v0.8.0 // indirect
88-
golang.org/x/sys v0.25.0 // indirect
89-
golang.org/x/text v0.19.0 // indirect
101+
golang.org/x/sync v0.12.0 // indirect
102+
golang.org/x/sys v0.31.0 // indirect
103+
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
104+
golang.org/x/text v0.23.0 // indirect
90105
golang.org/x/time v0.5.0 // indirect
106+
golang.org/x/tools v0.31.0 // indirect
107+
golang.org/x/vuln v1.1.4 // indirect
91108
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
92109
google.golang.org/api v0.169.0 // indirect
93110
google.golang.org/appengine v1.6.8 // indirect
@@ -99,3 +116,8 @@ require (
99116
gopkg.in/ini.v1 v1.67.0 // indirect
100117
gopkg.in/yaml.v3 v3.0.1 // indirect
101118
)
119+
120+
tool (
121+
github.com/mgechev/revive
122+
golang.org/x/vuln/cmd/govulncheck
123+
)

0 commit comments

Comments
 (0)