Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Update all dependencies #87

Merged
merged 9 commits into from
Oct 20, 2023
Merged

Update all dependencies #87

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83a7086
Update all dependencies
renovate[bot] Oct 18, 2023
2028144
go mod tidy to fix deps errors
ensary Oct 18, 2023
ef8a277
use the same sdcli version in build and Makefile
ensary Oct 18, 2023
ba74e73
use the same golang version with sdcli
ensary Oct 18, 2023
947f806
removed depguard from linter config. We have Snyk for that. https://g…
ensary Oct 18, 2023
54a2ae1
fix test api descriptor files to be valid openapi :facepalm:
ensary Oct 19, 2023
8989c6e
boost golang version to latest. Roll kin-openapi back to known good v…
ensary Oct 19, 2023
ac32e9e
boost sdcli version to include fix for vcs version
ensary Oct 19, 2023
0d46b71
sync version with Makefile
ensary Oct 19, 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
6 changes: 0 additions & 6 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ linters-settings:
min-len: 3
# minimal occurrences count to trigger, 3 by default
min-occurrences: 3
depguard:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to disable this as Snyk provides much better dependency scanning AND depguard introduced breaking changes. golangci/golangci-lint-action#442 (comment) re: changes.

list-type: blacklist
include-go-root: false
packages:
- github.com/davecgh/go-spew/spew
misspell:
# Correct spellings using locale preferences for US or UK.
# Default is to use a neutral variety of English.
Expand Down Expand Up @@ -97,7 +92,6 @@ linters:
- gocyclo
- gofmt
- goimports
- depguard
- misspell
- unparam
- nakedret
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go
sudo: false
go:
- 1.17.x
- 1.21.x
services:
- docker
install:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM asecurityteam/sdcli:v1.2.3 AS BUILDER
FROM asecurityteam/sdcli:v1.5.0 AS BUILDER
RUN mkdir -p /go/src/github.com/asecurityteam/transportd
WORKDIR /go/src/github.com/asecurityteam/transportd
COPY --chown=sdcli:sdcli . .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TAG := $(shell git rev-parse --short HEAD)
DIR := $(shell pwd -L)
SDCLI_VERSION := v1.4.0
SDCLI_VERSION := v1.5.1
SDCLI=docker run --rm -v "$(DIR):$(DIR)" -w "$(DIR)" asecurityteam/sdcli:$(SDCLI_VERSION)


Expand Down
23 changes: 11 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
module github.com/asecurityteam/transportd

go 1.19
go 1.21

require (
bitbucket.org/atlassian/go-asap v0.0.0-20190921160616-bb88d6193af9
github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are they actually bumping the code w/o bumping the version??

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume so :(

github.com/asecurityteam/httpstats v0.0.0-20200806153718-d71ff7ed1047
github.com/asecurityteam/logevent v1.6.1
github.com/asecurityteam/runhttp v0.6.0
github.com/asecurityteam/settings v0.7.0
github.com/asecurityteam/runhttp v0.6.1
github.com/asecurityteam/settings v1.0.0
github.com/asecurityteam/transport v1.6.7
github.com/getkin/kin-openapi v0.69.0
github.com/golang/mock v1.6.0
github.com/stretchr/testify v1.8.2
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb
github.com/stretchr/testify v1.8.4
github.com/vincent-petithory/dataurl v1.0.0
)

require (
github.com/asecurityteam/component-connstate v0.2.0 // indirect
github.com/asecurityteam/component-expvar v0.2.0 // indirect
github.com/asecurityteam/component-log v0.2.1 // indirect
github.com/asecurityteam/component-shared v0.2.0 // indirect
github.com/asecurityteam/component-signals v0.2.0 // indirect
github.com/asecurityteam/component-stat v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-chi/chi v4.0.3+incompatible // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.19.5 // indirect
github.com/go-yaml/yaml v2.1.0+incompatible // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -45,4 +44,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
replace git.apache.org/thrift.git => github.com/apache/thrift v0.19.0
69 changes: 33 additions & 36 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions tests/specs/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ paths:
requestBody:
required: true
description: The event to publish.
application/octet-stream:
schema:
type: string
format: binary
content:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous file we used for integration tests had invalid OpenAPI syntax.
image

application/octet-stream:
schema:
type: string
format: binary
responses:
"204":
description: "Success"
Expand Down
9 changes: 5 additions & 4 deletions tests/specs/passthroughenabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,11 @@ paths:
requestBody:
required: true
description: The event to publish.
application/octet-stream:
schema:
type: string
format: binary
content:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue with OpenAPI syntax.

application/octet-stream:
schema:
type: string
format: binary
responses:
"204":
description: "Success"
Expand Down