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

Update go version, go packages, deco version, and fix tests #35

Merged
merged 4 commits into from
Oct 7, 2023
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
11 changes: 0 additions & 11 deletions .github/workflows/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
go-version:
- "1.18.x"
- "1.21.x"
os:
- "ubuntu-latest"

Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM golang:alpine AS build-env
FROM golang:alpine3.18 AS build-env

ARG version="0.0.0"
ARG prerelease=""
Expand Down Expand Up @@ -29,11 +29,11 @@ RUN chmod 555 /app/api
RUN apk add --no-cache bash ca-certificates

# Install Deco
ARG DECO_VERSION=0.5.0
ARG DECO_VERSION=1.4.1
ARG DECO_OS=linux
ARG DECO_ARCH=amd64
ADD https://github.com/YaleUniversity/deco/releases/download/v${DECO_VERSION}/deco-v${DECO_VERSION}-${DECO_OS}-${DECO_ARCH} /usr/local/bin/deco
RUN chmod 555 /usr/local/bin/deco && deco version
ADD https://github.com/YaleUniversity/deco/releases/download/v${DECO_VERSION}/deco_${DECO_VERSION}_${DECO_OS}_${DECO_ARCH}.tar.gz /usr/local/bin/deco.tar.gz
RUN cd /usr/local/bin && tar -zxvf deco.tar.gz && rm -f deco.tar.gz && chmod 555 deco && /usr/local/bin/deco version

COPY docker/*_config.sh /app
COPY docker/config.deco.json /app/config/config.json
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM golang:alpine AS build-env
FROM golang:alpine3.18 AS build-env
RUN apk add --no-cache git openssh-client gcc musl-dev
RUN mkdir /app
WORKDIR /app
Expand Down
37 changes: 17 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
module github.com/YaleSpinup/cost-api

go 1.18
go 1.21

require (
github.com/YaleSpinup/apierror v0.1.0
github.com/YaleSpinup/aws-go v0.2.0
github.com/aws/aws-sdk-go v1.44.98
github.com/google/uuid v1.3.0
github.com/YaleSpinup/apierror v0.1.1
github.com/YaleSpinup/aws-go v0.2.1
github.com/aws/aws-sdk-go v1.45.24
github.com/fossoreslp/go-uuid-v4 v1.0.0
github.com/google/uuid v1.3.1
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.13.0
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.9.0
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
github.com/prometheus/client_golang v1.17.0
github.com/sirupsen/logrus v1.9.3
golang.org/x/crypto v0.14.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
golang.org/x/sys v0.0.0-20220913175220-63ea55921009 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
golang.org/x/sys v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Loading
Loading