Skip to content

Commit 5a60051

Browse files
finnagfinnag
committed
Merge branch 'main' into quickplan
2 parents f11b3fa + 1d91dfb commit 5a60051

38 files changed

+167
-60
lines changed

‎.github/workflows/atlantis-image.yml

+3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151

5252
- name: Set up Docker Buildx
5353
uses: docker/setup-buildx-action@v2
54+
with:
55+
driver-opts: |
56+
image=moby/buildkit:v0.11.2
5457
5558
# release version is the name of the tag i.e. v0.10.0
5659
# release version also has the image type appended i.e. v0.10.0-alpine

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG DEBIAN_TAG=11.7-slim
55

66
# Stage 1: build artifact and download deps
77

8-
FROM golang:1.20.4-alpine AS builder
8+
FROM golang:1.20.5-alpine AS builder
99

1010
ARG ATLANTIS_VERSION=dev
1111
ENV ATLANTIS_VERSION=${ATLANTIS_VERSION}

‎e2e/e2e.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"os/exec"
2121
"time"
2222

23-
"github.com/google/go-github/v52/github"
23+
"github.com/google/go-github/v53/github"
2424
)
2525

2626
type E2ETester struct {

‎e2e/github.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package main
1616
import (
1717
"context"
1818

19-
"github.com/google/go-github/v52/github"
19+
"github.com/google/go-github/v53/github"
2020
)
2121

2222
type GithubClient struct {

‎e2e/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/runatlantis/atlantis/e2e
33
go 1.20
44

55
require (
6-
github.com/google/go-github/v52 v52.0.0
6+
github.com/google/go-github/v53 v53.0.0
77
github.com/hashicorp/go-multierror v1.1.1
88
)
99

@@ -14,9 +14,9 @@ require (
1414
github.com/google/go-querystring v1.1.0 // indirect
1515
github.com/hashicorp/errwrap v1.1.0 // indirect
1616
golang.org/x/crypto v0.7.0 // indirect
17-
golang.org/x/net v0.9.0 // indirect
18-
golang.org/x/oauth2 v0.7.0 // indirect
19-
golang.org/x/sys v0.7.0 // indirect
17+
golang.org/x/net v0.10.0 // indirect
18+
golang.org/x/oauth2 v0.8.0 // indirect
19+
golang.org/x/sys v0.8.0 // indirect
2020
google.golang.org/appengine v1.6.7 // indirect
2121
google.golang.org/protobuf v1.28.0 // indirect
2222
)

‎e2e/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
1111
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1212
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1313
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
14-
github.com/google/go-github/v52 v52.0.0 h1:uyGWOY+jMQ8GVGSX8dkSwCzlehU3WfdxQ7GweO/JP7M=
15-
github.com/google/go-github/v52 v52.0.0/go.mod h1:WJV6VEEUPuMo5pXqqa2ZCZEdbQqua4zAk2MZTIo+m+4=
14+
github.com/google/go-github/v53 v53.0.0 h1:T1RyHbSnpHYnoF0ZYKiIPSgPtuJ8G6vgc0MKodXsQDQ=
15+
github.com/google/go-github/v53 v53.0.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
1616
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
1717
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
1818
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -26,16 +26,16 @@ golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
2626
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
2727
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
2828
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
29-
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
30-
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
31-
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
32-
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
29+
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
30+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
31+
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
32+
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
3333
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3434
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3535
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3636
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37-
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
38-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37+
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
38+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3939
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
4040
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4141
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

‎e2e/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"fmt"
2323

24-
"github.com/google/go-github/v52/github"
24+
"github.com/google/go-github/v53/github"
2525
multierror "github.com/hashicorp/go-multierror"
2626
)
2727

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ require (
1313
github.com/go-test/deep v1.1.0
1414
github.com/golang-jwt/jwt/v5 v5.0.0
1515
github.com/google/go-github/v52 v52.0.0
16+
github.com/google/go-github/v53 v53.0.0
1617
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1718
github.com/google/uuid v1.3.0
1819
github.com/gorilla/mux v1.8.0
@@ -126,7 +127,7 @@ require (
126127
go.uber.org/multierr v1.9.0 // indirect
127128
golang.org/x/crypto v0.9.0 // indirect
128129
golang.org/x/net v0.10.0 // indirect
129-
golang.org/x/oauth2 v0.7.0 // indirect
130+
golang.org/x/oauth2 v0.8.0 // indirect
130131
golang.org/x/sys v0.8.0 // indirect
131132
golang.org/x/time v0.3.0 // indirect
132133
google.golang.org/appengine v1.6.7 // indirect

‎go.sum

+4-1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
199199
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
200200
github.com/google/go-github/v52 v52.0.0 h1:uyGWOY+jMQ8GVGSX8dkSwCzlehU3WfdxQ7GweO/JP7M=
201201
github.com/google/go-github/v52 v52.0.0/go.mod h1:WJV6VEEUPuMo5pXqqa2ZCZEdbQqua4zAk2MZTIo+m+4=
202+
github.com/google/go-github/v53 v53.0.0 h1:T1RyHbSnpHYnoF0ZYKiIPSgPtuJ8G6vgc0MKodXsQDQ=
203+
github.com/google/go-github/v53 v53.0.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
202204
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
203205
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
204206
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -594,8 +596,9 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
594596
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
595597
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
596598
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
597-
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
598599
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
600+
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
601+
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
599602
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
600603
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
601604
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎server/controllers/events/events_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"net/http"
2020
"strings"
2121

22-
"github.com/google/go-github/v52/github"
22+
"github.com/google/go-github/v53/github"
2323
"github.com/mcdafydd/go-azuredevops/azuredevops"
2424
"github.com/microcosm-cc/bluemonday"
2525
"github.com/pkg/errors"

‎server/controllers/events/events_controller_e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414
"testing"
1515

16-
"github.com/google/go-github/v52/github"
16+
"github.com/google/go-github/v53/github"
1717
"github.com/hashicorp/go-version"
1818
. "github.com/petergtz/pegomock"
1919

‎server/controllers/events/github_request_validator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"io"
2020
"net/http"
2121

22-
"github.com/google/go-github/v52/github"
22+
"github.com/google/go-github/v53/github"
2323
)
2424

2525
//go:generate pegomock generate -m --package mocks -o mocks/mock_github_request_validator.go GithubRequestValidator

‎server/events/apply_command_runner_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"testing"
66

7-
"github.com/google/go-github/v52/github"
7+
"github.com/google/go-github/v53/github"
88
. "github.com/petergtz/pegomock"
99
"github.com/runatlantis/atlantis/server/core/db"
1010
"github.com/runatlantis/atlantis/server/core/locking"
@@ -437,12 +437,12 @@ func TestApplyCommandRunner_ExecutionOrder(t *testing.T) {
437437
Description: "Don't block when abortOnExcecutionOrderFail is not set",
438438
ProjectContexts: []command.ProjectContext{
439439
{
440-
ExecutionOrderGroup: 0,
441-
ProjectName: "First",
440+
ExecutionOrderGroup: 0,
441+
ProjectName: "First",
442442
},
443443
{
444-
ExecutionOrderGroup: 1,
445-
ProjectName: "Second",
444+
ExecutionOrderGroup: 1,
445+
ProjectName: "Second",
446446
},
447447
},
448448
ProjectResults: []command.ProjectResult{

‎server/events/command_runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"fmt"
1818
"strconv"
1919

20-
"github.com/google/go-github/v52/github"
20+
"github.com/google/go-github/v53/github"
2121
"github.com/mcdafydd/go-azuredevops/azuredevops"
2222
"github.com/pkg/errors"
2323
"github.com/runatlantis/atlantis/server/core/config/valid"

‎server/events/command_runner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/runatlantis/atlantis/server/logging"
2929
"github.com/runatlantis/atlantis/server/metrics"
3030

31-
"github.com/google/go-github/v52/github"
31+
"github.com/google/go-github/v53/github"
3232
. "github.com/petergtz/pegomock"
3333
lockingmocks "github.com/runatlantis/atlantis/server/core/locking/mocks"
3434
"github.com/runatlantis/atlantis/server/events"

‎server/events/event_parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/go-playground/validator/v10"
24-
"github.com/google/go-github/v52/github"
24+
"github.com/google/go-github/v53/github"
2525
"github.com/mcdafydd/go-azuredevops/azuredevops"
2626
"github.com/pkg/errors"
2727
"github.com/runatlantis/atlantis/server/events/command"

‎server/events/event_parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"github.com/google/go-github/v52/github"
24+
"github.com/google/go-github/v53/github"
2525
"github.com/mcdafydd/go-azuredevops/azuredevops"
2626
"github.com/mohae/deepcopy"
2727
"github.com/runatlantis/atlantis/server/events"

‎server/events/mock_workingdir_test.go

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/matchers/ptr_to_github_issuecommentevent.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/matchers/ptr_to_github_pullrequest.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/matchers/ptr_to_github_pullrequestevent.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/matchers/ptr_to_github_repository.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/mock_comment_building.go

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/mock_event_parsing.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/mock_github_pull_getter.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/events/mocks/mock_working_dir.go

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)