Skip to content

Commit

Permalink
Update deps (#39)
Browse files Browse the repository at this point in the history
* go get -u ./...

* fix changes after dep update

* update go version

* update golangci-lint

* fix deprecated github outputs

* update armappcontainers to v2.0.0-beta.3

* Update test that broke with v1.1.0 of armappcontainers

armappcontainers.ContainerApp has it's own implementation of
UnmarshalJSON() which ignores invalid properties.

* add dependabot config

* update terraform
  • Loading branch information
simongottschlag authored Jul 9, 2023
1 parent 363cbd2 commit 828e0d7
Show file tree
Hide file tree
Showing 24 changed files with 317 additions and 265 deletions.
17 changes: 17 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 2
updates:
- package-ecosystem: docker
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: gomod
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
17 changes: 9 additions & 8 deletions .github/workflows/pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: golangci-lint
uses: golangci/golangci-lint-action@v3.2.0
with:
version: v1.51.2
version: v1.53.3

fmt:
runs-on: ubuntu-latest
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: Run fmt
run: |
make fmt
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: Run build
run: |
make build
Expand All @@ -60,7 +60,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: Run test
run: |
make test
Expand All @@ -73,7 +73,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: coverage
run: |
make cover
Expand All @@ -90,12 +90,13 @@ jobs:
- name: Prepare
id: prep
run: |
BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
VERSION=sha-${GITHUB_SHA::8}
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF/refs\/tags\//}
fi
echo ::set-output name=BUILD_DATE::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=VERSION::${VERSION}
echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
- uses: brpaz/hadolint-action@v1.5.0
with:
dockerfile: Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-trigger-client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "^1.20.1"
go-version: "^1.20.5"
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3.0.0
env:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
- name: Prepare
id: prep
run: |
BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
VERSION=sha-${GITHUB_SHA::8}
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF/refs\/tags\//}
fi
echo ::set-output name=BUILD_DATE::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=VERSION::${VERSION}
echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
- name: Get GitHub Tag
id: get_tag
run: |
echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Cache container layers
uses: actions/cache@v2.1.4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# BUILDER
FROM golang:1.20.1-bullseye as builder
FROM golang:1.20.5-bullseye as builder
WORKDIR /workspace

COPY go.mod go.mod
Expand Down
80 changes: 41 additions & 39 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,59 @@ module github.com/xenitab/azcagit
go 1.20

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.1
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.11.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.4.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appcontainers/armappcontainers/v2 v2.0.0-beta.3
github.com/alexflint/go-arg v1.4.3
github.com/dapr/go-sdk v1.7.0
github.com/fluxcd/pkg/git v0.10.0
github.com/fluxcd/pkg/git/gogit v0.7.1
github.com/fluxcd/pkg/gittestserver v0.8.1
github.com/go-logr/logr v1.2.3
github.com/go-logr/zapr v1.2.3
github.com/dapr/go-sdk v1.8.0
github.com/fluxcd/pkg/git v0.12.3
github.com/fluxcd/pkg/git/gogit v0.12.1
github.com/fluxcd/pkg/gittestserver v0.8.4
github.com/go-logr/logr v1.2.4
github.com/go-logr/zapr v1.2.4
github.com/google/go-github/v41 v41.0.0
github.com/hashicorp/go-multierror v1.1.1
github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.3
github.com/whilp/git-urls v1.0.0
go.uber.org/zap v1.24.0
golang.org/x/oauth2 v0.5.0
golang.org/x/sync v0.1.0
golang.org/x/oauth2 v0.10.0
golang.org/x/sync v0.3.0
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/Azure/go-amqp v1.0.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/alexflint/go-scalar v1.2.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cloudflare/circl v1.3.2 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fluxcd/gitkit v0.6.0 // indirect
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 // indirect
github.com/fluxcd/pkg/ssh v0.7.1 // indirect
github.com/fluxcd/pkg/version v0.2.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/fluxcd/pkg/ssh v0.8.0 // indirect
github.com/fluxcd/pkg/version v0.2.2 // indirect
github.com/go-chi/chi/v5 v5.0.8 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/go-git/go-git/v5 v5.7.0 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.15.14 // indirect
Expand All @@ -62,21 +64,21 @@ require (
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/skeema/knownhosts v1.1.1 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/tools v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/grpc v1.56.2 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 828e0d7

Please sign in to comment.