Skip to content

Commit

Permalink
[Security] Bump dependencies (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
liranbg authored Sep 1, 2024
1 parent 7daa8fd commit 47320c6
Show file tree
Hide file tree
Showing 8 changed files with 204 additions and 623 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,33 @@ name: CI
on:
pull_request:
branches:
- development
- '[0-9]+.[0-9]+.x'
- development
- "[0-9]+.[0-9]+.x"

push:
branches:
- development
- master
- development
- master

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-go@v3
with:
cache: true
go-version-file: "go.mod"
- uses: actions/setup-go@v5
with:
go-version-file: "go.mod"

- name: Run lint
run: make lint
- name: Run lint
run: make lint

build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run build
run: make build
- name: Run build
run: make build
3 changes: 1 addition & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ env:
jobs:
release:
name: Release Docker Images
runs-on: [ self-hosted, Linux ]
runs-on: [self-hosted, Linux]
steps:

- name: Set unstable
if: github.event_name == 'push'
run: |
Expand Down
16 changes: 9 additions & 7 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
linters:
disable-all: true
enable:
- deadcode
- goconst
- gofmt
- revive
Expand All @@ -10,27 +9,32 @@ linters:
- misspell
- staticcheck
- unconvert
- varcheck
- vet
- vetshadow
- errcheck
- govet
- structcheck
- typecheck
- gocritic
- unused

run:

# timeout for analysis
timeout: 5m

skip-dirs:
- hack

linters-settings:
gci:
sections:
- standard
- prefix(github.com/v3io/locator)
- default
- blank
- dot

revive:
rules:

# avoid errorf: should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) messages
- name: errorf
disabled: true
Expand All @@ -40,14 +44,12 @@ linters-settings:
- commentFormatting # we dont want to enforce space before the comment text

issues:

# List of regexps of issue texts to exclude
exclude:
- "comment on"
- "error should be the last"

exclude-rules:

# list of excluded linters applied on test files
- path: _test\.go
linters:
Expand Down
9 changes: 3 additions & 6 deletions cmd/locator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM gcr.io/iguazio/golang:1.19 as builder
FROM gcr.io/iguazio/golang:1.21 AS builder

# copy source tree
WORKDIR /app
Expand All @@ -33,12 +33,9 @@ RUN GOOS=linux \
# Output stage: Copies binary to an alpine based image
#

FROM debian:stretch-slim
FROM gcr.io/iguazio/alpine:3.20

RUN apt-get update && \
apt-get install -y --no-install-recommends ca-certificates && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
RUN apk -U upgrade && apk --no-cache add ca-certificates

# copy app binary from build stage
COPY --from=builder /app/locatorctl /usr/local/bin
Expand Down
91 changes: 49 additions & 42 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,64 +1,71 @@
module github.com/v3io/locator

go 1.19
go 1.21

require (
github.com/gin-gonic/gin v1.8.2
github.com/prometheus/client_golang v1.14.0
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
github.com/gin-gonic/gin v1.10.0
github.com/prometheus/client_golang v1.20.2
k8s.io/apimachinery v0.29.8
k8s.io/client-go v0.29.8
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/bytedance/sonic v1.11.6 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/goccy/go-json v0.9.11 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.20.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.26.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
k8s.io/api v0.29.8 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 47320c6

Please sign in to comment.