Skip to content

Commit

Permalink
Merge pull request #64 from trevorbonas/integ-dependency-update
Browse files Browse the repository at this point in the history
Update vulnerable dependencies
  • Loading branch information
sethusrinivasan authored May 9, 2024
2 parents 78ff839 + cfb3553 commit e851a4d
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 1,826 deletions.
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@

# Stage 1: Build the binary
FROM amazonlinux:latest AS build_stage
RUN yum install -y go
RUN yum update
RUN yum install gzip tar -y
ADD https://go.dev/dl/go1.22.3.linux-amd64.tar.gz .
RUN tar -xvf go1.22.3.linux-amd64.tar.gz
RUN mv go /usr/local
ENV PATH="${PATH}:/usr/local/go/bin"
ENV GOPATH="/go"
ENV GOBIN="/usr/local/go/bin"

# Set Docker image metadata
LABEL name="timestream/timestream-prometheus-connector" \
Expand Down
4 changes: 2 additions & 2 deletions correctness/correctness_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"encoding/csv"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"io/ioutil"
"io"
"os"
"path/filepath"
"testing"
Expand Down Expand Up @@ -120,7 +120,7 @@ func sendRequest(t *testing.T, queries []string) ([][]string, error) {
for retries <= 10 {
resp, err := httpClient.Do(req)
if err == nil {
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return output, err
}
Expand Down
46 changes: 36 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,32 +1,58 @@
module timestream-prometheus-connector

go 1.14
go 1.22.3

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/aws/aws-lambda-go v1.46.0
github.com/aws/aws-sdk-go v1.50.38
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/aws/aws-sdk-go v1.52.5
github.com/docker/docker v24.0.9+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.5.0 // indirect
github.com/go-kit/log v0.2.1
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4
github.com/google/go-cmp v0.6.0
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.5.0
github.com/prometheus/common v0.48.0
github.com/prometheus/prometheus v2.5.0+incompatible
github.com/stretchr/testify v1.8.4
golang.org/x/net v0.23.0
)

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.6.0 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.34.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
)
Loading

0 comments on commit e851a4d

Please sign in to comment.