Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

7709 task: [GOLIUM][SEC] Github security dependabot vulns #124

Merged
merged 6 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@ name: Golium CI pipeline

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:

build:
name: Build and Test (Golium Go ${{ matrix.go-version }})

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
go-version: ["1.19", "1.20"]
go-version: ["1.21", "1.22"]

env:
AWS_ACCESS_KEY_ID: minioadmin
Expand Down Expand Up @@ -43,9 +42,9 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5

elasticsearch:
image: elasticsearch:7.12.0
image: elasticsearch:7.16.1
ports:
- 9200:9200
options: >-
Expand All @@ -65,22 +64,22 @@ jobs:
volumes:
- ${{ github.workspace }}/../data:/data
options: --name=minio --health-cmd "curl http://localhost:9000/minio/health/live"

httpbin:
image: kennethreitz/httpbin
ports:
- 80:80

steps:
- uses: actions/[email protected]
- uses: actions/[email protected]

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

- name: Build
run: go build -v ./...
- name: Build
run: go build -v ./...

- name: Test
run: go test -v ./...
- name: Test
run: go test -v ./...
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.22
- name: Test
run: go test -v -coverprofile=coverage.txt -covermode=atomic `go list ./... | grep -v test/acceptance` -json > test-report.out
- name: Coverage to Codecov
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine3.17
FROM golang:1.22-alpine3.20
RUN apk add build-base

WORKDIR /github.com/TelefonicaTC2Tech/golium
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ services:
rabbit:
image: rabbitmq:3.8.3-alpine
elasticsearch:
image: elasticsearch:7.12.0
image: elasticsearch:7.16.1
environment:
- discovery.type=single-node
- discovery.type=single-node
minio:
image: minio/minio
environment:
Expand Down
41 changes: 21 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module github.com/TelefonicaTC2Tech/golium

go 1.20
go 1.22.6

toolchain go1.22.7

require (
bou.ke/monkey v1.0.2
github.com/AdguardTeam/dnsproxy v0.48.0
github.com/AdguardTeam/dnsproxy v0.73.1
github.com/aws/aws-sdk-go-v2 v1.16.6
github.com/aws/aws-sdk-go-v2/config v1.15.12
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.17
Expand All @@ -16,25 +18,25 @@ require (
github.com/google/uuid v1.2.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/lestrrat-go/jwx v1.1.4
github.com/miekg/dns v1.1.50
github.com/miekg/dns v1.1.58
github.com/pkg/errors v0.9.1
github.com/redis/go-redis/v9 v9.0.4
github.com/sirupsen/logrus v1.8.0
github.com/spf13/pflag v1.0.5
github.com/streadway/amqp v1.0.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.9.0
github.com/tidwall/gjson v1.13.0
github.com/tidwall/sjson v1.2.4
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/exp v0.0.0-20230306221820-f0f767cdffd6
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/AdguardTeam/golibs v0.13.0 // indirect
github.com/AdguardTeam/golibs v0.26.0 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnscrypt/v2 v2.2.6 // indirect
github.com/ameshkov/dnscrypt/v2 v2.2.7 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.7 // indirect
Expand All @@ -54,11 +56,10 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/goccy/go-json v0.4.7 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-memdb v1.3.4 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
Expand All @@ -69,20 +70,20 @@ require (
github.com/lestrrat-go/option v1.0.0 // indirect
github.com/lestrrat-go/pdebug/v3 v3.0.1 // indirect
github.com/magefile/mage v1.10.0 // indirect
github.com/onsi/ginkgo/v2 v2.7.0 // indirect
github.com/onsi/ginkgo/v2 v2.15.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/quic-go/quic-go v0.33.0 // indirect
github.com/quic-go/quic-go v0.44.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/tools v0.6.0 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/tools v0.24.0 // indirect
)
Loading
Loading