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

change golang.org/x/net from 0.7.0 to 0.17.0 #63

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
edfab64
Add Rel release action
meggers Apr 29, 2022
39c4e74
Create relativity-ci.yml
meggers May 1, 2022
08d95fe
Merge branch 'main' into add-release-action
meggers May 1, 2022
1c7981d
Add Relativity CI
meggers May 1, 2022
6563743
Setup CI values
meggers May 1, 2022
9f64eef
Pull docker registry secret
meggers May 1, 2022
24541d7
Update go, remove vendor
meggers May 1, 2022
ef4965f
Merge pull request #1 from relativityone/add-release-action
meggers May 3, 2022
a7abc58
Merge pull request #2 from relativityone/update-go
meggers May 3, 2022
2638715
Use docker metadata action, trigger on tag
meggers May 3, 2022
3c4c534
Get image version correctly, add back build and test for zip step
meggers May 3, 2022
ae1b642
Merge pull request #3 from relativityone/cleanup-ci
meggers May 3, 2022
649de6b
Merge branch 'redboxllc:master' into main
meggers Aug 19, 2022
4f3144f
Create dependabot.yml
meggers Aug 19, 2022
054db28
fix: update go to 1.17.13 to resolve vulnerabilities
meggers Aug 19, 2022
f2ddc4a
Merge pull request #6 from relativityone/update-go-1.17.13
meggers Aug 19, 2022
dd77f63
chore: update go to latest 1.19.1 to resolve vulnerabilities
meggers Sep 14, 2022
7ca22e5
Merge pull request #8 from relativityone/update-go-1.19.1
meggers Sep 15, 2022
602a40e
chore: bump golang to 1.19.2 to resolve vulnerabilities
meggers Oct 27, 2022
da99535
Merge pull request #10 from relativityone/bump-golang
meggers Oct 28, 2022
65241c4
Bumped just net/http to resolve vuln
gregott-rel Feb 20, 2023
53c5ccb
Go mod tidied
gregott-rel Feb 20, 2023
559e605
Merge pull request #17 from relativityone/REL-823843-netbump
gregott-rel Feb 21, 2023
21c2a64
REL-828579 Upgrade Golang to 1.19.7
jyang-cac Mar 14, 2023
cdf5109
Merge pull request #19 from relativityone/REL-828579_Upgrade_Golang_t…
jyang-cac Mar 14, 2023
4e5e596
Bump golang from 1.19.7-buster to 1.20.3-buster
dependabot[bot] Apr 10, 2023
1b6cdc7
chore: update go in go.mod
bexway-relativity Apr 14, 2023
23f3325
Merge pull request #22 from relativityone/bex-test-go
bexway-relativity Apr 14, 2023
f6d8a2d
fix():updated gloang/x/net version from 0.7.0 to 0.17.0
Nov 16, 2023
00c122f
fix():update golang dependency for golang.org/x/net and golang.org/x/…
Nov 16, 2023
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
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "docker" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
- package-ecosystem: "gomod" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
80 changes: 80 additions & 0 deletions .github/workflows/relativity-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: CI

on:
push:
branches: [ main ]
tags:
- 'v*'
pull_request:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build-and-release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Azure Login
uses: Azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- name: Get Secrets
uses: Azure/get-keyvault-secrets@v1
with:
keyvault: "ai-services-dev"
secrets: "acrUsername, acrPassword"
id: kv

- name: Docker meta
id: meta
uses: docker/metadata-action@v3
with:
images: ${{ secrets.DOCKER_REPOSITORY }}

# Build and test binary
- name: Build and Test Binary
env:
CGO_ENABLED: 0
run: |
go mod download
go test -test.timeout 30s
GOOS=linux GOARCH=amd64 go build -o build/linux/amd64/scuttle -ldflags="-X 'main.Version=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}'"

- name: Login to Docker
uses: docker/login-action@v1
with:
registry: ${{ secrets.DOCKER_REGISTRY }}
username: ${{ steps.kv.outputs.acrUsername }}
password: ${{ steps.kv.outputs.acrPassword }}

# Build Docker image
# On tag, push Docker image
- name: Build Docker Image
uses: docker/build-push-action@v2
with:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
push: ${{ startsWith(github.ref, 'refs/tags/') }}
build-args: |
VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}

# On tag, Pack zip of scuttle for GitHub Release
- name: Pack
run: |
mkdir build/artifacts
zip -r -j build/artifacts/scuttle-linux-amd64.zip build/linux/amd64/
if: startsWith(github.ref, 'refs/tags/')

# On tag, Create GitHub Release
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: build/artifacts/*.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17.9-buster AS build
FROM golang:1.20.3-buster AS build
ARG VERSION="local"
COPY . /app
WORKDIR /app
Expand Down
12 changes: 9 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
module github.com/redboxllc/scuttle

go 1.14
go 1.20

require (
github.com/cenk/backoff v2.1.1+incompatible
github.com/monzo/typhon v0.0.0-20190413083455-45c89a830a76
)

require (
github.com/deckarep/golang-set v1.7.1 // indirect
github.com/fortytw2/leaktest v1.3.0 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/monzo/slog v0.0.0-20200629180744-4e22e890d327 // indirect
github.com/monzo/terrors v0.0.0-20191030112059-325b9ec5dcdf // indirect
github.com/monzo/typhon v0.0.0-20190413083455-45c89a830a76
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/stretchr/testify v1.6.1 // indirect
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.23.0 // indirect
)
19 changes: 8 additions & 11 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
Expand All @@ -50,7 +48,6 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
Expand Down
22 changes: 0 additions & 22 deletions vendor/github.com/cenk/backoff/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions vendor/github.com/cenk/backoff/.travis.yml

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/github.com/cenk/backoff/LICENSE

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/github.com/cenk/backoff/README.md

This file was deleted.

66 changes: 0 additions & 66 deletions vendor/github.com/cenk/backoff/backoff.go

This file was deleted.

63 changes: 0 additions & 63 deletions vendor/github.com/cenk/backoff/context.go

This file was deleted.

Loading