From bdf19d0066ce49438125ca500e3c0e3bdf022abb Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Wed, 11 Oct 2023 12:02:25 -0600 Subject: [PATCH 01/16] migrate to go uber mock Signed-off-by: davidwin93 --- go.mod | 3 +- go.sum | 3 + pkg/gitlab_hooks/comment_actions_test.go | 2 +- pkg/mocks/helpers.go | 2 +- pkg/mocks/mock_runstream.go | 48 +++++++++++----- pkg/mocks/mock_tfc_api.go | 26 +++++---- pkg/mocks/mock_tfc_trigger.go | 16 ++++-- pkg/mocks/mock_vcs.go | 70 +++++++++++++++++------- pkg/tfc_trigger/tfc_trigger_test.go | 2 +- 9 files changed, 116 insertions(+), 56 deletions(-) diff --git a/go.mod b/go.mod index e5e375b..74ecccc 100644 --- a/go.mod +++ b/go.mod @@ -109,8 +109,9 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.37.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.uber.org/mock v0.3.0 // indirect golang.org/x/crypto v0.8.0 // indirect - golang.org/x/mod v0.8.0 // indirect + golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.7.0 // indirect diff --git a/go.sum b/go.sum index b99e850..8bf7bd5 100644 --- a/go.sum +++ b/go.sum @@ -415,6 +415,8 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= +go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -467,6 +469,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/pkg/gitlab_hooks/comment_actions_test.go b/pkg/gitlab_hooks/comment_actions_test.go index 9ae4cbc..6268837 100644 --- a/pkg/gitlab_hooks/comment_actions_test.go +++ b/pkg/gitlab_hooks/comment_actions_test.go @@ -9,13 +9,13 @@ import ( "github.com/zapier/tfbuddy/pkg/allow_list" "github.com/zapier/tfbuddy/pkg/comment_actions" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/zapier/tfbuddy/pkg/mocks" "github.com/zapier/tfbuddy/pkg/runstream" "github.com/zapier/tfbuddy/pkg/tfc_api" "github.com/zapier/tfbuddy/pkg/tfc_trigger" "github.com/zapier/tfbuddy/pkg/vcs" + "go.uber.org/mock/gomock" ) func Test_parseCommentCommand(t *testing.T) { diff --git a/pkg/mocks/helpers.go b/pkg/mocks/helpers.go index 6757cf8..418e7ad 100644 --- a/pkg/mocks/helpers.go +++ b/pkg/mocks/helpers.go @@ -11,11 +11,11 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/storage/memory" - gomock "github.com/golang/mock/gomock" tfe "github.com/hashicorp/go-tfe" "github.com/stretchr/testify/assert" tfc_trigger "github.com/zapier/tfbuddy/pkg/tfc_trigger" vcs "github.com/zapier/tfbuddy/pkg/vcs" + gomock "go.uber.org/mock/gomock" "gopkg.in/yaml.v2" ) diff --git a/pkg/mocks/mock_runstream.go b/pkg/mocks/mock_runstream.go index bba93a9..f2442e1 100644 --- a/pkg/mocks/mock_runstream.go +++ b/pkg/mocks/mock_runstream.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interfaces.go - +// +// Generated by this command: +// +// mockgen -source interfaces.go -destination=../mocks/mock_runstream.go -package=mocks github.com/zapier/tfbuddy/pkg/runstream +// // Package mocks is a generated GoMock package. package mocks @@ -9,8 +13,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" runstream "github.com/zapier/tfbuddy/pkg/runstream" + gomock "go.uber.org/mock/gomock" ) // MockStreamClient is a mock of StreamClient interface. @@ -45,7 +49,7 @@ func (m *MockStreamClient) AddRunMeta(rmd runstream.RunMetadata) error { } // AddRunMeta indicates an expected call of AddRunMeta. -func (mr *MockStreamClientMockRecorder) AddRunMeta(rmd interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) AddRunMeta(rmd any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRunMeta", reflect.TypeOf((*MockStreamClient)(nil).AddRunMeta), rmd) } @@ -60,7 +64,7 @@ func (m *MockStreamClient) GetRunMeta(runID string) (runstream.RunMetadata, erro } // GetRunMeta indicates an expected call of GetRunMeta. -func (mr *MockStreamClientMockRecorder) GetRunMeta(runID interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) GetRunMeta(runID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRunMeta", reflect.TypeOf((*MockStreamClient)(nil).GetRunMeta), runID) } @@ -88,7 +92,7 @@ func (m *MockStreamClient) NewTFRunPollingTask(meta runstream.RunMetadata, delay } // NewTFRunPollingTask indicates an expected call of NewTFRunPollingTask. -func (mr *MockStreamClientMockRecorder) NewTFRunPollingTask(meta, delay interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) NewTFRunPollingTask(meta, delay any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTFRunPollingTask", reflect.TypeOf((*MockStreamClient)(nil).NewTFRunPollingTask), meta, delay) } @@ -102,7 +106,7 @@ func (m *MockStreamClient) PublishTFRunEvent(ctx context.Context, re runstream.R } // PublishTFRunEvent indicates an expected call of PublishTFRunEvent. -func (mr *MockStreamClientMockRecorder) PublishTFRunEvent(ctx, re interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) PublishTFRunEvent(ctx, re any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PublishTFRunEvent", reflect.TypeOf((*MockStreamClient)(nil).PublishTFRunEvent), ctx, re) } @@ -117,7 +121,7 @@ func (m *MockStreamClient) SubscribeTFRunEvents(queue string, cb func(runstream. } // SubscribeTFRunEvents indicates an expected call of SubscribeTFRunEvents. -func (mr *MockStreamClientMockRecorder) SubscribeTFRunEvents(queue, cb interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) SubscribeTFRunEvents(queue, cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeTFRunEvents", reflect.TypeOf((*MockStreamClient)(nil).SubscribeTFRunEvents), queue, cb) } @@ -132,7 +136,7 @@ func (m *MockStreamClient) SubscribeTFRunPollingTasks(cb func(runstream.RunPolli } // SubscribeTFRunPollingTasks indicates an expected call of SubscribeTFRunPollingTasks. -func (mr *MockStreamClientMockRecorder) SubscribeTFRunPollingTasks(cb interface{}) *gomock.Call { +func (mr *MockStreamClientMockRecorder) SubscribeTFRunPollingTasks(cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeTFRunPollingTasks", reflect.TypeOf((*MockStreamClient)(nil).SubscribeTFRunPollingTasks), cb) } @@ -223,7 +227,7 @@ func (m *MockRunEvent) SetCarrier(arg0 map[string]string) { } // SetCarrier indicates an expected call of SetCarrier. -func (mr *MockRunEventMockRecorder) SetCarrier(arg0 interface{}) *gomock.Call { +func (mr *MockRunEventMockRecorder) SetCarrier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCarrier", reflect.TypeOf((*MockRunEvent)(nil).SetCarrier), arg0) } @@ -235,7 +239,7 @@ func (m *MockRunEvent) SetContext(arg0 context.Context) { } // SetContext indicates an expected call of SetContext. -func (mr *MockRunEventMockRecorder) SetContext(arg0 interface{}) *gomock.Call { +func (mr *MockRunEventMockRecorder) SetContext(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetContext", reflect.TypeOf((*MockRunEvent)(nil).SetContext), arg0) } @@ -247,7 +251,7 @@ func (m *MockRunEvent) SetMetadata(arg0 runstream.RunMetadata) { } // SetMetadata indicates an expected call of SetMetadata. -func (mr *MockRunEventMockRecorder) SetMetadata(arg0 interface{}) *gomock.Call { +func (mr *MockRunEventMockRecorder) SetMetadata(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMetadata", reflect.TypeOf((*MockRunEvent)(nil).SetMetadata), arg0) } @@ -289,6 +293,20 @@ func (mr *MockRunMetadataMockRecorder) GetAction() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAction", reflect.TypeOf((*MockRunMetadata)(nil).GetAction)) } +// GetAutoMerge mocks base method. +func (m *MockRunMetadata) GetAutoMerge() bool { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAutoMerge") + ret0, _ := ret[0].(bool) + return ret0 +} + +// GetAutoMerge indicates an expected call of GetAutoMerge. +func (mr *MockRunMetadataMockRecorder) GetAutoMerge() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAutoMerge", reflect.TypeOf((*MockRunMetadata)(nil).GetAutoMerge)) +} + // GetCommitSHA mocks base method. func (m *MockRunMetadata) GetCommitSHA() string { m.ctrl.T.Helper() @@ -517,7 +535,7 @@ func (m *MockRunPollingTask) Reschedule(ctx context.Context) error { } // Reschedule indicates an expected call of Reschedule. -func (mr *MockRunPollingTaskMockRecorder) Reschedule(ctx interface{}) *gomock.Call { +func (mr *MockRunPollingTaskMockRecorder) Reschedule(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reschedule", reflect.TypeOf((*MockRunPollingTask)(nil).Reschedule), ctx) } @@ -531,7 +549,7 @@ func (m *MockRunPollingTask) Schedule(ctx context.Context) error { } // Schedule indicates an expected call of Schedule. -func (mr *MockRunPollingTaskMockRecorder) Schedule(ctx interface{}) *gomock.Call { +func (mr *MockRunPollingTaskMockRecorder) Schedule(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Schedule", reflect.TypeOf((*MockRunPollingTask)(nil).Schedule), ctx) } @@ -543,7 +561,7 @@ func (m *MockRunPollingTask) SetCarrier(arg0 map[string]string) { } // SetCarrier indicates an expected call of SetCarrier. -func (mr *MockRunPollingTaskMockRecorder) SetCarrier(arg0 interface{}) *gomock.Call { +func (mr *MockRunPollingTaskMockRecorder) SetCarrier(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCarrier", reflect.TypeOf((*MockRunPollingTask)(nil).SetCarrier), arg0) } @@ -555,7 +573,7 @@ func (m *MockRunPollingTask) SetLastStatus(arg0 string) { } // SetLastStatus indicates an expected call of SetLastStatus. -func (mr *MockRunPollingTaskMockRecorder) SetLastStatus(arg0 interface{}) *gomock.Call { +func (mr *MockRunPollingTaskMockRecorder) SetLastStatus(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLastStatus", reflect.TypeOf((*MockRunPollingTask)(nil).SetLastStatus), arg0) } diff --git a/pkg/mocks/mock_tfc_api.go b/pkg/mocks/mock_tfc_api.go index 87f5791..a3f0bae 100644 --- a/pkg/mocks/mock_tfc_api.go +++ b/pkg/mocks/mock_tfc_api.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: api_client.go - +// +// Generated by this command: +// +// mockgen -source api_client.go -destination=../mocks/mock_tfc_api.go -package=mocks github.com/zapier/tfbuddy/pkg/tfc_api +// // Package mocks is a generated GoMock package. package mocks @@ -8,9 +12,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" tfe "github.com/hashicorp/go-tfe" tfc_api "github.com/zapier/tfbuddy/pkg/tfc_api" + gomock "go.uber.org/mock/gomock" ) // MockApiClient is a mock of ApiClient interface. @@ -45,7 +49,7 @@ func (m *MockApiClient) AddTags(ctx context.Context, workspace, prefix, value st } // AddTags indicates an expected call of AddTags. -func (mr *MockApiClientMockRecorder) AddTags(ctx, workspace, prefix, value interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) AddTags(ctx, workspace, prefix, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTags", reflect.TypeOf((*MockApiClient)(nil).AddTags), ctx, workspace, prefix, value) } @@ -60,7 +64,7 @@ func (m *MockApiClient) CreateRunFromSource(ctx context.Context, opts *tfc_api.A } // CreateRunFromSource indicates an expected call of CreateRunFromSource. -func (mr *MockApiClientMockRecorder) CreateRunFromSource(ctx, opts interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) CreateRunFromSource(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRunFromSource", reflect.TypeOf((*MockApiClient)(nil).CreateRunFromSource), ctx, opts) } @@ -75,7 +79,7 @@ func (m *MockApiClient) GetPlanOutput(id string) ([]byte, error) { } // GetPlanOutput indicates an expected call of GetPlanOutput. -func (mr *MockApiClientMockRecorder) GetPlanOutput(id interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) GetPlanOutput(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPlanOutput", reflect.TypeOf((*MockApiClient)(nil).GetPlanOutput), id) } @@ -90,7 +94,7 @@ func (m *MockApiClient) GetRun(ctx context.Context, id string) (*tfe.Run, error) } // GetRun indicates an expected call of GetRun. -func (mr *MockApiClientMockRecorder) GetRun(ctx, id interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) GetRun(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRun", reflect.TypeOf((*MockApiClient)(nil).GetRun), ctx, id) } @@ -105,7 +109,7 @@ func (m *MockApiClient) GetTagsByQuery(ctx context.Context, workspace, query str } // GetTagsByQuery indicates an expected call of GetTagsByQuery. -func (mr *MockApiClientMockRecorder) GetTagsByQuery(ctx, workspace, query interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) GetTagsByQuery(ctx, workspace, query any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTagsByQuery", reflect.TypeOf((*MockApiClient)(nil).GetTagsByQuery), ctx, workspace, query) } @@ -120,7 +124,7 @@ func (m *MockApiClient) GetWorkspaceById(ctx context.Context, id string) (*tfe.W } // GetWorkspaceById indicates an expected call of GetWorkspaceById. -func (mr *MockApiClientMockRecorder) GetWorkspaceById(ctx, id interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) GetWorkspaceById(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetWorkspaceById", reflect.TypeOf((*MockApiClient)(nil).GetWorkspaceById), ctx, id) } @@ -135,7 +139,7 @@ func (m *MockApiClient) GetWorkspaceByName(ctx context.Context, org, name string } // GetWorkspaceByName indicates an expected call of GetWorkspaceByName. -func (mr *MockApiClientMockRecorder) GetWorkspaceByName(ctx, org, name interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) GetWorkspaceByName(ctx, org, name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetWorkspaceByName", reflect.TypeOf((*MockApiClient)(nil).GetWorkspaceByName), ctx, org, name) } @@ -149,7 +153,7 @@ func (m *MockApiClient) LockUnlockWorkspace(ctx context.Context, workspace, reas } // LockUnlockWorkspace indicates an expected call of LockUnlockWorkspace. -func (mr *MockApiClientMockRecorder) LockUnlockWorkspace(ctx, workspace, reason, tag, lock interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) LockUnlockWorkspace(ctx, workspace, reason, tag, lock any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LockUnlockWorkspace", reflect.TypeOf((*MockApiClient)(nil).LockUnlockWorkspace), ctx, workspace, reason, tag, lock) } @@ -163,7 +167,7 @@ func (m *MockApiClient) RemoveTagsByQuery(ctx context.Context, workspace, query } // RemoveTagsByQuery indicates an expected call of RemoveTagsByQuery. -func (mr *MockApiClientMockRecorder) RemoveTagsByQuery(ctx, workspace, query interface{}) *gomock.Call { +func (mr *MockApiClientMockRecorder) RemoveTagsByQuery(ctx, workspace, query any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTagsByQuery", reflect.TypeOf((*MockApiClient)(nil).RemoveTagsByQuery), ctx, workspace, query) } diff --git a/pkg/mocks/mock_tfc_trigger.go b/pkg/mocks/mock_tfc_trigger.go index 83c3a8a..5204c93 100644 --- a/pkg/mocks/mock_tfc_trigger.go +++ b/pkg/mocks/mock_tfc_trigger.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interfaces.go - +// +// Generated by this command: +// +// mockgen -source interfaces.go -destination=../mocks/mock_tfc_trigger.go -package=mocks github.com/zapier/tfbuddy/pkg/tfc_trigger +// // Package mocks is a generated GoMock package. package mocks @@ -8,8 +12,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" tfc_trigger "github.com/zapier/tfbuddy/pkg/tfc_trigger" + gomock "go.uber.org/mock/gomock" ) // MockTrigger is a mock of Trigger interface. @@ -182,7 +186,7 @@ func (m *MockTrigger) SetMergeRequestDiscussionID(mrdisID string) { } // SetMergeRequestDiscussionID indicates an expected call of SetMergeRequestDiscussionID. -func (mr *MockTriggerMockRecorder) SetMergeRequestDiscussionID(mrdisID interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) SetMergeRequestDiscussionID(mrdisID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMergeRequestDiscussionID", reflect.TypeOf((*MockTrigger)(nil).SetMergeRequestDiscussionID), mrdisID) } @@ -194,7 +198,7 @@ func (m *MockTrigger) SetMergeRequestRootNoteID(id int64) { } // SetMergeRequestRootNoteID indicates an expected call of SetMergeRequestRootNoteID. -func (mr *MockTriggerMockRecorder) SetMergeRequestRootNoteID(id interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) SetMergeRequestRootNoteID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMergeRequestRootNoteID", reflect.TypeOf((*MockTrigger)(nil).SetMergeRequestRootNoteID), id) } @@ -208,7 +212,7 @@ func (m *MockTrigger) TriggerCleanupEvent(arg0 context.Context) error { } // TriggerCleanupEvent indicates an expected call of TriggerCleanupEvent. -func (mr *MockTriggerMockRecorder) TriggerCleanupEvent(arg0 interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) TriggerCleanupEvent(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TriggerCleanupEvent", reflect.TypeOf((*MockTrigger)(nil).TriggerCleanupEvent), arg0) } @@ -223,7 +227,7 @@ func (m *MockTrigger) TriggerTFCEvents(arg0 context.Context) (*tfc_trigger.Trigg } // TriggerTFCEvents indicates an expected call of TriggerTFCEvents. -func (mr *MockTriggerMockRecorder) TriggerTFCEvents(arg0 interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) TriggerTFCEvents(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TriggerTFCEvents", reflect.TypeOf((*MockTrigger)(nil).TriggerTFCEvents), arg0) } diff --git a/pkg/mocks/mock_vcs.go b/pkg/mocks/mock_vcs.go index f96810f..61d5db3 100644 --- a/pkg/mocks/mock_vcs.go +++ b/pkg/mocks/mock_vcs.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interfaces.go - +// +// Generated by this command: +// +// mockgen -source interfaces.go -destination=../mocks/mock_vcs.go -package=mocks github.com/zapier/tfbuddy/pkg/vcs +// // Package mocks is a generated GoMock package. package mocks @@ -8,8 +12,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vcs "github.com/zapier/tfbuddy/pkg/vcs" + gomock "go.uber.org/mock/gomock" ) // MockGitClient is a mock of GitClient interface. @@ -45,7 +49,7 @@ func (m *MockGitClient) AddMergeRequestDiscussionReply(ctx context.Context, mrII } // AddMergeRequestDiscussionReply indicates an expected call of AddMergeRequestDiscussionReply. -func (mr *MockGitClientMockRecorder) AddMergeRequestDiscussionReply(ctx, mrIID, project, discussionID, comment interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) AddMergeRequestDiscussionReply(ctx, mrIID, project, discussionID, comment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddMergeRequestDiscussionReply", reflect.TypeOf((*MockGitClient)(nil).AddMergeRequestDiscussionReply), ctx, mrIID, project, discussionID, comment) } @@ -59,11 +63,8 @@ func (m *MockGitClient) CloneMergeRequest(arg0 context.Context, arg1 string, arg return ret0, ret1 } -func (m *MockGitClient) GetOldRunUrls(ctx context.Context, mrIID int, project string, rootNoteID int) (string, error) { - return "", nil -} // CloneMergeRequest indicates an expected call of CloneMergeRequest. -func (mr *MockGitClientMockRecorder) CloneMergeRequest(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) CloneMergeRequest(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloneMergeRequest", reflect.TypeOf((*MockGitClient)(nil).CloneMergeRequest), arg0, arg1, arg2, arg3) } @@ -77,7 +78,7 @@ func (m *MockGitClient) CreateMergeRequestComment(ctx context.Context, id int, f } // CreateMergeRequestComment indicates an expected call of CreateMergeRequestComment. -func (mr *MockGitClientMockRecorder) CreateMergeRequestComment(ctx, id, fullPath, comment interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) CreateMergeRequestComment(ctx, id, fullPath, comment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateMergeRequestComment", reflect.TypeOf((*MockGitClient)(nil).CreateMergeRequestComment), ctx, id, fullPath, comment) } @@ -92,7 +93,7 @@ func (m *MockGitClient) CreateMergeRequestDiscussion(ctx context.Context, mrID i } // CreateMergeRequestDiscussion indicates an expected call of CreateMergeRequestDiscussion. -func (mr *MockGitClientMockRecorder) CreateMergeRequestDiscussion(ctx, mrID, fullPath, comment interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) CreateMergeRequestDiscussion(ctx, mrID, fullPath, comment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateMergeRequestDiscussion", reflect.TypeOf((*MockGitClient)(nil).CreateMergeRequestDiscussion), ctx, mrID, fullPath, comment) } @@ -107,7 +108,7 @@ func (m *MockGitClient) GetMergeRequest(arg0 context.Context, arg1 int, arg2 str } // GetMergeRequest indicates an expected call of GetMergeRequest. -func (mr *MockGitClientMockRecorder) GetMergeRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) GetMergeRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMergeRequest", reflect.TypeOf((*MockGitClient)(nil).GetMergeRequest), arg0, arg1, arg2) } @@ -122,7 +123,7 @@ func (m *MockGitClient) GetMergeRequestApprovals(ctx context.Context, id int, pr } // GetMergeRequestApprovals indicates an expected call of GetMergeRequestApprovals. -func (mr *MockGitClientMockRecorder) GetMergeRequestApprovals(ctx, id, project interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) GetMergeRequestApprovals(ctx, id, project any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMergeRequestApprovals", reflect.TypeOf((*MockGitClient)(nil).GetMergeRequestApprovals), ctx, id, project) } @@ -137,11 +138,26 @@ func (m *MockGitClient) GetMergeRequestModifiedFiles(ctx context.Context, mrIID } // GetMergeRequestModifiedFiles indicates an expected call of GetMergeRequestModifiedFiles. -func (mr *MockGitClientMockRecorder) GetMergeRequestModifiedFiles(ctx, mrIID, projectID interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) GetMergeRequestModifiedFiles(ctx, mrIID, projectID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMergeRequestModifiedFiles", reflect.TypeOf((*MockGitClient)(nil).GetMergeRequestModifiedFiles), ctx, mrIID, projectID) } +// GetOldRunUrls mocks base method. +func (m *MockGitClient) GetOldRunUrls(ctx context.Context, mrIID int, project string, rootCommentID int) (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetOldRunUrls", ctx, mrIID, project, rootCommentID) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetOldRunUrls indicates an expected call of GetOldRunUrls. +func (mr *MockGitClientMockRecorder) GetOldRunUrls(ctx, mrIID, project, rootCommentID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOldRunUrls", reflect.TypeOf((*MockGitClient)(nil).GetOldRunUrls), ctx, mrIID, project, rootCommentID) +} + // GetPipelinesForCommit mocks base method. func (m *MockGitClient) GetPipelinesForCommit(ctx context.Context, projectWithNS, commitSHA string) ([]vcs.ProjectPipeline, error) { m.ctrl.T.Helper() @@ -152,7 +168,7 @@ func (m *MockGitClient) GetPipelinesForCommit(ctx context.Context, projectWithNS } // GetPipelinesForCommit indicates an expected call of GetPipelinesForCommit. -func (mr *MockGitClientMockRecorder) GetPipelinesForCommit(ctx, projectWithNS, commitSHA interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) GetPipelinesForCommit(ctx, projectWithNS, commitSHA any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPipelinesForCommit", reflect.TypeOf((*MockGitClient)(nil).GetPipelinesForCommit), ctx, projectWithNS, commitSHA) } @@ -167,11 +183,25 @@ func (m *MockGitClient) GetRepoFile(arg0 context.Context, arg1, arg2, arg3 strin } // GetRepoFile indicates an expected call of GetRepoFile. -func (mr *MockGitClientMockRecorder) GetRepoFile(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) GetRepoFile(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRepoFile", reflect.TypeOf((*MockGitClient)(nil).GetRepoFile), arg0, arg1, arg2, arg3) } +// MergeMR mocks base method. +func (m *MockGitClient) MergeMR(ctx context.Context, mrIID int, project string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "MergeMR", ctx, mrIID, project) + ret0, _ := ret[0].(error) + return ret0 +} + +// MergeMR indicates an expected call of MergeMR. +func (mr *MockGitClientMockRecorder) MergeMR(ctx, mrIID, project any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MergeMR", reflect.TypeOf((*MockGitClient)(nil).MergeMR), ctx, mrIID, project) +} + // ResolveMergeRequestDiscussion mocks base method. func (m *MockGitClient) ResolveMergeRequestDiscussion(arg0 context.Context, arg1 string, arg2 int, arg3 string) error { m.ctrl.T.Helper() @@ -181,7 +211,7 @@ func (m *MockGitClient) ResolveMergeRequestDiscussion(arg0 context.Context, arg1 } // ResolveMergeRequestDiscussion indicates an expected call of ResolveMergeRequestDiscussion. -func (mr *MockGitClientMockRecorder) ResolveMergeRequestDiscussion(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) ResolveMergeRequestDiscussion(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResolveMergeRequestDiscussion", reflect.TypeOf((*MockGitClient)(nil).ResolveMergeRequestDiscussion), arg0, arg1, arg2, arg3) } @@ -196,7 +226,7 @@ func (m *MockGitClient) SetCommitStatus(ctx context.Context, projectWithNS, comm } // SetCommitStatus indicates an expected call of SetCommitStatus. -func (mr *MockGitClientMockRecorder) SetCommitStatus(ctx, projectWithNS, commitSHA, status interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) SetCommitStatus(ctx, projectWithNS, commitSHA, status any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCommitStatus", reflect.TypeOf((*MockGitClient)(nil).SetCommitStatus), ctx, projectWithNS, commitSHA, status) } @@ -211,7 +241,7 @@ func (m *MockGitClient) UpdateMergeRequestDiscussionNote(ctx context.Context, mr } // UpdateMergeRequestDiscussionNote indicates an expected call of UpdateMergeRequestDiscussionNote. -func (mr *MockGitClientMockRecorder) UpdateMergeRequestDiscussionNote(ctx, mrIID, noteID, project, discussionID, comment interface{}) *gomock.Call { +func (mr *MockGitClientMockRecorder) UpdateMergeRequestDiscussionNote(ctx, mrIID, noteID, project, discussionID, comment any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateMergeRequestDiscussionNote", reflect.TypeOf((*MockGitClient)(nil).UpdateMergeRequestDiscussionNote), ctx, mrIID, noteID, project, discussionID, comment) } @@ -248,7 +278,7 @@ func (m *MockGitRepo) FetchUpstreamBranch(arg0 string) error { } // FetchUpstreamBranch indicates an expected call of FetchUpstreamBranch. -func (mr *MockGitRepoMockRecorder) FetchUpstreamBranch(arg0 interface{}) *gomock.Call { +func (mr *MockGitRepoMockRecorder) FetchUpstreamBranch(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchUpstreamBranch", reflect.TypeOf((*MockGitRepo)(nil).FetchUpstreamBranch), arg0) } @@ -277,7 +307,7 @@ func (m *MockGitRepo) GetMergeBase(oldest, newest string) (string, error) { } // GetMergeBase indicates an expected call of GetMergeBase. -func (mr *MockGitRepoMockRecorder) GetMergeBase(oldest, newest interface{}) *gomock.Call { +func (mr *MockGitRepoMockRecorder) GetMergeBase(oldest, newest any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMergeBase", reflect.TypeOf((*MockGitRepo)(nil).GetMergeBase), oldest, newest) } @@ -292,7 +322,7 @@ func (m *MockGitRepo) GetModifiedFileNamesBetweenCommits(oldest, newest string) } // GetModifiedFileNamesBetweenCommits indicates an expected call of GetModifiedFileNamesBetweenCommits. -func (mr *MockGitRepoMockRecorder) GetModifiedFileNamesBetweenCommits(oldest, newest interface{}) *gomock.Call { +func (mr *MockGitRepoMockRecorder) GetModifiedFileNamesBetweenCommits(oldest, newest any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetModifiedFileNamesBetweenCommits", reflect.TypeOf((*MockGitRepo)(nil).GetModifiedFileNamesBetweenCommits), oldest, newest) } diff --git a/pkg/tfc_trigger/tfc_trigger_test.go b/pkg/tfc_trigger/tfc_trigger_test.go index 3c5acac..22ede56 100644 --- a/pkg/tfc_trigger/tfc_trigger_test.go +++ b/pkg/tfc_trigger/tfc_trigger_test.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/hashicorp/go-tfe" "github.com/rs/zerolog/log" "github.com/rzajac/zltest" @@ -14,6 +13,7 @@ import ( "github.com/zapier/tfbuddy/pkg/tfc_api" "github.com/zapier/tfbuddy/pkg/tfc_trigger" "go.opentelemetry.io/otel" + "go.uber.org/mock/gomock" ) func TestTriggerAction_String(t *testing.T) { From 9800c3fa088db69102b44e26a4bfe254d1d29f94 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Fri, 13 Oct 2023 10:49:36 -0600 Subject: [PATCH 02/16] add merge PR support to Github Signed-off-by: davidwin93 --- pkg/vcs/github/client.go | 9 +++++++++ pkg/vcs/github/run_events_worker.go | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkg/vcs/github/client.go b/pkg/vcs/github/client.go index 85d624c..41bdbed 100644 --- a/pkg/vcs/github/client.go +++ b/pkg/vcs/github/client.go @@ -64,6 +64,15 @@ func (c *Client) GetMergeRequestApprovals(ctx context.Context, id int, project s } return pr, nil } +func (c *Client) MergeMR(ctx context.Context, mrIID int, project string) error { + projectParts, err := splitFullName(project) + if err != nil { + utils.CreatePermanentError(err) + } + _, _, err = c.client.PullRequests.Merge(c.ctx, projectParts[0], projectParts[1], mrIID, "", nil) + + return err +} // Go over all comments on a PR, trying to grab any old TFC run urls and deleting the bodies func (c *Client) GetOldRunUrls(ctx context.Context, prID int, fullName string, rootCommentID int) (string, error) { diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go index d54ffc9..73d077c 100644 --- a/pkg/vcs/github/run_events_worker.go +++ b/pkg/vcs/github/run_events_worker.go @@ -81,5 +81,11 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run ) } - + if run.Status == tfe.RunApplied { + if len(run.TargetAddrs) > 0 { + return + } + // The applying phase of a run has completed. + w.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) + } } From d69cab30c2a65595587cd224a2ed134a258c5078 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Fri, 13 Oct 2023 10:49:56 -0600 Subject: [PATCH 03/16] add merge MR support to Gitlab Signed-off-by: davidwin93 --- pkg/vcs/gitlab/client.go | 6 ++++++ pkg/vcs/gitlab/mr_status_updater.go | 7 +++++++ pkg/vcs/interfaces.go | 1 + 3 files changed, 14 insertions(+) diff --git a/pkg/vcs/gitlab/client.go b/pkg/vcs/gitlab/client.go index 5a88f26..0ba4cac 100644 --- a/pkg/vcs/gitlab/client.go +++ b/pkg/vcs/gitlab/client.go @@ -121,6 +121,12 @@ func (c *GitlabClient) GetCommitStatuses(ctx context.Context, projectID, commitS return statuses } +func (c *GitlabClient) MergeMR(ctx context.Context, mrIID int, project string) error { + _, span := otel.Tracer("TFC").Start(ctx, "MergeMR") + defer span.End() + _, _, err := c.client.MergeRequests.AcceptMergeRequest(project, mrIID, &gogitlab.AcceptMergeRequestOptions{}) + return err +} // Crawl the comments on this MR for tfbuddy comments, grab any TFC urls out of them, and delete them. func (c *GitlabClient) GetOldRunUrls(ctx context.Context, mrIID int, project string, rootNoteID int) (string, error) { diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index cb368b9..2e305cc 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -48,6 +48,7 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf } // The applying phase of a run has completed. p.updateStatus(ctx, gogitlab.Success, "apply", rmd) + p.mergeMRIfPossible(ctx, rmd) case tfe.RunCanceled: // The run has been discarded. This is a final state. @@ -196,6 +197,12 @@ func (p *RunStatusUpdater) getLatestPipelineID(ctx context.Context, rmd runstrea return nil } +func (p *RunStatusUpdater) mergeMRIfPossible(ctx context.Context, rmd runstream.RunMetadata) error { + err := p.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) + log.Debug().AnErr("err", err).Msg("merge MR") + return err +} + // configureBackOff returns a backoff configuration to use to retry requests func configureBackOff() *backoff.ExponentialBackOff { diff --git a/pkg/vcs/interfaces.go b/pkg/vcs/interfaces.go index 66870b7..68e8ec9 100644 --- a/pkg/vcs/interfaces.go +++ b/pkg/vcs/interfaces.go @@ -18,6 +18,7 @@ type GitClient interface { SetCommitStatus(ctx context.Context, projectWithNS string, commitSHA string, status CommitStatusOptions) (CommitStatus, error) GetPipelinesForCommit(ctx context.Context, projectWithNS string, commitSHA string) ([]ProjectPipeline, error) GetOldRunUrls(ctx context.Context, mrIID int, project string, rootCommentID int) (string, error) + MergeMR(ctx context.Context, mrIID int, project string) error } type GitRepo interface { FetchUpstreamBranch(string) error From 45797cfbc291c963ce0c95321da689eb693a4443 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Fri, 13 Oct 2023 10:54:56 -0600 Subject: [PATCH 04/16] update dependencies Signed-off-by: davidwin93 --- go.mod | 152 +++++++------ go.sum | 390 +++++++++++++++----------------- internal/telemetry/telemetry.go | 6 +- 3 files changed, 265 insertions(+), 283 deletions(-) diff --git a/go.mod b/go.mod index 74ecccc..303a893 100644 --- a/go.mod +++ b/go.mod @@ -3,124 +3,130 @@ module github.com/zapier/tfbuddy go 1.19 require ( - github.com/bmatcuk/doublestar/v4 v4.4.0 + github.com/bmatcuk/doublestar/v4 v4.6.0 github.com/cbrgm/githubevents v1.7.0 - github.com/cenkalti/backoff/v4 v4.2.0 - github.com/creasty/defaults v1.6.0 - github.com/go-git/go-billy/v5 v5.4.1 - github.com/go-git/go-git/v5 v5.5.2 - github.com/golang/mock v1.6.0 + github.com/cenkalti/backoff/v4 v4.2.1 + github.com/creasty/defaults v1.7.0 + github.com/go-git/go-billy/v5 v5.5.0 + github.com/go-git/go-git/v5 v5.9.0 github.com/google/go-cmp v0.5.9 - github.com/google/go-github/v49 v49.0.0 - github.com/hashicorp/go-tfe v1.30.0 + github.com/google/go-github/v49 v49.1.0 + github.com/hashicorp/go-tfe v1.36.0 github.com/hashicorp/terraform-json v0.17.1 github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb github.com/jessevdk/go-flags v1.5.0 github.com/kr/pretty v0.3.1 - github.com/labstack/echo-contrib v0.13.0 - github.com/labstack/echo/v4 v4.10.2 + github.com/labstack/echo-contrib v0.15.0 + github.com/labstack/echo/v4 v4.11.2 github.com/nats-io/nats-server/v2 v2.9.8 - github.com/nats-io/nats.go v1.25.0 - github.com/prometheus/client_golang v1.14.0 - github.com/rs/zerolog v1.28.0 + github.com/nats-io/nats.go v1.30.2 + github.com/prometheus/client_golang v1.17.0 + github.com/rs/zerolog v1.31.0 github.com/rzajac/zltest v0.12.0 github.com/sl1pm4t/gongs v0.0.0-20230501190600-06976a7fac23 - github.com/spf13/cobra v1.6.1 - github.com/spf13/viper v1.15.0 + github.com/spf13/cobra v1.7.0 + github.com/spf13/viper v1.17.0 github.com/stretchr/testify v1.8.4 - github.com/xanzy/go-gitlab v0.77.0 - github.com/ziflex/lecho/v3 v3.3.0 - go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.40.0 - go.opentelemetry.io/contrib/instrumentation/runtime v0.40.0 - go.opentelemetry.io/otel v1.14.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.37.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 - go.opentelemetry.io/otel/metric v0.37.0 - go.opentelemetry.io/otel/sdk v1.14.0 - go.opentelemetry.io/otel/sdk/metric v0.37.0 - go.opentelemetry.io/otel/trace v1.14.0 - golang.org/x/oauth2 v0.4.0 - google.golang.org/grpc v1.53.0 + github.com/xanzy/go-gitlab v0.93.1 + github.com/ziflex/lecho/v3 v3.5.0 + go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.45.0 + go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0 + go.opentelemetry.io/otel v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 + go.opentelemetry.io/otel/sdk v1.19.0 + go.opentelemetry.io/otel/sdk/metric v1.19.0 + go.opentelemetry.io/otel/trace v1.19.0 + go.uber.org/mock v0.3.0 + golang.org/x/oauth2 v0.13.0 + google.golang.org/grpc v1.58.3 gopkg.in/dealancer/validate.v2 v2.1.0 gopkg.in/errgo.v2 v2.1.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/Microsoft/go-winio v0.6.0 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb // indirect - github.com/acomagu/bufpipe v1.0.3 // indirect - github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + dario.cat/mergo v1.0.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect + github.com/acomagu/bufpipe v1.0.4 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cloudflare/circl v1.3.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/cloudflare/circl v1.3.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-git/gcfg v1.5.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // 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/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect - github.com/hashicorp/go-slug v0.11.1 // indirect + github.com/hashicorp/go-slug v0.12.2 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d // indirect - github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.1.0 // 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.11 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/kr/text v0.2.0 // indirect github.com/labstack/gommon v0.4.0 // indirect - github.com/leodido/go-urn v1.2.1 // indirect + github.com/leodido/go-urn v1.2.4 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/nats-io/jwt/v2 v2.3.0 // indirect - github.com/nats-io/nkeys v0.4.4 // indirect + github.com/nats-io/jwt/v2 v2.4.1 // indirect + github.com/nats-io/nkeys v0.4.5 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/pjbgf/sha1cd v0.2.3 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.39.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // 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 + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sergi/go-diff v1.3.1 // indirect - github.com/skeema/knownhosts v1.1.0 // indirect - github.com/spf13/afero v1.9.3 // indirect - github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/skeema/knownhosts v1.2.1 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.10.0 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/zclconf/go-cty v1.13.2 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.37.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect - go.uber.org/mock v0.3.0 // indirect - golang.org/x/crypto v0.8.0 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect + golang.org/x/mod v0.13.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sync v0.4.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.6.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/protobuf v1.28.1 // indirect + golang.org/x/tools v0.14.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 8bf7bd5..ecc9313 100644 --- a/go.sum +++ b/go.sum @@ -35,64 +35,56 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= -github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb h1:Vx1Bw/nGULx+FuY7Sw+8ZDpOx9XOdA+mOfo678SqkbU= -github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= -github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= -github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= +github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= -github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic= -github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= -github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc= +github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cbrgm/githubevents v1.7.0 h1:rE7P/OiUtrY5BbmgyLjp8XJ00TZJWzKUXN6PnnK2Y74= github.com/cbrgm/githubevents v1.7.0/go.mod h1:hmV8xPmd//BWSRXJNUBkT/fwRkJpeC1e68mC2brA6pY= -github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= -github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/circl v1.3.2 h1:VWp8dY3yH69fdM7lM6A1+NhhVoDu9vqK0jOgmkQHFWk= -github.com/cloudflare/circl v1.3.2/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creasty/defaults v1.6.0 h1:ltuE9cfphUtlrBeomuu8PEyISTXnxqkBIoQfXgv7BSc= -github.com/creasty/defaults v1.6.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM= +github.com/creasty/defaults v1.7.0 h1:eNdqZvc5B509z18lD8yc212CAqJNvfT1Jq6L8WowdBA= +github.com/creasty/defaults v1.7.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -100,43 +92,37 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= -github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= -github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= -github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.4.0/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= -github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= -github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= -github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ= -github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= -github.com/go-git/go-git/v5 v5.5.2 h1:v8lgZa5k9ylUw+OR/roJHTxR4QItsNFI5nKtAXFuynw= -github.com/go-git/go-git/v5 v5.5.2/go.mod h1:BE5hUJ5yaV2YMxhmaP4l6RBQ08kMxKSPD4BlxtH7OjI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8= +github.com/go-git/go-git/v5 v5.9.0 h1:cD9SFA7sHVRdJ7AYck1ZaAa/yeuBvGPxwXDL8cxrObY= +github.com/go-git/go-git/v5 v5.9.0/go.mod h1:RKIqga24sWdMGZF+1Ekv9kylsDz6LzdTSI2s/OsZWE0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -144,8 +130,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -161,8 +145,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -175,11 +160,10 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v49 v49.0.0 h1:vSz1fnOeGztFxDe48q0RCOrd8Cg4o8INcZBPVpGPNaY= -github.com/google/go-github/v49 v49.0.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334= +github.com/google/go-github/v49 v49.1.0 h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY= +github.com/google/go-github/v49 v49.1.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -200,19 +184,18 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= -github.com/hashicorp/go-slug v0.11.1 h1:c6lLdQnlhUWbS5I7hw8SvfymoFuy6EmiFDedy6ir994= -github.com/hashicorp/go-slug v0.11.1/go.mod h1:Ib+IWBYfEfJGI1ZyXMGNbu2BU+aa3Dzu41RKLH301v4= -github.com/hashicorp/go-tfe v1.30.0 h1:vEieLxZ0Xly4+njypVwHH0RcUip7za1p6Pw52iqLOAY= -github.com/hashicorp/go-tfe v1.30.0/go.mod h1:z0182DGE/63AKUaWblUVBIrt+xdSmsuuXg5AoxGqDF4= +github.com/hashicorp/go-slug v0.12.2 h1:Gb6nxnV5GI1UVa3aLJGUj66J8AOZFnjIoYalNCp2Cbo= +github.com/hashicorp/go-slug v0.12.2/go.mod h1:JZVtycnZZbiJ4oxpJ/zfhyfBD8XxT4f0uOSyjNLCqFY= +github.com/hashicorp/go-tfe v1.36.0 h1:Wq73gjjDo/f9gkKQ5MVSb+4NNJ6T7c5MVTivA0s/bZ0= +github.com/hashicorp/go-tfe v1.36.0/go.mod h1:awOuTZ4K9F1EJsKBIoxonJlb7Axn3PIb8YeBLtm/G/0= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -228,9 +211,6 @@ github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb h1:tsEKRC3P github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -242,108 +222,108 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= -github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo-contrib v0.13.0 h1:bzSG0SpuZZd7BmJLvsWtPfU23W0Enh3K0tok3aENVKA= -github.com/labstack/echo-contrib v0.13.0/go.mod h1:IF9+MJu22ADOZEHD+bAV67XMIO3vNXUy7Naz/ABPHEs= -github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= -github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k= +github.com/labstack/echo-contrib v0.15.0 h1:9K+oRU265y4Mu9zpRDv3X+DGTqUALY6oRHCSZZKCRVU= +github.com/labstack/echo-contrib v0.15.0/go.mod h1:lei+qt5CLB4oa7VHTE0yEfQSEB9XTJI1LUqko9UWvo4= +github.com/labstack/echo/v4 v4.11.2 h1:T+cTLQxWCDfqDEoydYm5kCobjmHwOwcv4OJAPHilmdE= +github.com/labstack/echo/v4 v4.11.2/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= -github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= -github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= +github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4= +github.com/nats-io/jwt/v2 v2.4.1/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI= github.com/nats-io/nats-server/v2 v2.9.8 h1:jgxZsv+A3Reb3MgwxaINcNq/za8xZInKhDg9Q0cGN1o= github.com/nats-io/nats-server/v2 v2.9.8/go.mod h1:AB6hAnGZDlYfqb7CTAm66ZKMZy9DpfierY1/PbpvI2g= -github.com/nats-io/nats.go v1.25.0 h1:t5/wCPGciR7X3Mu8QOi4jiJaXaWM8qtkLu4lzGZvYHE= -github.com/nats-io/nats.go v1.25.0/go.mod h1:D2WALIhz7V8M0pH8Scx8JZXlg6Oqz5VG+nQkK8nJdvg= -github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= -github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= -github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= +github.com/nats-io/nats.go v1.30.2 h1:aloM0TGpPorZKQhbAkdCzYDj+ZmsJDyeo3Gkbr72NuY= +github.com/nats-io/nats.go v1.30.2/go.mod h1:dcfhUgmQNN4GJEfIb2f9R7Fow+gzBF4emzDHrVBd5qM= +github.com/nats-io/nkeys v0.4.5 h1:Zdz2BUlFm4fJlierwvGK+yl20IAKUm7eV6AAZXEhkPk= +github.com/nats-io/nkeys v0.4.5/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI= -github.com/pjbgf/sha1cd v0.2.3/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= -github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.25.0/go.mod h1:7KHcEGe0QZPOm2IE4Kpb5rTh6n1h2hIgS5OOnu1rUaI= -github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= -github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= +github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/rzajac/zltest v0.12.0 h1:9WPX0UhhXG66iuRT9+jYSl9SAGyl+PmKsC4+UGKLJVU= github.com/rzajac/zltest v0.12.0/go.mod h1:wZSsCw1RyFaEIfUOCUw8DiicX4U6yB1IZdOg8Uj0yDI= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= +github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= -github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/sl1pm4t/gongs v0.0.0-20230501190600-06976a7fac23 h1:nq323lhNbO2fNvuEMFDP+MXrYUcvvNi2Yvq3Q3V6lCA= github.com/sl1pm4t/gongs v0.0.0-20230501190600-06976a7fac23/go.mod h1:D/23VJHsiC8ig5Nj1PgmEnmk0nZlMbkondiK9e4vlp4= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= +github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= @@ -356,18 +336,18 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/xanzy/go-gitlab v0.77.0 h1:UrbGlxkWVCbkpa6Fk6cM8ARh+rLACWemkJnsawT7t98= -github.com/xanzy/go-gitlab v0.77.0/go.mod h1:d/a0vswScO7Agg1CZNz15Ic6SSvBG9vfw8egL99t4kA= +github.com/xanzy/go-gitlab v0.93.1 h1:f7J33cw/P9b/8paIOoH0F3H+TFrswvWHs6yUgoTp9LY= +github.com/xanzy/go-gitlab v0.93.1/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -376,62 +356,59 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0= -github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= -github.com/ziflex/lecho/v3 v3.3.0 h1:Z6KnMf0ubJX93W8Np37DBIZalFubYDq0a92hv3S/9CY= -github.com/ziflex/lecho/v3 v3.3.0/go.mod h1:VyOQDbC51eP3iJ4NdcyQbhmTqUZiapn7zJ3oHknCmXU= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/ziflex/lecho/v3 v3.5.0 h1:Z4TBr8SbUUnfaVc8tGJf1Jhu0G9Jxjl77lPW0riXKak= +github.com/ziflex/lecho/v3 v3.5.0/go.mod h1:+eInrytYHxVPI6NQbua9xXGerB1x0ujj9jAV33yBIko= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.40.0 h1:uieC4MjrlpHeEtapTOpix710ykBLqXQqZqN6DpnvOvw= -go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.40.0/go.mod h1:9jOfbttH75jtbNJR3xGi1Bs+gN9IcQzj2iDqN9zi8Jg= -go.opentelemetry.io/contrib/instrumentation/runtime v0.40.0 h1:Qf1GuR3QFxTNqDhfuw9XuJMkOOyRUwWP9NdFakk3RXM= -go.opentelemetry.io/contrib/instrumentation/runtime v0.40.0/go.mod h1:zmll4G8j5zRZeFURG6t/N7SOl7M5kUHQfV5UVqTaQFI= -go.opentelemetry.io/contrib/propagators/b3 v1.15.0 h1:bMaonPyFcAvZ4EVzkUNkfnUHP5Zi63CIDlA3dRsEg8Q= -go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= -go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 h1:/fXHZHGvro6MVqV34fJzDhi7sHGpX3Ej/Qjmfn003ho= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0/go.mod h1:UFG7EBMRdXyFstOwH028U0sVf+AvukSGhF0g8+dmNG8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.37.0 h1:22J9c9mxNAZugv86zhwjBnER0DbO0VVpW9Oo/j3jBBQ= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.37.0/go.mod h1:QD8SSO9fgtBOvXYpcX5NXW+YnDJByTnh7a/9enQWFmw= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.37.0 h1:CI6DSdsSkJxX1rsfPSQ0SciKx6klhdDRBXqKb+FwXG8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.37.0/go.mod h1:WLBYPrz8srktckhCjFaau4VHSfGaMuqoKSXwpzaiRZg= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 h1:TKf2uAs2ueguzLaxOCBXNpHxfO/aC7PAdDsSH0IbeRQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0/go.mod h1:HrbCVv40OOLTABmOn1ZWty6CHXkU8DK/Urc43tHug70= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 h1:ap+y8RXX3Mu9apKVtOkM6WSFESLM8K3wNQyOU8sWHcc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0/go.mod h1:5w41DY6S9gZrbjuq6Y+753e96WfPha5IcsOSZTtullM= -go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs= -go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk/metric v0.37.0 h1:haYBBtZZxiI3ROwSmkZnI+d0+AVzBWeviuYQDeBWosU= -go.opentelemetry.io/otel/sdk/metric v0.37.0/go.mod h1:mO2WV1AZKKwhwHTV3AKOoIEb9LbUaENZDuGUQd+j4A0= -go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= -go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.45.0 h1:JJCIHAxGCB5HM3NxeIwFjHc087Xwk96TG9kaZU6TAec= +go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.45.0/go.mod h1:Px9kH7SJ+NhsgWRtD/eMcs15Tyt4uL3rM7X54qv6pfA= +go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0 h1:2JydY5UiDpqvj2p7sO9bgHuhTy4hgTZ0ymehdq/Ob0Q= +go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0/go.mod h1:ch3a5QxOqVWxas4CzjCFFOOQe+7HgAXC/N1oVxS9DK4= +go.opentelemetry.io/contrib/propagators/b3 v1.20.0 h1:Yty9Vs4F3D6/liF1o6FNt0PvN85h/BJJ6DQKJ3nrcM0= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= +go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -442,6 +419,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -467,9 +446,9 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -504,10 +483,11 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -517,9 +497,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= -golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -532,8 +511,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -577,36 +557,39 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -659,11 +642,11 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -693,8 +676,9 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -718,7 +702,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -732,9 +715,12 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a h1:myvhA4is3vrit1a6NZCWBIwN0kNEnX21DJOJX/NvIfI= +google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -748,15 +734,11 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -769,17 +751,14 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/dealancer/validate.v2 v2.1.0 h1:XY95SZhVH1rBe8uwtnQEsOO79rv8GPwK+P3VWhQfJbA= gopkg.in/dealancer/validate.v2 v2.1.0/go.mod h1:EipWMj8hVO2/dPXVlYRe9yKcgVd5OttpQDiM1/wZ0DE= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= @@ -789,13 +768,10 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go index 9250ea1..7dba10e 100644 --- a/internal/telemetry/telemetry.go +++ b/internal/telemetry/telemetry.go @@ -12,12 +12,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" - mGlobal "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) @@ -201,7 +201,7 @@ func (bt *BaseTelemetry) initOTLPMetric(conn *grpc.ClientConn, res *resource.Res metric.WithReader(otelReader), ) - mGlobal.SetMeterProvider(bt.metric) + otel.SetMeterProvider(bt.metric) return nil } From 8071bdd79a1c182b3f68cc95145c8049142d59f1 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Mon, 16 Oct 2023 10:32:52 -0600 Subject: [PATCH 05/16] add check on project and global levels if auto merge is enabled Signed-off-by: davidwin93 --- pkg/runstream/interfaces.go | 1 + pkg/runstream/run_metadata.go | 5 +++++ pkg/tfc_trigger/project_config.go | 1 + pkg/tfc_trigger/project_config_test.go | 7 +++++++ pkg/tfc_trigger/tfc_trigger.go | 6 ++++-- pkg/vcs/common.go | 10 ++++++++++ pkg/vcs/github/run_events_worker.go | 8 +++++++- pkg/vcs/gitlab/mr_status_updater.go | 15 +++++++++++++-- 8 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 pkg/vcs/common.go diff --git a/pkg/runstream/interfaces.go b/pkg/runstream/interfaces.go index 1d57f24..392c79c 100644 --- a/pkg/runstream/interfaces.go +++ b/pkg/runstream/interfaces.go @@ -38,6 +38,7 @@ type RunMetadata interface { GetCommitSHA() string GetOrganization() string GetVcsProvider() string + GetAutoMerge() bool } type RunPollingTask interface { diff --git a/pkg/runstream/run_metadata.go b/pkg/runstream/run_metadata.go index 956cb4b..a266fa4 100644 --- a/pkg/runstream/run_metadata.go +++ b/pkg/runstream/run_metadata.go @@ -43,6 +43,8 @@ type TFRunMetadata struct { RootNoteID int64 VcsProvider string + + AutoMerge bool } func (r *TFRunMetadata) GetAction() string { @@ -75,6 +77,9 @@ func (r *TFRunMetadata) GetOrganization() string { func (r *TFRunMetadata) GetVcsProvider() string { return r.VcsProvider } +func (r *TFRunMetadata) GetAutoMerge() bool { + return r.AutoMerge +} func (s *Stream) AddRunMeta(rmd RunMetadata) error { b, err := encodeTFRunMetadata(rmd) if err != nil { diff --git a/pkg/tfc_trigger/project_config.go b/pkg/tfc_trigger/project_config.go index 3610b7f..eeac779 100644 --- a/pkg/tfc_trigger/project_config.go +++ b/pkg/tfc_trigger/project_config.go @@ -91,6 +91,7 @@ type TFCWorkspace struct { Dir string `yaml:"dir"` Mode string `yaml:"mode" default:"apply-before-merge" validate:"one_of=apply-before-merge,merge-before-apply,tfc-vcs-repo"` TriggerDirs []string `yaml:"triggerDirs"` + AutoMerge bool `yaml:"autoMerge" default:"true"` } func getProjectConfigFile(ctx context.Context, gl vcs.GitClient, trigger *TFCTrigger) (*ProjectConfig, error) { diff --git a/pkg/tfc_trigger/project_config_test.go b/pkg/tfc_trigger/project_config_test.go index d14fffc..e66245c 100644 --- a/pkg/tfc_trigger/project_config_test.go +++ b/pkg/tfc_trigger/project_config_test.go @@ -176,6 +176,7 @@ func Test_loadProjectConfig(t *testing.T) { Dir: "terraform/dev/", Mode: "apply-before-merge", TriggerDirs: nil, + AutoMerge: true, }, }}, wantErr: false, @@ -202,6 +203,7 @@ func Test_loadProjectConfig(t *testing.T) { Dir: "terraform/dev/", Mode: "apply-before-merge", TriggerDirs: nil, + AutoMerge: true, }, }}, wantErr: false, @@ -215,6 +217,7 @@ func Test_loadProjectConfig(t *testing.T) { Organization: "foo-corp", Dir: "terraform/dev/", Mode: "apply-before-merge", + AutoMerge: true, TriggerDirs: []string{ "modules/**", }, @@ -231,6 +234,7 @@ func Test_loadProjectConfig(t *testing.T) { Organization: "foo-corp", Dir: "terraform/dev/", Mode: "apply-before-merge", + AutoMerge: true, TriggerDirs: []string{ "modules/database/", }, @@ -247,6 +251,7 @@ func Test_loadProjectConfig(t *testing.T) { Organization: "foo-corp", Dir: "terraform/dev/", Mode: "apply-before-merge", + AutoMerge: true, }, }}, wantErr: false, @@ -266,12 +271,14 @@ func Test_loadProjectConfig(t *testing.T) { Organization: "foo-corp", Dir: "terraform/dev/", Mode: "apply-before-merge", + AutoMerge: true, }, { Name: "service-tfbuddy-tooling", Organization: "foo-corp", Dir: "terraform/tooling/", Mode: "apply-before-merge", + AutoMerge: true, }, }}, wantErr: false, diff --git a/pkg/tfc_trigger/tfc_trigger.go b/pkg/tfc_trigger/tfc_trigger.go index ab22e54..b6fc472 100644 --- a/pkg/tfc_trigger/tfc_trigger.go +++ b/pkg/tfc_trigger/tfc_trigger.go @@ -620,10 +620,10 @@ func (t *TFCTrigger) triggerRunForWorkspace(ctx context.Context, cfgWS *TFCWorks Bool("speculative", run.ConfigurationVersion.Speculative). Msg("created TFC run") - return t.publishRunToStream(ctx, run) + return t.publishRunToStream(ctx, run, cfgWS) } -func (t *TFCTrigger) publishRunToStream(ctx context.Context, run *tfe.Run) error { +func (t *TFCTrigger) publishRunToStream(ctx context.Context, run *tfe.Run, cfgWS *TFCWorkspace) error { ctx, span := otel.Tracer("TFC").Start(ctx, "publishRunToStream") defer span.End() @@ -639,6 +639,8 @@ func (t *TFCTrigger) publishRunToStream(ctx context.Context, run *tfe.Run) error DiscussionID: t.GetMergeRequestDiscussionID(), RootNoteID: t.GetMergeRequestRootNoteID(), VcsProvider: t.GetVcsProvider(), + //set Auto Merge if both conditions are met. + AutoMerge: cfgWS.AutoMerge && cfgWS.Mode == "apply-before-merge", } err := t.runstream.AddRunMeta(rmd) if err != nil { diff --git a/pkg/vcs/common.go b/pkg/vcs/common.go new file mode 100644 index 0000000..9bd7424 --- /dev/null +++ b/pkg/vcs/common.go @@ -0,0 +1,10 @@ +package vcs + +import "os" + +const TF_BUDDY_AUTO_MERGE = "TFBUDDY_ENABLE_AUTO_MERGE" + +func IsGlobalAutoMergeEnabled() bool { + //empty or true will permit auto merge. + return os.Getenv(TF_BUDDY_AUTO_MERGE) != "false" +} diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go index 73d077c..a8bd329 100644 --- a/pkg/vcs/github/run_events_worker.go +++ b/pkg/vcs/github/run_events_worker.go @@ -86,6 +86,12 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run return } // The applying phase of a run has completed. - w.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) + w.mergePRIfPossible(ctx, rmd) } } +func (w *RunEventsWorker) mergePRIfPossible(ctx context.Context, rmd runstream.RunMetadata) { + if !rmd.GetAutoMerge() || !vcs.IsGlobalAutoMergeEnabled() { + return + } + w.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) +} diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index 2e305cc..488ac7c 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -11,6 +11,7 @@ import ( "github.com/rs/zerolog/log" gogitlab "github.com/xanzy/go-gitlab" "github.com/zapier/tfbuddy/pkg/runstream" + "github.com/zapier/tfbuddy/pkg/vcs" "go.opentelemetry.io/otel" ) @@ -197,10 +198,20 @@ func (p *RunStatusUpdater) getLatestPipelineID(ctx context.Context, rmd runstrea return nil } -func (p *RunStatusUpdater) mergeMRIfPossible(ctx context.Context, rmd runstream.RunMetadata) error { +func (p *RunStatusUpdater) mergeMRIfPossible(ctx context.Context, rmd runstream.RunMetadata) { + ctx, span := otel.Tracer("TFC").Start(ctx, "mergeMRIfPossible") + defer span.End() + + if !rmd.GetAutoMerge() || !vcs.IsGlobalAutoMergeEnabled() { + return + } + err := p.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) + if err != nil { + span.RecordError(err) + } log.Debug().AnErr("err", err).Msg("merge MR") - return err + } // configureBackOff returns a backoff configuration to use to retry requests From 66c18e446c925b052de40788377e1ffba074285a Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Mon, 16 Oct 2023 11:25:09 -0600 Subject: [PATCH 06/16] update MR comments to indicate if auto merge is enabled Signed-off-by: davidwin93 --- localdev/manifests/deployment.yaml | 2 ++ pkg/comment_formatter/tfc_status_update.go | 36 +++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/localdev/manifests/deployment.yaml b/localdev/manifests/deployment.yaml index 165bac0..56f5894 100644 --- a/localdev/manifests/deployment.yaml +++ b/localdev/manifests/deployment.yaml @@ -27,6 +27,8 @@ spec: value: "true" - name: TFBUDDY_OTEL_COLLECTOR_PORT value: "4317" + - name: TFBUDDY_ENABLE_AUTO_MERGE + value: "true" - name: TFBUDDY_OTEL_COLLECTOR_HOST valueFrom: fieldRef: diff --git a/pkg/comment_formatter/tfc_status_update.go b/pkg/comment_formatter/tfc_status_update.go index 3e70cc5..894081b 100644 --- a/pkg/comment_formatter/tfc_status_update.go +++ b/pkg/comment_formatter/tfc_status_update.go @@ -9,6 +9,7 @@ import ( "github.com/zapier/tfbuddy/pkg/runstream" "github.com/zapier/tfbuddy/pkg/terraform_plan" "github.com/zapier/tfbuddy/pkg/tfc_api" + "github.com/zapier/tfbuddy/pkg/vcs" ) func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstream.RunMetadata) (main, toplevel string, resolve bool) { @@ -32,7 +33,11 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre extraInfo = fmt.Sprintf(successPlanSummaryFormat, run.Apply.ResourceImports, run.Apply.ResourceAdditions, run.Apply.ResourceChanges, run.Apply.ResourceDestructions) if len(run.TargetAddrs) > 0 { extraInfo += needToApplyFullWorkSpace - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) + } else { + extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + } } else { resolveDiscussion = true } @@ -54,7 +59,11 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre if len(run.TargetAddrs) > 0 { extraInfo += fmt.Sprintf(howToApplyFormatWithTarget, strings.Join(run.TargetAddrs, ","), wsName, strings.Join(run.TargetAddrs, ",")) } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) + } else { + extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + } } } case tfe.RunPlannedAndFinished: @@ -72,12 +81,20 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre if len(run.TargetAddrs) > 0 { extraInfo += fmt.Sprintf(howToApplyFormatWithTarget, strings.Join(run.TargetAddrs, ","), wsName, strings.Join(run.TargetAddrs, ",")) } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) + } else { + extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + } } } else { if len(run.TargetAddrs) > 0 { extraInfo += needToApplyFullWorkSpace - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) + } else { + extraInfo += fmt.Sprintf(howToApplyFormat, wsName) + } } else { resolveDiscussion = true } @@ -155,6 +172,17 @@ var howToApplyFormat = ` Remember to **merge** the MR once the apply has succeeded` +var howToApplyFormatAutoMerge = ` + +--- +* To **apply** the plan for all workspaces, comment: + > ` + "`tfc apply`" + ` + +* To **apply** the plan for this workspace only, comment: + > ` + "`tfc apply -w %s`" + ` + +Your MR will be **automatically** merged once the apply has succeeded` + var howToApplyFormatWithTarget = ` --- From e1c394b8cf70f2481da53191cdf072d6029a742d Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Tue, 17 Oct 2023 09:39:56 -0600 Subject: [PATCH 07/16] add test coverage for project level auto merge Signed-off-by: davidwin93 --- pkg/tfc_trigger/project_config_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkg/tfc_trigger/project_config_test.go b/pkg/tfc_trigger/project_config_test.go index e66245c..0247118 100644 --- a/pkg/tfc_trigger/project_config_test.go +++ b/pkg/tfc_trigger/project_config_test.go @@ -181,6 +181,21 @@ func Test_loadProjectConfig(t *testing.T) { }}, wantErr: false, }, + { + name: "no auto merge", + args: args{b: []byte(tfbuddyYamlNoTriggerDirsNoAutoMerge)}, + want: &ProjectConfig{Workspaces: []*TFCWorkspace{ + { + Name: "service-tfbuddy-dev", + Organization: "foo-corp", + Dir: "terraform/dev/", + Mode: "apply-before-merge", + TriggerDirs: nil, + AutoMerge: false, + }, + }}, + wantErr: false, + }, { name: "no-organization", args: args{b: []byte(tfbuddyYamlNoOrg)}, @@ -320,6 +335,15 @@ workspaces: dir: terraform/dev/ mode: apply-before-merge ` +const tfbuddyYamlNoTriggerDirsNoAutoMerge = ` +--- +workspaces: + - name: service-tfbuddy-dev + organization: foo-corp + dir: terraform/dev/ + mode: apply-before-merge + autoMerge: false +` const tfbuddyYamlNoOrg = ` --- From 2438df893df17ad00a20e0bdfd21f34218123c25 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Tue, 17 Oct 2023 09:40:10 -0600 Subject: [PATCH 08/16] refactor help text for MR comments Signed-off-by: davidwin93 --- pkg/comment_formatter/tfc_status_update.go | 60 +++++++++------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/pkg/comment_formatter/tfc_status_update.go b/pkg/comment_formatter/tfc_status_update.go index 894081b..c5fff97 100644 --- a/pkg/comment_formatter/tfc_status_update.go +++ b/pkg/comment_formatter/tfc_status_update.go @@ -12,6 +12,21 @@ import ( "github.com/zapier/tfbuddy/pkg/vcs" ) +func getProperApplyText(rmd runstream.RunMetadata, wsName string) string { + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + return fmt.Sprintf(howToApplyFormat, wsName, autoMRMergeSnippet) + } else { + return fmt.Sprintf(howToApplyFormat, wsName, manualMRMergeSnippet) + } +} +func getProperTargetedApplyText(rmd runstream.RunMetadata, run *tfe.Run, wsName string) string { + targets := strings.Join(run.TargetAddrs, ",") + if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + return fmt.Sprintf(howToApplyFormatWithTarget, targets, wsName, targets, autoMRMergeSnippet) + } else { + return fmt.Sprintf(howToApplyFormatWithTarget, targets, wsName, targets, manualMRMergeSnippet) + } +} func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstream.RunMetadata) (main, toplevel string, resolve bool) { wsName := run.Workspace.Name org := run.Workspace.Organization.Name @@ -33,11 +48,7 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre extraInfo = fmt.Sprintf(successPlanSummaryFormat, run.Apply.ResourceImports, run.Apply.ResourceAdditions, run.Apply.ResourceChanges, run.Apply.ResourceDestructions) if len(run.TargetAddrs) > 0 { extraInfo += needToApplyFullWorkSpace - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { - extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) - } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) - } + extraInfo += getProperApplyText(rmd, wsName) } else { resolveDiscussion = true } @@ -57,13 +68,9 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre extraInfo = fmt.Sprintf(successPlanSummaryFormat, run.Apply.ResourceImports, run.Plan.ResourceAdditions, run.Plan.ResourceChanges, run.Plan.ResourceDestructions) if !run.AutoApply { if len(run.TargetAddrs) > 0 { - extraInfo += fmt.Sprintf(howToApplyFormatWithTarget, strings.Join(run.TargetAddrs, ","), wsName, strings.Join(run.TargetAddrs, ",")) + extraInfo += getProperTargetedApplyText(rmd, run, wsName) } else { - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { - extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) - } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) - } + extraInfo += getProperApplyText(rmd, wsName) } } case tfe.RunPlannedAndFinished: @@ -79,22 +86,14 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre if hasChanges(run.Plan) { if len(run.TargetAddrs) > 0 { - extraInfo += fmt.Sprintf(howToApplyFormatWithTarget, strings.Join(run.TargetAddrs, ","), wsName, strings.Join(run.TargetAddrs, ",")) + extraInfo += getProperTargetedApplyText(rmd, run, wsName) } else { - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { - extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) - } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) - } + extraInfo += getProperApplyText(rmd, wsName) } } else { if len(run.TargetAddrs) > 0 { extraInfo += needToApplyFullWorkSpace - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { - extraInfo += fmt.Sprintf(howToApplyFormatAutoMerge, wsName) - } else { - extraInfo += fmt.Sprintf(howToApplyFormat, wsName) - } + extraInfo += getProperApplyText(rmd, wsName) } else { resolveDiscussion = true } @@ -161,6 +160,8 @@ var successPlanSummaryFormat = ` * Changes: %d * Destructions: %d` +var manualMRMergeSnippet = `Remember to **merge** the MR once the apply has succeeded` +var autoMRMergeSnippet = `Your MR will be **automatically** merged once the apply has succeeded` var howToApplyFormat = ` --- @@ -170,18 +171,7 @@ var howToApplyFormat = ` * To **apply** the plan for this workspace only, comment: > ` + "`tfc apply -w %s`" + ` -Remember to **merge** the MR once the apply has succeeded` - -var howToApplyFormatAutoMerge = ` - ---- -* To **apply** the plan for all workspaces, comment: - > ` + "`tfc apply`" + ` - -* To **apply** the plan for this workspace only, comment: - > ` + "`tfc apply -w %s`" + ` - -Your MR will be **automatically** merged once the apply has succeeded` +%s` var howToApplyFormatWithTarget = ` @@ -192,7 +182,7 @@ var howToApplyFormatWithTarget = ` * To **apply** the plan for this workspace only, comment: > ` + "`tfc apply -w %s -t %s`" + ` -Remember to **merge** the MR once the apply has succeeded` +%s` var needToApplyFullWorkSpace = ` From 3073ecb6067d6659389519887a6739fa95d2c072 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Tue, 17 Oct 2023 10:07:15 -0600 Subject: [PATCH 09/16] update docs Signed-off-by: davidwin93 --- docs/usage.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/usage.md b/docs/usage.md index 3084ce5..c035977 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -50,6 +50,8 @@ env: TFBUDDY_PROJECT_ALLOW_LIST: tfc-project/ TFBUDDY_WORKSPACE_ALLOW_LIST: tfc-workspace TFBUDDY_DEFAULT_TFC_ORGANIZATION: companyX + # Optional setting to disable auto merging MRs after a successful apply. This is enabled by default. + TFBUDDY_ENABLE_AUTO_MERGE: "false" ``` For sensitive environment variables use `secrets.envs` which can contain a list of key/value pairs @@ -100,6 +102,8 @@ workspaces: - terraform/staging/**/*.tf - terraform/staging/{foo,bar}/** - terraform/staging/**/[^0-9]* + # Merge MR once all workspaces have been applied. This is enabled by default, and can be disabled globally by setting TFBUDDY_ENABLE_AUTO_MERGE to false + autoMerge: true ``` TF Buddy uses [doublestar](https://github.com/bmatcuk/doublestar#about) for its path matching. In the example above, the following directories/files would be watched: From eaed084d43836acab0b8beac67c1df711a682eb7 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Tue, 17 Oct 2023 14:23:30 -0600 Subject: [PATCH 10/16] address code review comments Signed-off-by: davidwin93 --- pkg/comment_formatter/tfc_status_update.go | 5 +- pkg/runstream/run_metadata.go | 3 +- pkg/tfc_trigger/tfc_trigger.go | 16 +- pkg/tfc_trigger/tfc_trigger_test.go | 226 +++++++++++++++++++++ pkg/vcs/github/run_events_worker.go | 2 +- pkg/vcs/gitlab/mr_status_updater.go | 3 +- 6 files changed, 246 insertions(+), 9 deletions(-) diff --git a/pkg/comment_formatter/tfc_status_update.go b/pkg/comment_formatter/tfc_status_update.go index c5fff97..7ae132c 100644 --- a/pkg/comment_formatter/tfc_status_update.go +++ b/pkg/comment_formatter/tfc_status_update.go @@ -9,11 +9,10 @@ import ( "github.com/zapier/tfbuddy/pkg/runstream" "github.com/zapier/tfbuddy/pkg/terraform_plan" "github.com/zapier/tfbuddy/pkg/tfc_api" - "github.com/zapier/tfbuddy/pkg/vcs" ) func getProperApplyText(rmd runstream.RunMetadata, wsName string) string { - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + if rmd.GetAutoMerge() { return fmt.Sprintf(howToApplyFormat, wsName, autoMRMergeSnippet) } else { return fmt.Sprintf(howToApplyFormat, wsName, manualMRMergeSnippet) @@ -21,7 +20,7 @@ func getProperApplyText(rmd runstream.RunMetadata, wsName string) string { } func getProperTargetedApplyText(rmd runstream.RunMetadata, run *tfe.Run, wsName string) string { targets := strings.Join(run.TargetAddrs, ",") - if rmd.GetAutoMerge() && vcs.IsGlobalAutoMergeEnabled() { + if rmd.GetAutoMerge() { return fmt.Sprintf(howToApplyFormatWithTarget, targets, wsName, targets, autoMRMergeSnippet) } else { return fmt.Sprintf(howToApplyFormatWithTarget, targets, wsName, targets, manualMRMergeSnippet) diff --git a/pkg/runstream/run_metadata.go b/pkg/runstream/run_metadata.go index a266fa4..ab35711 100644 --- a/pkg/runstream/run_metadata.go +++ b/pkg/runstream/run_metadata.go @@ -5,6 +5,7 @@ import ( "time" "github.com/nats-io/nats.go" + "github.com/zapier/tfbuddy/pkg/vcs" ) // ensure type complies with interface @@ -78,7 +79,7 @@ func (r *TFRunMetadata) GetVcsProvider() string { return r.VcsProvider } func (r *TFRunMetadata) GetAutoMerge() bool { - return r.AutoMerge + return r.AutoMerge && vcs.IsGlobalAutoMergeEnabled() } func (s *Stream) AddRunMeta(rmd RunMetadata) error { b, err := encodeTFRunMetadata(rmd) diff --git a/pkg/tfc_trigger/tfc_trigger.go b/pkg/tfc_trigger/tfc_trigger.go index b6fc472..998b715 100644 --- a/pkg/tfc_trigger/tfc_trigger.go +++ b/pkg/tfc_trigger/tfc_trigger.go @@ -639,8 +639,20 @@ func (t *TFCTrigger) publishRunToStream(ctx context.Context, run *tfe.Run, cfgWS DiscussionID: t.GetMergeRequestDiscussionID(), RootNoteID: t.GetMergeRequestRootNoteID(), VcsProvider: t.GetVcsProvider(), - //set Auto Merge if both conditions are met. - AutoMerge: cfgWS.AutoMerge && cfgWS.Mode == "apply-before-merge", + AutoMerge: cfgWS.AutoMerge, + } + //disable Auto Merge and log if the mode is not apply-before-merge + if cfgWS.Mode != "apply-before-merge" && cfgWS.AutoMerge { + log.Info().Str("RunID", run.ID). + Str("Org", run.Workspace.Organization.Name). + Str("WS", run.Workspace.Name).Msg("auto-merge cannot be enabled because the 'apply-before-merge' mode is not in use") + rmd.AutoMerge = false + } + if cfgWS.AutoMerge && !vcs.IsGlobalAutoMergeEnabled() { + log.Info().Str("RunID", run.ID). + Str("Org", run.Workspace.Organization.Name). + Str("WS", run.Workspace.Name).Msg("auto-merge cannot be enabled since the feature is globally disabled") + rmd.AutoMerge = false } err := t.runstream.AddRunMeta(rmd) if err != nil { diff --git a/pkg/tfc_trigger/tfc_trigger_test.go b/pkg/tfc_trigger/tfc_trigger_test.go index 22ede56..fdf429b 100644 --- a/pkg/tfc_trigger/tfc_trigger_test.go +++ b/pkg/tfc_trigger/tfc_trigger_test.go @@ -3,6 +3,7 @@ package tfc_trigger_test import ( "context" "fmt" + "os" "testing" "time" @@ -10,8 +11,10 @@ import ( "github.com/rs/zerolog/log" "github.com/rzajac/zltest" "github.com/zapier/tfbuddy/pkg/mocks" + "github.com/zapier/tfbuddy/pkg/runstream" "github.com/zapier/tfbuddy/pkg/tfc_api" "github.com/zapier/tfbuddy/pkg/tfc_trigger" + "github.com/zapier/tfbuddy/pkg/vcs" "go.opentelemetry.io/otel" "go.uber.org/mock/gomock" ) @@ -579,3 +582,226 @@ func TestTFCEvents_MultiWorkspaceApplyModifiedBothSrcDstBranches(t *testing.T) { } } + +func TestAutoMerge_False_Merge_Before_Apply(t *testing.T) { + ws := &tfc_trigger.ProjectConfig{ + Workspaces: []*tfc_trigger.TFCWorkspace{{ + Name: "service-tfbuddy", + Organization: "zapier-test", + Mode: "merge-before-apply", + AutoMerge: true, + }}} + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{ProjectConfig: ws}, t) + + testSuite.MockGitRepo.EXPECT().GetModifiedFileNamesBetweenCommits(testSuite.MetaData.CommonSHA, "main").Return([]string{}, nil) + testSuite.MockApiClient.EXPECT().CreateRunFromSource(gomock.Any(), gomock.Any()).Return(&tfe.Run{ + ID: "101", + Workspace: &tfe.Workspace{Name: "service-tfbuddy", + Organization: &tfe.Organization{Name: "zapier-test"}, + }, + ConfigurationVersion: &tfe.ConfigurationVersion{Speculative: false}}, nil) + + testSuite.MockStreamClient.EXPECT().AddRunMeta(&runstream.TFRunMetadata{ + RunID: "101", + Organization: "zapier-test", + Workspace: "service-tfbuddy", + Source: "merge_request", + Action: "apply", + CommitSHA: "abcd12233", + MergeRequestProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + DiscussionID: "201", + RootNoteID: 301, + VcsProvider: "", + AutoMerge: false, + }) + + testSuite.InitTestSuite() + testLogger := zltest.New(t) + log.Logger = log.Logger.Output(testLogger) + + tCfg, _ := tfc_trigger.NewTFCTriggerConfig(&tfc_trigger.TFCTriggerOptions{ + Action: tfc_trigger.ApplyAction, + Branch: "test-branch", + CommitSHA: "abcd12233", + ProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + TriggerSource: tfc_trigger.CommentTrigger, + }) + trigger := tfc_trigger.NewTFCTrigger(testSuite.MockGitClient, testSuite.MockApiClient, testSuite.MockStreamClient, tCfg) + ctx, _ := otel.Tracer("FAKE").Start(context.Background(), "TEST") + triggeredWS, err := trigger.TriggerTFCEvents(ctx) + if err != nil { + t.Fatal(err) + return + } + lastEntry := testLogger.LastEntry() + if lastEntry == nil { + t.Fatal("expected log message not nil") + return + } + lastEntry.ExpMsg("auto-merge cannot be enabled because the 'apply-before-merge' mode is not in use") + + if len(triggeredWS.Errored) != 0 { + t.Fatal("expected no failed workspaces") + } + if len(triggeredWS.Executed) == 0 { + t.Fatal("expected successful triggers") + } + if triggeredWS.Executed[0] != "service-tfbuddy" { + t.Fatal("expected workspace", triggeredWS.Errored[0].Name) + } +} + +func TestAutoMerge_True_Apply_Before_Merge(t *testing.T) { + ws := &tfc_trigger.ProjectConfig{ + Workspaces: []*tfc_trigger.TFCWorkspace{{ + Name: "service-tfbuddy", + Organization: "zapier-test", + Mode: "apply-before-merge", + AutoMerge: true, + }}} + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{ProjectConfig: ws}, t) + + testSuite.MockGitRepo.EXPECT().GetModifiedFileNamesBetweenCommits(testSuite.MetaData.CommonSHA, "main").Return([]string{}, nil) + testSuite.MockApiClient.EXPECT().CreateRunFromSource(gomock.Any(), gomock.Any()).Return(&tfe.Run{ + ID: "101", + Workspace: &tfe.Workspace{Name: "service-tfbuddy", + Organization: &tfe.Organization{Name: "zapier-test"}, + }, + ConfigurationVersion: &tfe.ConfigurationVersion{Speculative: false}}, nil) + + testSuite.MockStreamClient.EXPECT().AddRunMeta(&runstream.TFRunMetadata{ + RunID: "101", + Organization: "zapier-test", + Workspace: "service-tfbuddy", + Source: "merge_request", + Action: "apply", + CommitSHA: "abcd12233", + MergeRequestProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + DiscussionID: "201", + RootNoteID: 301, + VcsProvider: "", + AutoMerge: true, + }) + + testSuite.InitTestSuite() + testLogger := zltest.New(t) + log.Logger = log.Logger.Output(testLogger) + + tCfg, _ := tfc_trigger.NewTFCTriggerConfig(&tfc_trigger.TFCTriggerOptions{ + Action: tfc_trigger.ApplyAction, + Branch: "test-branch", + CommitSHA: "abcd12233", + ProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + TriggerSource: tfc_trigger.CommentTrigger, + }) + trigger := tfc_trigger.NewTFCTrigger(testSuite.MockGitClient, testSuite.MockApiClient, testSuite.MockStreamClient, tCfg) + ctx, _ := otel.Tracer("FAKE").Start(context.Background(), "TEST") + triggeredWS, err := trigger.TriggerTFCEvents(ctx) + if err != nil { + t.Fatal(err) + return + } + lastEntry := testLogger.LastEntry() + if lastEntry == nil { + t.Fatal("expected log message not nil") + return + } + lastEntry.ExpMsg("created TFC run") + + if len(triggeredWS.Errored) != 0 { + t.Fatal("expected no failed workspaces") + } + if len(triggeredWS.Executed) == 0 { + t.Fatal("expected successful triggers") + } + if triggeredWS.Executed[0] != "service-tfbuddy" { + t.Fatal("expected workspace", triggeredWS.Errored[0].Name) + } +} + +func TestAutoMerge_Globally_Disabled(t *testing.T) { + originalVal := os.Getenv(vcs.TF_BUDDY_AUTO_MERGE) + os.Setenv(vcs.TF_BUDDY_AUTO_MERGE, "false") + defer func() { os.Setenv(vcs.TF_BUDDY_AUTO_MERGE, originalVal) }() + + ws := &tfc_trigger.ProjectConfig{ + Workspaces: []*tfc_trigger.TFCWorkspace{{ + Name: "service-tfbuddy", + Organization: "zapier-test", + Mode: "apply-before-merge", + AutoMerge: true, + }}} + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{ProjectConfig: ws}, t) + + testSuite.MockGitRepo.EXPECT().GetModifiedFileNamesBetweenCommits(testSuite.MetaData.CommonSHA, "main").Return([]string{}, nil) + testSuite.MockApiClient.EXPECT().CreateRunFromSource(gomock.Any(), gomock.Any()).Return(&tfe.Run{ + ID: "101", + Workspace: &tfe.Workspace{Name: "service-tfbuddy", + Organization: &tfe.Organization{Name: "zapier-test"}, + }, + ConfigurationVersion: &tfe.ConfigurationVersion{Speculative: false}}, nil) + + testSuite.MockStreamClient.EXPECT().AddRunMeta(&runstream.TFRunMetadata{ + RunID: "101", + Organization: "zapier-test", + Workspace: "service-tfbuddy", + Source: "merge_request", + Action: "apply", + CommitSHA: "abcd12233", + MergeRequestProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + DiscussionID: "201", + RootNoteID: 301, + VcsProvider: "", + AutoMerge: false, + }) + + testSuite.InitTestSuite() + testLogger := zltest.New(t) + log.Logger = log.Logger.Output(testLogger) + + tCfg, _ := tfc_trigger.NewTFCTriggerConfig(&tfc_trigger.TFCTriggerOptions{ + Action: tfc_trigger.ApplyAction, + Branch: "test-branch", + CommitSHA: "abcd12233", + ProjectNameWithNamespace: testSuite.MetaData.ProjectNameNS, + MergeRequestIID: testSuite.MetaData.MRIID, + TriggerSource: tfc_trigger.CommentTrigger, + }) + trigger := tfc_trigger.NewTFCTrigger(testSuite.MockGitClient, testSuite.MockApiClient, testSuite.MockStreamClient, tCfg) + ctx, _ := otel.Tracer("FAKE").Start(context.Background(), "TEST") + triggeredWS, err := trigger.TriggerTFCEvents(ctx) + if err != nil { + t.Fatal(err) + return + } + lastEntry := testLogger.LastEntry() + if lastEntry == nil { + t.Fatal("expected log message not nil") + return + } + lastEntry.ExpMsg("auto-merge cannot be enabled since the feature is globally disabled") + + if len(triggeredWS.Errored) != 0 { + t.Fatal("expected no failed workspaces") + } + if len(triggeredWS.Executed) == 0 { + t.Fatal("expected successful triggers") + } + if triggeredWS.Executed[0] != "service-tfbuddy" { + t.Fatal("expected workspace", triggeredWS.Errored[0].Name) + } +} diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go index a8bd329..dfb8c5d 100644 --- a/pkg/vcs/github/run_events_worker.go +++ b/pkg/vcs/github/run_events_worker.go @@ -90,7 +90,7 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run } } func (w *RunEventsWorker) mergePRIfPossible(ctx context.Context, rmd runstream.RunMetadata) { - if !rmd.GetAutoMerge() || !vcs.IsGlobalAutoMergeEnabled() { + if !rmd.GetAutoMerge() { return } w.client.MergeMR(ctx, rmd.GetMRInternalID(), rmd.GetMRProjectNameWithNamespace()) diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index 488ac7c..1799add 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -11,7 +11,6 @@ import ( "github.com/rs/zerolog/log" gogitlab "github.com/xanzy/go-gitlab" "github.com/zapier/tfbuddy/pkg/runstream" - "github.com/zapier/tfbuddy/pkg/vcs" "go.opentelemetry.io/otel" ) @@ -202,7 +201,7 @@ func (p *RunStatusUpdater) mergeMRIfPossible(ctx context.Context, rmd runstream. ctx, span := otel.Tracer("TFC").Start(ctx, "mergeMRIfPossible") defer span.End() - if !rmd.GetAutoMerge() || !vcs.IsGlobalAutoMergeEnabled() { + if !rmd.GetAutoMerge() { return } From 9afdb2ddf60a6af2073698794f3f2fd5d08fd203 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Wed, 18 Oct 2023 07:07:19 -0600 Subject: [PATCH 11/16] update env var that allows auto merge Signed-off-by: davidwin93 --- docs/usage.md | 4 ++-- localdev/manifests/deployment.yaml | 2 +- pkg/vcs/common.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/usage.md b/docs/usage.md index c035977..a9c09d4 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -51,7 +51,7 @@ env: TFBUDDY_WORKSPACE_ALLOW_LIST: tfc-workspace TFBUDDY_DEFAULT_TFC_ORGANIZATION: companyX # Optional setting to disable auto merging MRs after a successful apply. This is enabled by default. - TFBUDDY_ENABLE_AUTO_MERGE: "false" + TFBUDDY_ALLOW_AUTO_MERGE: "false" ``` For sensitive environment variables use `secrets.envs` which can contain a list of key/value pairs @@ -102,7 +102,7 @@ workspaces: - terraform/staging/**/*.tf - terraform/staging/{foo,bar}/** - terraform/staging/**/[^0-9]* - # Merge MR once all workspaces have been applied. This is enabled by default, and can be disabled globally by setting TFBUDDY_ENABLE_AUTO_MERGE to false + # Merge MR once all workspaces have been applied. This is enabled by default, and can be disabled globally by setting TFBUDDY_ALLOW_AUTO_MERGE to false autoMerge: true ``` diff --git a/localdev/manifests/deployment.yaml b/localdev/manifests/deployment.yaml index 56f5894..5e99053 100644 --- a/localdev/manifests/deployment.yaml +++ b/localdev/manifests/deployment.yaml @@ -27,7 +27,7 @@ spec: value: "true" - name: TFBUDDY_OTEL_COLLECTOR_PORT value: "4317" - - name: TFBUDDY_ENABLE_AUTO_MERGE + - name: TFBUDDY_ALLOW_AUTO_MERGE value: "true" - name: TFBUDDY_OTEL_COLLECTOR_HOST valueFrom: diff --git a/pkg/vcs/common.go b/pkg/vcs/common.go index 9bd7424..79ccb99 100644 --- a/pkg/vcs/common.go +++ b/pkg/vcs/common.go @@ -2,7 +2,7 @@ package vcs import "os" -const TF_BUDDY_AUTO_MERGE = "TFBUDDY_ENABLE_AUTO_MERGE" +const TF_BUDDY_AUTO_MERGE = "TFBUDDY_ALLOW_AUTO_MERGE" func IsGlobalAutoMergeEnabled() bool { //empty or true will permit auto merge. From 649553335feca503d036f049ed608a97b52a9dd6 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Thu, 19 Oct 2023 10:24:26 -0600 Subject: [PATCH 12/16] auto merge if apply has no changes Signed-off-by: davidwin93 --- pkg/vcs/github/run_events_worker.go | 8 ++++++++ pkg/vcs/gitlab/mr_status_updater.go | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go index dfb8c5d..0c7956d 100644 --- a/pkg/vcs/github/run_events_worker.go +++ b/pkg/vcs/github/run_events_worker.go @@ -88,6 +88,14 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run // The applying phase of a run has completed. w.mergePRIfPossible(ctx, rmd) } + if run.Status == tfe.RunPlannedAndFinished { + if len(run.TargetAddrs) > 0 { + return + } + if rmd.GetAction() == "apply" { + w.mergePRIfPossible(ctx, rmd) + } + } } func (w *RunEventsWorker) mergePRIfPossible(ctx context.Context, rmd runstream.RunMetadata) { if !rmd.GetAutoMerge() { diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index 1799add..000bc32 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -76,8 +76,12 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf // This is a final state. p.updateStatus(ctx, gogitlab.Success, rmd.GetAction(), rmd) if run.HasChanges { - // TODO: is pending enough to block merging before apply? p.updateStatus(ctx, gogitlab.Pending, "apply", rmd) + } else { + // if the apply returns no changes we can still go ahead and merge if auto-merge is enabled + if rmd.GetAction() == "apply" { + p.mergeMRIfPossible(ctx, rmd) + } } case tfe.RunPolicySoftFailed: From aed8c9efab72f6453a61fc47eacc9a27655fb0bd Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Thu, 19 Oct 2023 12:28:53 -0600 Subject: [PATCH 13/16] check if apply was targeted before merging even if empty. Signed-off-by: davidwin93 --- pkg/vcs/gitlab/mr_status_updater.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index 000bc32..3d25f72 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -79,7 +79,7 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf p.updateStatus(ctx, gogitlab.Pending, "apply", rmd) } else { // if the apply returns no changes we can still go ahead and merge if auto-merge is enabled - if rmd.GetAction() == "apply" { + if len(run.TargetAddrs) == 0 && rmd.GetAction() == "apply" { p.mergeMRIfPossible(ctx, rmd) } } From 7b842ef43aa94b750d3c11cd2aa72a95a13b2e1b Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Thu, 19 Oct 2023 12:29:58 -0600 Subject: [PATCH 14/16] add additional unit tests for auto merge Signed-off-by: davidwin93 --- pkg/vcs/gitlab/mr_status_updater_test.go | 113 +++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 pkg/vcs/gitlab/mr_status_updater_test.go diff --git a/pkg/vcs/gitlab/mr_status_updater_test.go b/pkg/vcs/gitlab/mr_status_updater_test.go new file mode 100644 index 0000000..caab988 --- /dev/null +++ b/pkg/vcs/gitlab/mr_status_updater_test.go @@ -0,0 +1,113 @@ +package gitlab + +import ( + "context" + "errors" + "testing" + + "github.com/hashicorp/go-tfe" + gogitlab "github.com/xanzy/go-gitlab" + "github.com/zapier/tfbuddy/pkg/mocks" + "github.com/zapier/tfbuddy/pkg/runstream" + "github.com/zapier/tfbuddy/pkg/vcs" + "go.uber.org/mock/gomock" +) + +func TestAutoMergeNoChangesApply(t *testing.T) { + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{}, t) + + testSuite.MockGitClient.EXPECT().MergeMR(gomock.Any(), gomock.Any(), gomock.Any()) + testSuite.MockGitClient.EXPECT().GetPipelinesForCommit(gomock.Any(), gomock.Any(), gomock.Any()).Return([]vcs.ProjectPipeline{&GitlabPipeline{&gogitlab.PipelineInfo{ID: 1}}}, nil).AnyTimes() + testSuite.MockGitClient.EXPECT().SetCommitStatus(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("could not commit status")).AnyTimes() + testSuite.InitTestSuite() + r := &RunStatusUpdater{ + tfc: testSuite.MockApiClient, + client: testSuite.MockGitClient, + rs: testSuite.MockStreamClient, + } + r.updateCommitStatusForRun(context.Background(), &tfe.Run{ + Status: tfe.RunPlannedAndFinished, + HasChanges: false, + }, &runstream.TFRunMetadata{ + Action: "apply", + AutoMerge: true, + }) +} +func TestAutoMergeTargetedNoChangesApply(t *testing.T) { + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{}, t) + + testSuite.MockGitClient.EXPECT().MergeMR(gomock.Any(), gomock.Any(), gomock.Any()).MaxTimes(0) + + testSuite.MockGitClient.EXPECT().GetPipelinesForCommit(gomock.Any(), gomock.Any(), gomock.Any()).Return([]vcs.ProjectPipeline{&GitlabPipeline{&gogitlab.PipelineInfo{ID: 1}}}, nil).AnyTimes() + testSuite.MockGitClient.EXPECT().SetCommitStatus(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("could not commit status")).AnyTimes() + testSuite.InitTestSuite() + r := &RunStatusUpdater{ + tfc: testSuite.MockApiClient, + client: testSuite.MockGitClient, + rs: testSuite.MockStreamClient, + } + r.updateCommitStatusForRun(context.Background(), &tfe.Run{ + Status: tfe.RunPlannedAndFinished, + HasChanges: false, + TargetAddrs: []string{"module.foo"}, + }, &runstream.TFRunMetadata{ + Action: "apply", + AutoMerge: true, + }) +} + +func TestAutoMergeApply(t *testing.T) { + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{}, t) + + testSuite.MockGitClient.EXPECT().MergeMR(gomock.Any(), gomock.Any(), gomock.Any()) + testSuite.MockGitClient.EXPECT().GetPipelinesForCommit(gomock.Any(), gomock.Any(), gomock.Any()).Return([]vcs.ProjectPipeline{&GitlabPipeline{&gogitlab.PipelineInfo{ID: 1}}}, nil).AnyTimes() + testSuite.MockGitClient.EXPECT().SetCommitStatus(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("could not commit status")).AnyTimes() + testSuite.InitTestSuite() + r := &RunStatusUpdater{ + tfc: testSuite.MockApiClient, + client: testSuite.MockGitClient, + rs: testSuite.MockStreamClient, + } + r.updateCommitStatusForRun(context.Background(), &tfe.Run{ + Status: tfe.RunApplied, + HasChanges: true, + }, &runstream.TFRunMetadata{ + Action: "apply", + AutoMerge: true, + }) +} + +func TestAutoMergeTargetedApply(t *testing.T) { + + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + testSuite := mocks.CreateTestSuite(mockCtrl, mocks.TestOverrides{}, t) + + testSuite.MockGitClient.EXPECT().MergeMR(gomock.Any(), gomock.Any(), gomock.Any()).MaxTimes(0) + + testSuite.MockGitClient.EXPECT().GetPipelinesForCommit(gomock.Any(), gomock.Any(), gomock.Any()).Return([]vcs.ProjectPipeline{&GitlabPipeline{&gogitlab.PipelineInfo{ID: 1}}}, nil).AnyTimes() + testSuite.MockGitClient.EXPECT().SetCommitStatus(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("could not commit status")).AnyTimes() + testSuite.InitTestSuite() + r := &RunStatusUpdater{ + tfc: testSuite.MockApiClient, + client: testSuite.MockGitClient, + rs: testSuite.MockStreamClient, + } + r.updateCommitStatusForRun(context.Background(), &tfe.Run{ + Status: tfe.RunApplied, + HasChanges: true, + TargetAddrs: []string{"module.foo"}, + }, &runstream.TFRunMetadata{ + Action: "apply", + AutoMerge: true, + }) +} From cb5681c7945d9e34829bf150fc073b04ce88ede1 Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Thu, 19 Oct 2023 13:21:45 -0600 Subject: [PATCH 15/16] add commit sha to msg id to allow new commits to run without waiting for nats dedupe timeout Signed-off-by: davidwin93 --- pkg/gitlab_hooks/stream_msgs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gitlab_hooks/stream_msgs.go b/pkg/gitlab_hooks/stream_msgs.go index 05cd805..cffb1f1 100644 --- a/pkg/gitlab_hooks/stream_msgs.go +++ b/pkg/gitlab_hooks/stream_msgs.go @@ -98,7 +98,7 @@ type MergeRequestEventMsg struct { } func (e *MergeRequestEventMsg) GetId(ctx context.Context) string { - return fmt.Sprintf("%d-%s", e.Payload.ObjectAttributes.ID, e.Payload.ObjectAttributes.Action) + return fmt.Sprintf("%d-%s-%s", e.Payload.ObjectAttributes.ID, e.Payload.ObjectAttributes.Action, e.Payload.ObjectAttributes.LastCommit.ID) } func (e *MergeRequestEventMsg) DecodeEventData(b []byte) error { From b2892d0cf304de1d696009a5d839cf31443b262b Mon Sep 17 00:00:00 2001 From: davidwin93 Date: Tue, 24 Oct 2023 09:43:05 -0600 Subject: [PATCH 16/16] use constants instead of hardcoded values Signed-off-by: davidwin93 --- pkg/comment_formatter/tfc_status_update.go | 2 +- pkg/runstream/constants.go | 6 ++++++ pkg/vcs/github/run_events_worker.go | 2 +- pkg/vcs/gitlab/mr_status_updater.go | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 pkg/runstream/constants.go diff --git a/pkg/comment_formatter/tfc_status_update.go b/pkg/comment_formatter/tfc_status_update.go index 7ae132c..1439561 100644 --- a/pkg/comment_formatter/tfc_status_update.go +++ b/pkg/comment_formatter/tfc_status_update.go @@ -54,7 +54,7 @@ func FormatRunStatusCommentBody(tfc tfc_api.ApiClient, run *tfe.Run, rmd runstre case tfe.RunDiscarded: // no extra info case tfe.RunErrored: - if rmd.GetAction() == "plan" { + if rmd.GetAction() == runstream.PlanAction { extraInfo += failedPlanSummaryFormat } diff --git a/pkg/runstream/constants.go b/pkg/runstream/constants.go new file mode 100644 index 0000000..8291c17 --- /dev/null +++ b/pkg/runstream/constants.go @@ -0,0 +1,6 @@ +package runstream + +const ( + ApplyAction string = "apply" + PlanAction string = "plan" +) diff --git a/pkg/vcs/github/run_events_worker.go b/pkg/vcs/github/run_events_worker.go index 0c7956d..66cba21 100644 --- a/pkg/vcs/github/run_events_worker.go +++ b/pkg/vcs/github/run_events_worker.go @@ -92,7 +92,7 @@ func (w *RunEventsWorker) postRunStatusComment(ctx context.Context, run *tfe.Run if len(run.TargetAddrs) > 0 { return } - if rmd.GetAction() == "apply" { + if rmd.GetAction() == runstream.ApplyAction { w.mergePRIfPossible(ctx, rmd) } } diff --git a/pkg/vcs/gitlab/mr_status_updater.go b/pkg/vcs/gitlab/mr_status_updater.go index 3d25f72..35f53eb 100644 --- a/pkg/vcs/gitlab/mr_status_updater.go +++ b/pkg/vcs/gitlab/mr_status_updater.go @@ -25,7 +25,7 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf // https://www.terraform.io/cloud-docs/api-docs/run#run-states case tfe.RunPending: // The initial status of a run once it has been created. - if rmd.GetAction() == "plan" { + if rmd.GetAction() == runstream.PlanAction { p.updateStatus(ctx, gogitlab.Pending, "plan", rmd) p.updateStatus(ctx, gogitlab.Failed, "apply", rmd) } else { @@ -79,7 +79,7 @@ func (p *RunStatusUpdater) updateCommitStatusForRun(ctx context.Context, run *tf p.updateStatus(ctx, gogitlab.Pending, "apply", rmd) } else { // if the apply returns no changes we can still go ahead and merge if auto-merge is enabled - if len(run.TargetAddrs) == 0 && rmd.GetAction() == "apply" { + if len(run.TargetAddrs) == 0 && rmd.GetAction() == runstream.ApplyAction { p.mergeMRIfPossible(ctx, rmd) } }