Skip to content
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
8 changes: 2 additions & 6 deletions scripts/subtests/lint
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ set -o pipefail

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

set +e
golangci_lint_executable=$(which golangci-lint)
set -e
if [ -z "${golangci_lint_executable}" ] || [ ! -x "${golangci_lint_executable}" ]; then
if ! command -v golangci-lint &> /dev/null; then
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
fi

pushd "${SCRIPT_DIR}/../../src" > /dev/null
golangci-lint run ./...
popd > /dev/null

popd > /dev/null
5 changes: 1 addition & 4 deletions scripts/subtests/spec-test
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ set -o pipefail

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

set +e
bundler_executable=$(which bundle)
set -e
if [ -z "${bundler_executable}" ] || [ ! -x "${bundler_executable}" ]; then
if ! command -v bundle &> /dev/null; then
gem install bundler
fi

Expand Down
1 change: 0 additions & 1 deletion src/internal/cfauthproxy/cf_auth_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ func NewTransportWithRootCA(rootCACertPool *x509.CertPool) *http.Transport {
DialContext: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
}).DialContext,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
Expand Down
2 changes: 1 addition & 1 deletion src/internal/routing/routing_table.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (t *RoutingTable) Lookup(item string) []int {
node := t.hasher.Hash(hashValue)

var result []int
var replicationFactor = int(t.replicationFactor) //#nosec G115
var replicationFactor = int(t.replicationFactor)
for n := 0; n < replicationFactor; n++ {
result = append(result, (node+n*replicationFactor)%len(t.addresses))
}
Expand Down
2 changes: 1 addition & 1 deletion src/internal/syslog/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (s *Server) convertMessage(env *loggregator_v2.Envelope, msg *rfc5424.Syslo
env.Message = &loggregator_v2.Envelope_Log{
Log: &loggregator_v2.Log{
Payload: []byte(payload),
Type: s.typeFromPriority(int(*msg.Priority)), //#nosec G115
Type: s.typeFromPriority(int(*msg.Priority)),
},
}

Expand Down
Loading