Skip to content

Commit

Permalink
chore(deps): update go-core (#64)
Browse files Browse the repository at this point in the history
* run on public runners
  • Loading branch information
portellaa authored Mar 29, 2023
1 parent 6d8f288 commit fd616cd
Show file tree
Hide file tree
Showing 11 changed files with 136 additions and 140 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/merge-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ on:
jobs:
prepare:
name: Calculate Version and build number
runs-on:
- self-hosted
- small
runs-on: ubuntu-22.04

outputs:
build_number: ${{ steps.short_sha.outputs.value }}
Expand Down Expand Up @@ -43,9 +41,7 @@ jobs:
if: needs.prepare.outputs.new_release == 'true'

name: Build
runs-on:
- self-hosted
- medium
runs-on: ubuntu-22.04

needs: prepare

Expand Down Expand Up @@ -75,9 +71,7 @@ jobs:
if: needs.prepare.outputs.new_release == 'true'

name: Dev and Draft Releases
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04

needs:
- prepare
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/prereleased.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ permissions:
jobs:
cancel_previous:
name: 'Cancel Previous Runs'
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04
timeout-minutes: 3

steps:
Expand All @@ -49,9 +47,7 @@ jobs:

prepare:
name: Prepare
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04

needs:
- cancel_previous
Expand All @@ -67,9 +63,7 @@ jobs:

build:
name: Build
runs-on:
- self-hosted
- large
runs-on: ubuntu-22.04

needs:
- prepare
Expand Down Expand Up @@ -150,9 +144,7 @@ jobs:
update-manifests:
name: Update Manifests
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04

needs:
- prepare
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ permissions:
jobs:
validate:
name: Validate
runs-on:
- self-hosted
- medium
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -63,9 +61,7 @@ jobs:

static-analysis:
name: Static Analysis
runs-on:
- self-hosted
- large
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/released.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ permissions:
jobs:
cancel_previous:
name: 'Cancel Previous Runs'
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04
timeout-minutes: 3

steps:
Expand Down Expand Up @@ -70,9 +68,7 @@ jobs:

docker:
name: Docker Tag and Push
runs-on:
- self-hosted
- medium
runs-on: ubuntu-22.04

needs:
- prepare
Expand Down Expand Up @@ -101,9 +97,7 @@ jobs:
update-manifests:
name: Update Manifests
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04

needs:
- prepare
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/sonarqube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ on:
jobs:
sonarqube:
name: SonarQube
runs-on:
- self-hosted
- micro
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
19 changes: 7 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
ARG GOLANG_VERSION=1.18
ARG GOLANG_VERSION=1.20
FROM golang:${GOLANG_VERSION} as builder

WORKDIR /aws-quota-provider

ENV GO111MODULE=on
ENV CGO_ENABLED=0
ENV GOOS=linux
ENV GOARCH=amd64
WORKDIR /workspace

COPY . .

RUN cd /aws-quota-provider && go mod download
RUN go mod download

# Build
RUN go build -a -o quota ./cmd/quota
RUN CGO_ENABLED=0 go build -a -o main ./cmd/quota

# Use distroless as minimal base image to package the manager binary
FROM gcr.io/distroless/base:latest-amd64
WORKDIR /

LABEL org.opencontainers.image.source https://github.com/ydataai/aws-quota-provider
LABEL org.opencontainers.image.source https://github.com/ydataai/aws-adapter

COPY --from=builder /aws-quota-provider/quota .
COPY --from=builder /workspace/main .

ENTRYPOINT ["/quota"]
ENTRYPOINT ["/main"]
3 changes: 2 additions & 1 deletion cmd/quota/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ func main() {
serverCtx := context.Background()

httpServer := server.NewServer(logger, serverConfiguration)
httpServer.AddHealthz()
httpServer.AddReadyz(nil)
restController.Boot(httpServer)

httpServer.Run(serverCtx)

for err := range errChan {
Expand Down
44 changes: 26 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
module github.com/ydataai/aws-adapter

go 1.18
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.213
github.com/gin-gonic/gin v1.7.7
github.com/gin-gonic/gin v1.9.0
github.com/golang/mock v1.5.0
github.com/google/go-cmp v0.5.9
github.com/kelseyhightower/envconfig v1.4.0
github.com/ydataai/go-core v0.9.3
github.com/ydataai/go-core v0.13.0-1bdef48
)

require (
github.com/bytedance/sonic v1.8.6 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.13.0 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.12.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/leodido/go-urn v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/leodido/go-urn v1.2.2 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/ugorji/go/codec v1.1.7 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/sys v0.1.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit fd616cd

Please sign in to comment.