diff --git a/api/handlers/tag_handler.go b/api/handlers/tag_handler.go index cad09b59..8407c7dc 100644 --- a/api/handlers/tag_handler.go +++ b/api/handlers/tag_handler.go @@ -50,7 +50,7 @@ func (h *TagHandler) Create(w http.ResponseWriter, r *http.Request) { return } - err := h.service.Create(&requestBody) + err := h.service.Create(r.Context(), &requestBody) if errors.As(err, new(tag.DuplicateError)) { writeJSONError(w, http.StatusConflict, err.Error()) return @@ -89,7 +89,7 @@ func (h *TagHandler) GetByRecord(w http.ResponseWriter, r *http.Request) { writeJSONError(w, http.StatusBadRequest, errEmptyRecordURN.Error()) return } - tags, err := h.service.GetByRecord(recordType, recordURN) + tags, err := h.service.GetByRecord(r.Context(), recordType, recordURN) if err != nil { internalServerError(w, h.logger, fmt.Sprintf("error getting record tags: %s", err.Error())) return @@ -121,7 +121,7 @@ func (h *TagHandler) FindByRecordAndTemplate(w http.ResponseWriter, r *http.Requ writeJSONError(w, http.StatusBadRequest, errEmptyTemplateURN.Error()) return } - tags, err := h.service.FindByRecordAndTemplate(recordType, recordURN, templateURN) + tags, err := h.service.FindByRecordAndTemplate(r.Context(), recordType, recordURN, templateURN) if errors.As(err, new(tag.NotFoundError)) || errors.As(err, new(tag.TemplateNotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return @@ -167,7 +167,7 @@ func (h *TagHandler) Update(w http.ResponseWriter, r *http.Request) { requestBody.RecordURN = recordURN requestBody.RecordType = recordType requestBody.TemplateURN = templateURN - err := h.service.Update(&requestBody) + err := h.service.Update(r.Context(), &requestBody) if errors.As(err, new(tag.NotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return @@ -203,7 +203,7 @@ func (h *TagHandler) Delete(w http.ResponseWriter, r *http.Request) { return } - err := h.service.Delete(recordType, recordURN, templateURN) + err := h.service.Delete(r.Context(), recordType, recordURN, templateURN) if errors.As(err, new(tag.TemplateNotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return diff --git a/api/handlers/tag_handler_test.go b/api/handlers/tag_handler_test.go index 3edfba06..4c731eae 100644 --- a/api/handlers/tag_handler_test.go +++ b/api/handlers/tag_handler_test.go @@ -9,11 +9,12 @@ import ( "testing" "github.com/odpf/columbus/api/handlers" - "github.com/odpf/columbus/lib/mock" + libmock "github.com/odpf/columbus/lib/mock" "github.com/odpf/columbus/tag" "github.com/odpf/columbus/tag/mocks" "github.com/gorilla/mux" + "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) @@ -27,7 +28,7 @@ type TagHandlerTestSuite struct { func (s *TagHandlerTestSuite) TestNewHandler() { s.Run("should return handler and nil if service is not nil", func() { - actualHandler := handlers.NewTagHandler(new(mock.Logger), &tag.Service{}) + actualHandler := handlers.NewTagHandler(new(libmock.Logger), &tag.Service{}) s.NotNil(actualHandler) }) @@ -39,7 +40,7 @@ func (s *TagHandlerTestSuite) Setup() { templateService := tag.NewTemplateService(s.templateRepository) service := tag.NewService(s.tagRepository, templateService) - s.handler = handlers.NewTagHandler(new(mock.Logger), service) + s.handler = handlers.NewTagHandler(new(libmock.Logger), service) s.recorder = httptest.NewRecorder() } @@ -64,8 +65,8 @@ func (s *TagHandlerTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Create", &t).Return(tag.TemplateNotFoundError{URN: t.TemplateURN}) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Create", mock.Anything, &t).Return(tag.TemplateNotFoundError{URN: t.TemplateURN}) body, err := json.Marshal(t) s.Require().NoError(err) @@ -79,8 +80,8 @@ func (s *TagHandlerTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Create", &t).Return(tag.ValidationError{Err: errors.New("validation error")}) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Create", mock.Anything, &t).Return(tag.ValidationError{Err: errors.New("validation error")}) body, err := json.Marshal(t) s.Require().NoError(err) @@ -94,8 +95,8 @@ func (s *TagHandlerTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Create", &t).Return(errors.New("unexpected error during insert")) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Create", mock.Anything, &t).Return(errors.New("unexpected error during insert")) body, err := json.Marshal(t) s.Require().NoError(err) @@ -109,8 +110,8 @@ func (s *TagHandlerTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Create", &t).Return(tag.DuplicateError{}) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Create", mock.Anything, &t).Return(tag.DuplicateError{}) body, err := json.Marshal(t) s.Require().NoError(err) @@ -125,8 +126,8 @@ func (s *TagHandlerTestSuite) TestCreate() { originalDomainTag := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Create", &originalDomainTag).Return(nil) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Create", mock.Anything, &originalDomainTag).Return(nil) body, err := json.Marshal(originalDomainTag) s.Require().NoError(err) @@ -196,7 +197,7 @@ func (s *TagHandlerTestSuite) TestGetByRecord() { "record_urn": recordURN, }) - s.tagRepository.On("Read", tag.Tag{RecordType: recordType, RecordURN: recordURN}).Return(nil, errors.New("unexpected error")) + s.tagRepository.On("Read", mock.Anything, tag.Tag{RecordType: recordType, RecordURN: recordURN}).Return(nil, errors.New("unexpected error")) s.handler.GetByRecord(s.recorder, request) s.Equal(http.StatusInternalServerError, s.recorder.Result().StatusCode) @@ -213,7 +214,7 @@ func (s *TagHandlerTestSuite) TestGetByRecord() { "type": recordType, "record_urn": recordURN, }) - s.tagRepository.On("Read", tag.Tag{RecordType: recordType, RecordURN: recordURN}).Return([]tag.Tag{t}, nil) + s.tagRepository.On("Read", mock.Anything, tag.Tag{RecordType: recordType, RecordURN: recordURN}).Return([]tag.Tag{t}, nil) expectedStatusCode := http.StatusOK rsp, err := json.Marshal([]tag.Tag{t}) @@ -306,9 +307,7 @@ func (s *TagHandlerTestSuite) TestFindByRecordAndTemplate() { "template_urn": template.URN, }) - s.templateRepository.On("Read", tag.Template{ - URN: template.URN, - }).Return([]tag.Template{}, tag.TemplateNotFoundError{URN: template.URN}) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{}, tag.TemplateNotFoundError{URN: template.URN}) s.handler.FindByRecordAndTemplate(s.recorder, request) s.Equal(http.StatusNotFound, s.recorder.Result().StatusCode) @@ -327,11 +326,9 @@ func (s *TagHandlerTestSuite) TestFindByRecordAndTemplate() { "template_urn": template.URN, }) - s.templateRepository.On("Read", tag.Template{ - URN: template.URN, - }).Return([]tag.Template{template}, nil) + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: template.URN, @@ -359,11 +356,9 @@ func (s *TagHandlerTestSuite) TestFindByRecordAndTemplate() { "template_urn": templateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return([]tag.Template{template}, nil) + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN, @@ -385,11 +380,9 @@ func (s *TagHandlerTestSuite) TestFindByRecordAndTemplate() { "template_urn": t.TemplateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: t.TemplateURN, - }).Return([]tag.Template{template}, nil) + s.templateRepository.On("Read", mock.Anything, t.TemplateURN).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, @@ -519,13 +512,13 @@ func (s *TagHandlerTestSuite) TestUpdate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(t.TemplateURN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, t.TemplateURN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, }).Return([]tag.Tag{}, nil) - s.tagRepository.On("Update", &t).Return(errors.New("unexpected error during update")) + s.tagRepository.On("Update", mock.Anything, &t).Return(errors.New("unexpected error during update")) body, err := json.Marshal(t) s.Require().NoError(err) @@ -545,13 +538,13 @@ func (s *TagHandlerTestSuite) TestUpdate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(t.TemplateURN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, t.TemplateURN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, }).Return([]tag.Tag{t}, nil) - s.tagRepository.On("Update", &t).Return(errors.New("unexpected error during update")) + s.tagRepository.On("Update", mock.Anything, &t).Return(errors.New("unexpected error during update")) body, err := json.Marshal(t) s.Require().NoError(err) @@ -571,13 +564,13 @@ func (s *TagHandlerTestSuite) TestUpdate() { s.Setup() originalDomainTag := s.buildTag() template := s.buildTemplate() - s.templateRepository.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.tagRepository.On("Read", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.tagRepository.On("Read", mock.Anything, tag.Tag{ RecordType: originalDomainTag.RecordType, RecordURN: originalDomainTag.RecordURN, TemplateURN: originalDomainTag.TemplateURN, }).Return([]tag.Tag{originalDomainTag}, nil) - s.tagRepository.On("Update", &originalDomainTag).Return(nil) + s.tagRepository.On("Update", mock.Anything, &originalDomainTag).Return(nil) body, err := json.Marshal(originalDomainTag) s.Require().NoError(err) @@ -703,8 +696,8 @@ func (s *TagHandlerTestSuite) TestDelete() { "record_urn": recordURN, "template_urn": templateURN, }) - s.templateRepository.On("Read", s.templateQuery(templateURN)).Return([]tag.Template{{}}, nil) - s.tagRepository.On("Delete", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{{}}, nil) + s.tagRepository.On("Delete", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN, @@ -726,8 +719,8 @@ func (s *TagHandlerTestSuite) TestDelete() { "record_urn": recordURN, "template_urn": templateURN, }) - s.templateRepository.On("Read", s.templateQuery(templateURN)).Return([]tag.Template{{}}, nil) - s.tagRepository.On("Delete", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{{}}, nil) + s.tagRepository.On("Delete", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN, @@ -748,8 +741,8 @@ func (s *TagHandlerTestSuite) TestDelete() { "record_urn": recordURN, "template_urn": templateURN, }) - s.templateRepository.On("Read", s.templateQuery(templateURN)).Return([]tag.Template{{}}, nil) - s.tagRepository.On("Delete", tag.Tag{ + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{{}}, nil) + s.tagRepository.On("Delete", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN, @@ -760,12 +753,6 @@ func (s *TagHandlerTestSuite) TestDelete() { }) } -func (s *TagHandlerTestSuite) templateQuery(template_urn string) tag.Template { - return tag.Template{ - URN: template_urn, - } -} - func (s *TagHandlerTestSuite) buildTemplate() tag.Template { return tag.Template{ URN: "governance_policy", diff --git a/api/handlers/tag_template_handler.go b/api/handlers/tag_template_handler.go index fff449d5..a163fe67 100644 --- a/api/handlers/tag_template_handler.go +++ b/api/handlers/tag_template_handler.go @@ -36,7 +36,7 @@ func (h *TagTemplateHandler) Create(w http.ResponseWriter, r *http.Request) { writeJSONError(w, http.StatusBadRequest, err.Error()) return } - err := h.service.Create(&requestBody) + err := h.service.Create(r.Context(), &requestBody) if errors.As(err, new(tag.DuplicateTemplateError)) { writeJSONError(w, http.StatusConflict, err.Error()) return @@ -52,10 +52,7 @@ func (h *TagTemplateHandler) Create(w http.ResponseWriter, r *http.Request) { // Index handles template read requests func (h *TagTemplateHandler) Index(w http.ResponseWriter, r *http.Request) { urn := r.URL.Query().Get("urn") - queryDomainTemplate := tag.Template{ - URN: urn, - } - listOfDomainTemplate, err := h.service.Index(queryDomainTemplate) + listOfDomainTemplate, err := h.service.Index(r.Context(), urn) if err != nil { internalServerError(w, h.logger, fmt.Sprintf("error finding templates: %s", err.Error())) return @@ -66,8 +63,8 @@ func (h *TagTemplateHandler) Index(w http.ResponseWriter, r *http.Request) { // Update handles template update requests func (h *TagTemplateHandler) Update(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) - urn, ok := params["template_urn"] - if !ok || urn == "" { + targetTemplateURN, ok := params["template_urn"] + if !ok || targetTemplateURN == "" { writeJSONError(w, http.StatusBadRequest, errEmptyTemplateURN.Error()) return } @@ -77,8 +74,9 @@ func (h *TagTemplateHandler) Update(w http.ResponseWriter, r *http.Request) { writeJSONError(w, http.StatusBadRequest, err.Error()) return } - requestBody.URN = urn - err := h.service.Update(&requestBody) + + requestBody.URN = targetTemplateURN + err := h.service.Update(r.Context(), targetTemplateURN, &requestBody) if errors.As(err, new(tag.TemplateNotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return @@ -104,7 +102,7 @@ func (h *TagTemplateHandler) Find(w http.ResponseWriter, r *http.Request) { return } - domainTemplate, err := h.service.Find(urn) + domainTemplate, err := h.service.Find(r.Context(), urn) if errors.As(err, new(tag.TemplateNotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return @@ -126,7 +124,7 @@ func (h *TagTemplateHandler) Delete(w http.ResponseWriter, r *http.Request) { return } - err := h.service.Delete(urn) + err := h.service.Delete(r.Context(), urn) if errors.As(err, new(tag.TemplateNotFoundError)) { writeJSONError(w, http.StatusNotFound, err.Error()) return diff --git a/api/handlers/tag_template_handler_test.go b/api/handlers/tag_template_handler_test.go index 05639e95..a2d3342a 100644 --- a/api/handlers/tag_template_handler_test.go +++ b/api/handlers/tag_template_handler_test.go @@ -66,8 +66,8 @@ func (s *TagTemplateHandlerTestSuite) TestCreate() { template := s.buildTemplate() body, err := json.Marshal(template) s.Require().NoError(err) - s.templateRepository.On("Read", tag.Template{URN: template.URN}).Return(nil, nil) - s.templateRepository.On("Create", &template).Return(tag.DuplicateTemplateError{URN: template.URN}) + s.templateRepository.On("Read", mock.Anything, template.URN).Return(nil, nil) + s.templateRepository.On("Create", mock.Anything, &template).Return(tag.DuplicateTemplateError{URN: template.URN}) request, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(string(body))) s.handler.Create(s.recorder, request) @@ -79,8 +79,8 @@ func (s *TagTemplateHandlerTestSuite) TestCreate() { template := s.buildTemplate() body, err := json.Marshal(template) s.Require().NoError(err) - s.templateRepository.On("Read", tag.Template{URN: template.URN}).Return(nil, nil) - s.templateRepository.On("Create", &template).Return(errors.New("unexpected error during insert")) + s.templateRepository.On("Read", mock.Anything, template.URN).Return(nil, nil) + s.templateRepository.On("Create", mock.Anything, &template).Return(errors.New("unexpected error during insert")) request, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(string(body))) s.handler.Create(s.recorder, request) @@ -92,8 +92,8 @@ func (s *TagTemplateHandlerTestSuite) TestCreate() { originalDomainTemplate := s.buildTemplate() body, err := json.Marshal(originalDomainTemplate) s.Require().NoError(err) - s.templateRepository.On("Read", tag.Template{URN: originalDomainTemplate.URN}).Return(nil, nil) - s.templateRepository.On("Create", &originalDomainTemplate).Return(nil) + s.templateRepository.On("Read", mock.Anything, originalDomainTemplate.URN).Return(nil, nil) + s.templateRepository.On("Create", mock.Anything, &originalDomainTemplate).Return(nil) request, err := http.NewRequest(http.MethodPost, "/", strings.NewReader(string(body))) s.Require().NoError(err) @@ -116,9 +116,7 @@ func (s *TagTemplateHandlerTestSuite) TestIndex() { s.Setup() request, err := http.NewRequest(http.MethodGet, "/templates?urn=governance_policy", nil) s.Require().NoError(err) - s.templateRepository.On("Read", tag.Template{ - URN: "governance_policy", - }).Return(nil, errors.New("unexpected error")) + s.templateRepository.On("Read", mock.Anything, "governance_policy").Return(nil, errors.New("unexpected error")) s.handler.Index(s.recorder, request) s.Equal(http.StatusInternalServerError, s.recorder.Result().StatusCode) @@ -129,9 +127,7 @@ func (s *TagTemplateHandlerTestSuite) TestIndex() { request, err := http.NewRequest(http.MethodGet, "/templates?urn=governance_policy", nil) s.Require().NoError(err) recordDomainTemplate := s.buildTemplate() - s.templateRepository.On("Read", tag.Template{ - URN: "governance_policy", - }).Return([]tag.Template{recordDomainTemplate}, nil) + s.templateRepository.On("Read", mock.Anything, "governance_policy").Return([]tag.Template{recordDomainTemplate}, nil) expectedStatusCode := http.StatusOK rsp, err := json.Marshal([]tag.Template{recordDomainTemplate}) @@ -145,6 +141,27 @@ func (s *TagTemplateHandlerTestSuite) TestIndex() { s.Equal(expectedStatusCode, actualStatusCode) s.Equal(expectedResponseBody, actualResponseBody) }) + + s.Run("should return all templates if no urn query params", func() { + s.Setup() + request, err := http.NewRequest(http.MethodGet, "/templates", nil) + s.Require().NoError(err) + recordDomainTemplate := s.buildTemplate() + s.templateRepository.On("ReadAll", mock.Anything).Return([]tag.Template{recordDomainTemplate}, nil) + + expectedStatusCode := http.StatusOK + rsp, err := json.Marshal([]tag.Template{recordDomainTemplate}) + s.Require().NoError(err) + expectedResponseBody := string(rsp) + "\n" + + s.handler.Index(s.recorder, request) + actualStatusCode := s.recorder.Result().StatusCode + actualResponseBody := s.recorder.Body.String() + + s.Equal(expectedStatusCode, actualStatusCode) + s.Equal(expectedResponseBody, actualResponseBody) + }) + } func (s *TagTemplateHandlerTestSuite) TestUpdate() { @@ -203,9 +220,7 @@ func (s *TagTemplateHandlerTestSuite) TestUpdate() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return([]tag.Template{}, nil) + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{}, nil) s.handler.Update(s.recorder, request) s.Equal(http.StatusNotFound, s.recorder.Result().StatusCode) @@ -222,9 +237,7 @@ func (s *TagTemplateHandlerTestSuite) TestUpdate() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return(nil, tag.ValidationError{Err: errors.New("validation error")}) + s.templateRepository.On("Read", mock.Anything, templateURN).Return(nil, tag.ValidationError{Err: errors.New("validation error")}) s.handler.Update(s.recorder, request) s.Equal(http.StatusUnprocessableEntity, s.recorder.Result().StatusCode) @@ -241,9 +254,7 @@ func (s *TagTemplateHandlerTestSuite) TestUpdate() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return(nil, errors.New("unexpected error")) + s.templateRepository.On("Read", mock.Anything, templateURN).Return(nil, errors.New("unexpected error")) s.handler.Update(s.recorder, request) s.Equal(http.StatusInternalServerError, s.recorder.Result().StatusCode) @@ -260,11 +271,9 @@ func (s *TagTemplateHandlerTestSuite) TestUpdate() { "template_urn": template.URN, }) - s.templateRepository.On("Read", tag.Template{ - URN: template.URN, - }).Return([]tag.Template{template}, nil).Once() + s.templateRepository.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil).Once() - s.templateRepository.On("Update", &template).Run(func(args mock.Arguments) { + s.templateRepository.On("Update", mock.Anything, template.URN, &template).Run(func(args mock.Arguments) { template.UpdatedAt = time.Now() }).Return(nil) @@ -330,9 +339,7 @@ func (s *TagTemplateHandlerTestSuite) TestFind() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return([]tag.Template{}, nil) + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{}, nil) s.handler.Find(s.recorder, request) s.Equal(http.StatusNotFound, s.recorder.Result().StatusCode) @@ -348,9 +355,7 @@ func (s *TagTemplateHandlerTestSuite) TestFind() { }) template := s.buildTemplate() - s.templateRepository.On("Read", tag.Template{ - URN: templateURN, - }).Return([]tag.Template{template}, nil) + s.templateRepository.On("Read", mock.Anything, templateURN).Return([]tag.Template{template}, nil) expectedStatusCode := http.StatusOK rsp, err := json.Marshal(template) @@ -394,9 +399,7 @@ func (s *TagTemplateHandlerTestSuite) TestDelete() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Delete", tag.Template{ - URN: templateURN, - }).Return(tag.TemplateNotFoundError{URN: templateURN}) + s.templateRepository.On("Delete", mock.Anything, templateURN).Return(tag.TemplateNotFoundError{URN: templateURN}) s.handler.Delete(s.recorder, request) s.Equal(http.StatusNotFound, s.recorder.Result().StatusCode) @@ -410,9 +413,7 @@ func (s *TagTemplateHandlerTestSuite) TestDelete() { request = mux.SetURLVars(request, map[string]string{ "template_urn": templateURN, }) - s.templateRepository.On("Delete", tag.Template{ - URN: templateURN, - }).Return(nil) + s.templateRepository.On("Delete", mock.Anything, templateURN).Return(nil) s.handler.Delete(s.recorder, request) s.Equal(http.StatusNoContent, s.recorder.Result().StatusCode) diff --git a/cmd/config.go b/cmd/config.go index 98b23da4..861a9d08 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -68,14 +68,14 @@ func loadConfig() error { defaults.SetDefaults(&config) err = viper.Unmarshal(&config) if err != nil { - return fmt.Errorf("unable to unmarshal config to struct: %v\n", err) + return fmt.Errorf("unable to unmarshal config to struct: %w", err) } return nil } func bindEnvVars() { - err, configKeys := getFlattenedStructKeys(Config{}) + configKeys, err := getFlattenedStructKeys(Config{}) if err != nil { panic(err) } @@ -89,16 +89,16 @@ func bindEnvVars() { } } -func getFlattenedStructKeys(config Config) (error, []string) { +func getFlattenedStructKeys(config Config) ([]string, error) { var structMap map[string]interface{} err := mapstructure.Decode(config, &structMap) if err != nil { - return err, nil + return nil, err } flat, err := flatten.Flatten(structMap, "", flatten.DotStyle) if err != nil { - return err, nil + return nil, err } keys := make([]string, 0, len(flat)) @@ -106,5 +106,5 @@ func getFlattenedStructKeys(config Config) (error, []string) { keys = append(keys, k) } - return nil, keys + return keys, nil } diff --git a/cmd/migrate.go b/cmd/migrate.go index 2c550c12..5f64fbd1 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -11,9 +11,11 @@ import ( "github.com/pkg/errors" ) -const esMigrationTimeout = 5 * time.Second +const ( + esMigrationTimeout = 5 * time.Second +) -func Migrate() { +func RunMigrate() { fmt.Println("Preparing migration...") if err := loadConfig(); err != nil { panic(err) @@ -38,25 +40,26 @@ func Migrate() { func migratePostgres() (err error) { log.Info("Initiating Postgres client...") - pgClient, err := postgres.NewClient(postgres.Config{ + + pgConfig := postgres.Config{ + Host: config.ServerHost, Port: config.DBPort, - Host: config.DBHost, Name: config.DBName, User: config.DBUser, Password: config.DBPassword, SSLMode: config.DBSSLMode, - }) + } + + pgClient, err := postgres.NewClient(log, pgConfig) if err != nil { + log.Errorf("failed to prepare migration: %s", err) return err } - log.Info("Migrating DB...") - if err := pgClient.AutoMigrate( - &postgres.Template{}, - &postgres.Field{}, - &postgres.Tag{}, - ); err != nil { - return err + err = pgClient.Migrate(pgConfig) + if err != nil { + return errors.Wrap(err, "problem with migration") + } return nil diff --git a/cmd/serve.go b/cmd/serve.go index 1275e8bc..15a5f45e 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -22,7 +22,6 @@ import ( "github.com/odpf/columbus/store/postgres" "github.com/odpf/columbus/tag" "github.com/sirupsen/logrus" - "gorm.io/gorm" ) // Version of the current build. overridden by the build system. @@ -80,11 +79,16 @@ func initRouter( rootLogger.Info("lineage build complete") }() - pgClient := initPostgres(config) - tagRepository := postgres.NewTagRepository(pgClient) - tagTemplateService := tag.NewTemplateService( - postgres.NewTemplateRepository(pgClient), - ) + pgClient := initPostgres(rootLogger.WithField("reporter", "postgres"), config) + tagRepository, err := postgres.NewTagRepository(pgClient) + if err != nil { + log.Fatalf("failed to create new tag repository: %v", err) + } + tagTemplateRepository, err := postgres.NewTagTemplateRepository(pgClient) + if err != nil { + log.Fatalf("failed to create new tag template repository: %v", err) + } + tagTemplateService := tag.NewTemplateService(tagTemplateRepository) tagService := tag.NewService( tagRepository, tagTemplateService, @@ -149,19 +153,20 @@ func initElasticsearch(config Config) *elasticsearch.Client { return esClient } -func initPostgres(config Config) *gorm.DB { - pgClient, err := postgres.NewClient(postgres.Config{ - Port: config.DBPort, - Host: config.DBHost, - Name: config.DBName, - User: config.DBUser, - Password: config.DBPassword, - SSLMode: config.DBSSLMode, - }) +func initPostgres(logger logrus.FieldLogger, config Config) *postgres.Client { + pgClient, err := postgres.NewClient(logger, + postgres.Config{ + Port: config.DBPort, + Host: config.DBHost, + Name: config.DBName, + User: config.DBUser, + Password: config.DBPassword, + SSLMode: config.DBSSLMode, + }) if err != nil { - log.Fatalf("error creating postgres client: %v", err) + logger.Fatalf("error creating postgres client: %v", err) } - log.Infof("connected to postgres server %s:%d", config.DBHost, config.DBPort) + logger.Infof("connected to postgres server %s:%d", config.DBHost, config.DBPort) return pgClient } diff --git a/go.mod b/go.mod index 4348de55..262778b5 100644 --- a/go.mod +++ b/go.mod @@ -5,29 +5,33 @@ go 1.16 require ( github.com/MakeNowJust/heredoc v1.0.0 github.com/elastic/go-elasticsearch v0.0.0 - github.com/elastic/go-elasticsearch/v7 v7.6.0 - github.com/etsy/statsd v0.8.6 + github.com/elastic/go-elasticsearch/v7 v7.16.0 + github.com/etsy/statsd v0.9.0 github.com/go-playground/locales v0.14.0 github.com/go-playground/universal-translator v0.18.0 - github.com/go-playground/validator/v10 v10.9.0 - github.com/gorilla/handlers v1.4.2 + github.com/go-playground/validator/v10 v10.10.0 + github.com/golang-migrate/migrate/v4 v4.15.1 + github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 - github.com/jackc/pgconn v1.10.0 + github.com/jackc/pgconn v1.8.0 github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 + github.com/jackc/pgx/v4 v4.10.1 github.com/jeremywohl/flatten v1.0.1 + github.com/jmoiron/sqlx v1.3.4 + github.com/lib/pq v1.10.2 // indirect + github.com/mattn/go-sqlite3 v1.14.9 // indirect github.com/mcuadros/go-defaults v1.2.0 - github.com/mitchellh/mapstructure v1.4.1 - github.com/newrelic/go-agent/v3 v3.10.0 - github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.0 - github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.0 - github.com/odpf/salt v0.0.0-20211028100023-de463ef825e1 - github.com/olivere/elastic/v7 v7.0.12 + github.com/mitchellh/mapstructure v1.4.3 + github.com/newrelic/go-agent/v3 v3.15.2 + github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.1 + github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.1 + github.com/odpf/salt v0.0.0-20220106155451-62e8c849ae81 + github.com/olivere/elastic/v7 v7.0.31 + github.com/ory/dockertest/v3 v3.8.1 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cobra v1.2.1 - github.com/spf13/viper v1.8.1 + github.com/spf13/cobra v1.3.0 + github.com/spf13/viper v1.10.1 github.com/stretchr/testify v1.7.0 - gorm.io/driver/postgres v1.2.2 - gorm.io/driver/sqlite v1.2.6 - gorm.io/gorm v1.22.3 + golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect ) diff --git a/go.sum b/go.sum index 6fae0958..b9aeeca9 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -18,6 +19,16 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.88.0/go.mod h1:dnKwfYbP9hQhefiUvpbcAyoGSHUrOxR20JVElLiUvEY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -27,76 +38,347 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/spanner v1.24.0/go.mod h1:EZI0yH1D/PrXK0XH9Ba5LGXTXWeqZv0ClOD/19a0Z58= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= 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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= +github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= +github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= 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/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY= +github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= +github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= +github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= +github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= +github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= +github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= +github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= +github.com/alecthomas/chroma v0.8.2 h1:x3zkuE2lUk/RIekyAJ3XRqSCP4zwWDfcw/YJCuCAACg= github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= +github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY= github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY= +github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.29.11/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= +github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0= +github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU= +github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= +github.com/aws/aws-sdk-go-v2/credentials v1.3.2/go.mod h1:PACKuTJdt6AlXvEq8rFI4eDmoqDFC5DpVKQbWysaDgM= +github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0/go.mod h1:Mj/U8OpDbcVcoctrYwA2bak8k/HFPdcLzI/vaiXMwuM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0/go.mod h1:eHwXu2+uE/T6gpnYWwBwqoeqRf9IXyCcolyOWDRAErQ= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.4/go.mod h1:Ex7XQmbFmgFHrjUX6TN3mApKW5Hglyga+F7wZHTtYhA= +github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0/go.mod h1:Q5jATQc+f1MfZp3PDMhn6ry18hGvE0i8yvbXoKbnZaE= +github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.2/go.mod h1:EASdTcM1lGhUe1/p4gkojHwlGJkeoRjjr1sRCzup3Is= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0/go.mod h1:v8ygadNyATSm6elwJ/4gzJwcFhri9RqS8skgHKiwXPU= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2/go.mod h1:NXmNI41bdEsJMrD0v9rUvbGCB5GwdBEpKvUvIY3vTFg= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.2/go.mod h1:QuL2Ym8BkrLmN4lUofXYq6000/i5jPjosCNK//t6gak= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.2/go.mod h1:np7TMuJNT83O0oDOSF8i4dF3dvGqA6hPYYo6YYkzgRA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.12.0/go.mod h1:6J++A5xpo7QDsIeSqPK4UHqMSyPOCopa+zKtqAMhqVQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.16.1/go.mod h1:CQe/KvWV1AqRc65KqeJjrLzr5X2ijnFTTVzJW0VBRCI= +github.com/aws/aws-sdk-go-v2/service/sso v1.3.2/go.mod h1:J21I6kF+d/6XHVk7kp/cx9YVD2TMD2TbLwtRGVcinXo= +github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= +github.com/aws/aws-sdk-go-v2/service/sts v1.6.1/go.mod h1:hLZ/AnkIKHLuPGjEiyghNEdvJ2PP0MgOxcmv9EBJ4xs= +github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= +github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= +github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= +github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= +github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/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.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charmbracelet/glamour v0.3.0 h1:3H+ZrKlSg8s+WU6V7eF2eRVYt8lCueffbi7r2+ffGkc= github.com/charmbracelet/glamour v0.3.0/go.mod h1:TzF0koPZhqq0YVBNL100cPHznAAjVj7fksX2RInwjGw= +github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= +github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= 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/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= +github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= +github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= +github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= 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-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= +github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= +github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= +github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= +github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= +github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= +github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= +github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= +github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= +github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= +github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= +github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= +github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= +github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= +github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= +github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= +github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= +github.com/containerd/containerd v1.5.7 h1:rQyoYtj4KddB3bxG6SAqd4+08gePNyJjRqvOIfV3rkM= +github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= +github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= +github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= +github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8= +github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= +github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= +github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= +github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= +github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= +github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= +github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= +github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= +github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= +github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= +github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= +github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= +github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= +github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= +github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= +github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= +github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= +github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= +github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= +github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= +github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= +github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= +github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= +github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= +github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= 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/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dhui/dktest v0.3.7 h1:jWjWgHAPDAdqgUr7lAsB3bqB2DKWC3OaA+isfekjRew= +github.com/dhui/dktest v0.3.7/go.mod h1:nYMOkafiA07WchSwKnKFUSbGMb2hMm5DrCGiXYG6gwM= +github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v20.10.11+incompatible h1:tXU1ezXcruZQRrMP8RN2z9N91h+6egZTS1gsPsKantc= +github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= +github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.9+incompatible h1:JlsVnETOjM2RLQa0Cc1XCIspUdXW3Zenq9P54uXBm6k= +github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elastic/go-elasticsearch v0.0.0 h1:Pd5fqOuBxKxv83b0+xOAJDAkziWYwFinWnBO0y+TZaA= github.com/elastic/go-elasticsearch v0.0.0/go.mod h1:TkBSJBuTyFdBnrNqoPc54FN0vKf5c04IdM4zuStJ7xg= github.com/elastic/go-elasticsearch/v7 v7.5.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= -github.com/elastic/go-elasticsearch/v7 v7.6.0 h1:sYpGLpEFHgLUKLsZUBfuaVI9QgHjS3JdH9fX4/z8QI8= -github.com/elastic/go-elasticsearch/v7 v7.6.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= +github.com/elastic/go-elasticsearch/v7 v7.16.0 h1:GHsxDFXIAlhSleXun4kwA89P7kQFADRChqvgOPeYP5A= +github.com/elastic/go-elasticsearch/v7 v7.16.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -104,44 +386,127 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y 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.20210217033140-668b12f5399d/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/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etsy/statsd v0.8.6 h1:DXo3DrcVHhxDHVx9rImb5no5UgqQj4MfWxe9jdRc67w= -github.com/etsy/statsd v0.8.6/go.mod h1:rmx2gVm1TEkQUIcU/KAM4prmC/AAUU8Wndeule9gvW4= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/etsy/statsd v0.9.0 h1:GLP1pAzn1fGE7/kM2S5QXSU0ZTUV6QnZsyZVMx7IVF4= +github.com/etsy/statsd v0.9.0/go.mod h1:rmx2gVm1TEkQUIcU/KAM4prmC/AAUU8Wndeule9gvW4= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= +github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= +github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= +github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= +github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= +github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= +github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= +github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= 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-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.9.0 h1:NgTtmN58D0m8+UuxtYmGztBJB7VnPgjj221I1QHci2A= -github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= +github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= +github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= +github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= +github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= +github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= +github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= +github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= +github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= +github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= +github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= +github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= +github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= +github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= +github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= +github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= +github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-migrate/migrate/v4 v4.15.1 h1:Sakl3Nm6+wQKq0Q62tpFMi5a503bgGhceo2icrgQ9vM= +github.com/golang-migrate/migrate/v4 v4.15.1/go.mod h1:/CrBenUbcDqsW29jGTR/XFqCfVi/Y6mHXlooCcSOJMQ= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= 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/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= @@ -150,6 +515,8 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt 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.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -168,8 +535,13 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= 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/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -183,10 +555,14 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-github/v35 v35.2.0/go.mod h1:s0515YVTI+IMrDoy9Y4pHt9ShGpzHvHO8rZ7L7acgvs= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -198,30 +574,72 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210715191844-86eeefc3e471/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= -github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= +github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0/go.mod h1:qrJPVzv9YlhsrxJc3P/Q85nr0w1lIRikTl4JlhdDH5w= +github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -230,16 +648,32 @@ github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= 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.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -248,19 +682,17 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.8.0 h1:FmjZ0rOyXTr1wfWs45i4a9vjnjWUAGpMuQLD9OSs+lw= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= -github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= -github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.10.0 h1:4EYhlDVEMsJ30nNj0mmgwIUXoq7e9sMJrVC2ED6QlCU= -github.com/jackc/pgconn v1.10.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 h1:WAvSpGf7MsFuzAtK4Vk7R4EVe+liW4x83r4oWu0WHKw= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= @@ -269,45 +701,81 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.1.1 h1:7PQ/4gLoqnl87ZxL7xjO0DR5gYuviDCZxQJsUlFW1eI= -github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.7 h1:6Pwi1b3QdY65cuv6SyVO0FgPd5J3Bl7wf/nQQjinHMA= +github.com/jackc/pgproto3/v2 v2.0.7/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.8.1 h1:9k0IXtdJXHJbyAWQgbWr1lU+MEhPXZz6RIXxfR5oxXs= -github.com/jackc/pgtype v1.8.1/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.6.2 h1:b3pDeuhbbzBYcg5kwNmNDun4pFUD/0AAr1kLXZLeNt8= +github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.13.0 h1:JCjhT5vmhMAf/YwBHLvrBn4OGdIQBiFG6ym8Zmdx570= -github.com/jackc/pgx/v4 v4.13.0/go.mod h1:9P4X524sErlaxj0XSGZk7s+LD0eOyu1ZDUrrpznYDF0= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.10.1 h1:/6Q3ye4myIj6AaplUm+eRcz4OhK9HAvFf4ePsG40LJY= +github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jeremywohl/flatten v1.0.1 h1:LrsxmB3hfwJuE+ptGOijix1PIfOoKLJ3Uee/mzbgtrs= github.com/jeremywohl/flatten v1.0.1/go.mod h1:4AmD/VxjWcI5SRB0n6szE2A6s2fsNHDLO0nAlMHgfLQ= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= -github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w= +github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -319,77 +787,204 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= 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/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8= -github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= +github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= +github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA= github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mcuadros/go-defaults v1.2.0 h1:FODb8WSf0uGaY8elWJAkoLL0Ri6AlZ1bFlenk56oZtc= github.com/mcuadros/go-defaults v1.2.0/go.mod h1:WEZtHEVIGYVDqkKSWBdWKUVdRyKlMfulPaGDWIVeCWY= +github.com/microcosm-cc/bluemonday v1.0.6 h1:ZOvqHKtnx0fUpnbQm3m3zKFWE+DRC+XB1onh8JoEObE= github.com/microcosm-cc/bluemonday v1.0.6/go.mod h1:HOT/6NaBlR0f9XlxD3zolN6Z3N8Lp4pvhp+jLS5ihnI= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= +github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= +github.com/muesli/reflow v0.2.0 h1:2o0UBJPHHH4fa2GCXU4Rg4DwOtWPMekCeyc5EWbAQp0= github.com/muesli/reflow v0.2.0/go.mod h1:qT22vjVmM9MIUeLgsVYe/Ye7eZlbv9dZjL3dVhUqLX8= github.com/muesli/termenv v0.8.1/go.mod h1:kzt/D/4a88RoheZmwfqorY3A+tnsSMA9HJC/fQSFKo0= +github.com/muesli/termenv v0.9.0 h1:wnbOaGz+LUR3jNT0zOzinPnyDaCZUQRZj9GxK8eRVl8= github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtlyx2mBw= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA= +github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI= github.com/newrelic/go-agent/v3 v3.0.0/go.mod h1:H28zDNUC0U/b7kLoY4EFOhuth10Xu/9dchozUiOseQQ= -github.com/newrelic/go-agent/v3 v3.10.0 h1:qHcDwtC1DjOTI0r0nCtf8jT2LfEoNQ6gSo2tcxnR6ns= -github.com/newrelic/go-agent/v3 v3.10.0/go.mod h1:1A1dssWBwzB7UemzRU6ZVaGDsI+cEn5/bNxI0wiYlIc= -github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.0 h1:8bnHOp4OcYKs4mkWtGm4vrKWVlYspEzuGBypZGIaboQ= -github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.0/go.mod h1:MqWii42Cz9ouZ3OGXaqoNrflnkF8e73aG/v7jLIzH2w= -github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.0 h1:3RDWj/QcU5CBP0lJnkh4CwK7tIxsSH53C+GPo5OGFCE= -github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.0/go.mod h1:1XnCVdRSKjS5ikMycFh7VKXBkk0oYPaKQb+sd6aSCoA= +github.com/newrelic/go-agent/v3 v3.15.2 h1:NEpksu2AhuZncbwkDqUg2IvUJst3JQ/TemYfK4WdS/Y= +github.com/newrelic/go-agent/v3 v3.15.2/go.mod h1:1A1dssWBwzB7UemzRU6ZVaGDsI+cEn5/bNxI0wiYlIc= +github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.1 h1:Nl7vZKfBq5GmS0SOGcwUnL9eHI3CQAC/TYcr5u2zWW4= +github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7 v1.0.1/go.mod h1:MqWii42Cz9ouZ3OGXaqoNrflnkF8e73aG/v7jLIzH2w= +github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.1 h1:9SyybWTkOSffuwCAp8oUcMZghFkGLWZUkPC/38AvjxU= +github.com/newrelic/go-agent/v3/integrations/nrgorilla v1.1.1/go.mod h1:1XnCVdRSKjS5ikMycFh7VKXBkk0oYPaKQb+sd6aSCoA= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/odpf/salt v0.0.0-20211028100023-de463ef825e1 h1:iFoq6ugjCrjmZ4eS4AS/HoFwX+uQVSxVpX/qJF4lMzs= -github.com/odpf/salt v0.0.0-20211028100023-de463ef825e1/go.mod h1:NVnVQaXur70W/1wo06X6DYu6utZIUI/bMeMGyvFIwyo= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/odpf/salt v0.0.0-20220106155451-62e8c849ae81 h1:kZvnrHtQX5WcftjLvaVIZ83mm8QCIg71Vzu34xwl4rw= +github.com/odpf/salt v0.0.0-20220106155451-62e8c849ae81/go.mod h1:kmqHb7LvWQxMKTf1b60P8eNUfdO68Ttx7VZAJiElTNA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/olivere/elastic/v7 v7.0.12 h1:91kj/UMKWQt8VAHBm5BDHpVmzdfPCmICaUFy2oH4LkQ= -github.com/olivere/elastic/v7 v7.0.12/go.mod h1:14rWX28Pnh3qCKYRVnSGXWLf9MbLonYS/4FDCY3LAPo= +github.com/olivere/elastic/v7 v7.0.31 h1:VJu9/zIsbeiulwlRCfGQf6Tzsr++uo+FeUgj5oj+xKk= +github.com/olivere/elastic/v7 v7.0.31/go.mod h1:idEQxe7Es+Wr4XAuNnJdKeMZufkA9vQprOIFck061vg= +github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= +github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= +github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= +github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= +github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/ory/dockertest/v3 v3.8.1 h1:vU/8d1We4qIad2YM0kOwRVtnyue7ExvacPiw1yDm17g= +github.com/ory/dockertest/v3 v3.8.1/go.mod h1:wSRQ3wmkz+uSARYMk7kVJFDBGm8x5gSxIhI7NDc+BAQ= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= +github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -397,24 +992,50 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= @@ -423,45 +1044,78 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= -github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/gunit v1.1.3/go.mod h1:EH5qMBab2UclzXUcpR8b93eHsIlp9u+pDQIRp5DZNzQ= +github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak= +github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= +github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= +github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= +github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -471,19 +1125,69 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= +github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= +github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.3/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.3.5 h1:dPmz1Snjq0kmkz159iL7S6WzdahUTHnHB5M56WFVifs= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os= github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= go.buf.build/odpf/gw/grpc-ecosystem/grpc-gateway v1.1.35/go.mod h1:/LuddrGPi0fwj7ay6Orutt8oFfPz8Y3c8qdBkacJq1A= go.buf.build/odpf/gw/odpf/proton v1.1.9/go.mod h1:I9E8CF7w/690vRNWqBU6qDcUbi3Pi2THdn1yycBVTDQ= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= +go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= +go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= 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= @@ -494,46 +1198,68 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= 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-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= +golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/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= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= 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/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= 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/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -557,23 +1283,36 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -588,18 +1327,30 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/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= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -611,11 +1362,17 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -623,34 +1380,60 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -661,27 +1444,58 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/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-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/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-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486 h1:5hpz5aRr+W1erYCL5JRhSUBJRph7l9XkNveoExlrKYk= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 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= @@ -693,26 +1507,40 @@ 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 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -725,7 +1553,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -747,12 +1574,16 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -761,6 +1592,13 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= +gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= +google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -783,18 +1621,34 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= 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/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= 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= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -803,6 +1657,7 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -823,21 +1678,52 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83 h1:3V2dxSZpz4zozWWUq36vUxXEKnSYitEH2LdsAx+RUmg= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79/go.mod h1:yiaVoXHpRzHGyxV3o4DktVWY4mSUErTKaeEOq6C3t3U= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210721163202-f1cecdd8b78a/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210726143408-b02e89920bf0/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211013025323-ce878158c4d4/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= 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.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -853,10 +1739,18 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 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.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= 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= @@ -871,22 +1765,37 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/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/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -894,13 +1803,14 @@ 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 h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/postgres v1.2.2 h1:Ka9W6feOU+rPM9m007eYLMD4QoZuYGBnQ3Jp0faGSwg= -gorm.io/driver/postgres v1.2.2/go.mod h1:Ik3tK+a3FMp8ORZl29v4b3M0RsgXsaeMXh9s9eVMXco= -gorm.io/driver/sqlite v1.2.6 h1:SStaH/b+280M7C8vXeZLz/zo9cLQmIGwwj3cSj7p6l4= -gorm.io/driver/sqlite v1.2.6/go.mod h1:gyoX0vHiiwi0g49tv+x2E7l8ksauLK0U/gShcdUsjWY= -gorm.io/gorm v1.22.2/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= -gorm.io/gorm v1.22.3 h1:/JS6z+GStEQvJNW3t1FTwJwG/gZ+A7crFdRqtvG5ehA= -gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= +gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg= +gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.21.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -908,6 +1818,64 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= +k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= +k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= +k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= +k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg= +modernc.org/cc/v3 v3.32.4/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878= +modernc.org/ccgo/v3 v3.9.2/go.mod h1:gnJpy6NIVqkETT+L5zPsQFj7L2kkhfPMzOghRNv/CFo= +modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8= +modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw= +modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= +modernc.org/internal v1.0.0/go.mod h1:VUD/+JAkhCpvkUitlEOnhpVxCgsBI90oTzSCRcqQVSM= +modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/libc v1.9.5/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= +modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY= +modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= +modernc.org/sqlite v1.10.6/go.mod h1:Z9FEjUtZP4qFEg6/SiADg9XCER7aYy9a/j7Pg9P7CPs= +modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo= +modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA= +modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA= +modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/main.go b/main.go index 4f9768ed..44711603 100644 --- a/main.go +++ b/main.go @@ -89,7 +89,7 @@ func migrateCmd() *cobra.Command { "group:core": "true", }, RunE: func(command *cobra.Command, args []string) error { - cmd.Migrate() + cmd.RunMigrate() return nil }, diff --git a/store/postgres/config.go b/store/postgres/config.go new file mode 100644 index 00000000..9d3438d5 --- /dev/null +++ b/store/postgres/config.go @@ -0,0 +1,31 @@ +package postgres + +import ( + "net" + "net/url" + "strconv" +) + +type Config struct { + Host string + Port int + Name string + User string + Password string + SSLMode string +} + +// ConnectionURL +func (c *Config) ConnectionURL() *url.URL { + pgURL := &url.URL{ + Scheme: "postgres", + Host: net.JoinHostPort(c.Host, strconv.Itoa(c.Port)), + User: url.UserPassword(c.User, c.Password), + Path: c.Name, + } + q := pgURL.Query() + q.Add("sslmode", "disable") + pgURL.RawQuery = q.Encode() + + return pgURL +} diff --git a/store/postgres/errors.go b/store/postgres/errors.go index d4b6ea35..ec885273 100644 --- a/store/postgres/errors.go +++ b/store/postgres/errors.go @@ -3,5 +3,6 @@ package postgres import "errors" var ( - errNilDBClient = errors.New("db client is nil") + errNilDBClient = errors.New("db client is nil") + errDuplicateKey = errors.New("duplicate key") ) diff --git a/store/postgres/migrations/000001_create_tags_templates_fields_table.down.sql b/store/postgres/migrations/000001_create_tags_templates_fields_table.down.sql new file mode 100644 index 00000000..d5c42068 --- /dev/null +++ b/store/postgres/migrations/000001_create_tags_templates_fields_table.down.sql @@ -0,0 +1,9 @@ +BEGIN; + +DROP TABLE IF EXISTS tags; + +DROP TABLE IF EXISTS tag_template_fields; + +DROP TABLE IF EXISTS tag_templates; + +COMMIT; \ No newline at end of file diff --git a/store/postgres/migrations/000001_create_tags_templates_fields_table.up.sql b/store/postgres/migrations/000001_create_tags_templates_fields_table.up.sql new file mode 100644 index 00000000..c12351d2 --- /dev/null +++ b/store/postgres/migrations/000001_create_tags_templates_fields_table.up.sql @@ -0,0 +1,38 @@ +BEGIN; + +CREATE TABLE tag_templates ( + urn text PRIMARY KEY, + display_name text NOT NULL, + description text NOT NULL, + created_at timestamp DEFAULT NOW(), + updated_at timestamp DEFAULT NOW() +); + +CREATE TABLE tag_template_fields ( + id bigserial PRIMARY KEY, + urn text NOT NULL, + display_name text NOT NULL, + description text NOT NULL, + data_type text NOT NULL, + options text, + required boolean NOT NULL, + template_urn text NOT NULL REFERENCES tag_templates(urn) ON DELETE CASCADE, + created_at timestamp DEFAULT NOW(), + updated_at timestamp DEFAULT NOW() +); + +CREATE UNIQUE INDEX tag_template_fields_idx_urn_template_urn ON tag_template_fields(urn,template_urn); + +CREATE TABLE tags ( + id bigserial PRIMARY KEY, + value text NOT NULL, + record_urn text NOT NULL, + record_type text NOT NULL, + field_id bigint NOT NULL REFERENCES tag_template_fields(id) ON DELETE CASCADE, + created_at timestamp DEFAULT NOW(), + updated_at timestamp DEFAULT NOW() +); + +CREATE UNIQUE INDEX tags_idx_record_urn_record_type_field_id ON tags(record_urn,record_type,field_id); + +COMMIT; \ No newline at end of file diff --git a/store/postgres/model.go b/store/postgres/model.go deleted file mode 100644 index 02c0c0af..00000000 --- a/store/postgres/model.go +++ /dev/null @@ -1,40 +0,0 @@ -package postgres - -import "time" - -// Tag is a model for tag value in database table -type Tag struct { - ID uint `gorm:"primaryKey"` - Value string `gorm:"not null"` - RecordType string `gorm:"not null;uniqueIndex:tag_idx_record_urn_record_type_field_id"` - RecordURN string `gorm:"not null;uniqueIndex:tag_idx_record_urn_record_type_field_id"` - FieldID uint `gorm:"not null;uniqueIndex:tag_idx_record_urn_record_type_field_id"` - Field Field `gorm:"not null;constraint:OnDelete:CASCADE"` - CreatedAt time.Time - UpdatedAt time.Time -} - -// Template is a model for template database table -type Template struct { - URN string `gorm:"primaryKey"` - DisplayName string `gorm:"not null"` - Description string `gorm:"not null"` - Fields []Field `gorm:"not null"` - CreatedAt time.Time - UpdatedAt time.Time -} - -// Field is a model for field tag in database table -type Field struct { - ID uint `gorm:"primaryKey"` - URN string `gorm:"not null;uniqueIndex:field_idx_urn_template_urn"` - DisplayName string `gorm:"not null"` - Description string `gorm:"not null"` - DataType string `gorm:"not null"` - Options *string - Required bool `gorm:"not null"` - TemplateURN string `gorm:"not null;uniqueIndex:field_idx_urn_template_urn"` - Template Template `gorm:"not null;constraint:OnDelete:CASCADE"` - CreatedAt time.Time - UpdatedAt time.Time -} diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go new file mode 100644 index 00000000..ed99f339 --- /dev/null +++ b/store/postgres/postgres.go @@ -0,0 +1,118 @@ +//go:build go1.16 +// +build go1.16 + +package postgres + +import ( + "context" + "embed" + "errors" + "fmt" + "log" + + "github.com/golang-migrate/migrate/v4" + "github.com/sirupsen/logrus" + + // Register database postgres + _ "github.com/golang-migrate/migrate/v4/database/postgres" + // Register golang migrate source + "github.com/golang-migrate/migrate/v4/source/iofs" + + "github.com/jackc/pgconn" + "github.com/jackc/pgerrcode" + _ "github.com/jackc/pgx/v4/stdlib" + + "github.com/jmoiron/sqlx" +) + +//go:embed migrations/*.sql +var fs embed.FS + +type Client struct { + db *sqlx.DB +} + +func (c *Client) RunWithinTx(ctx context.Context, f func(tx *sqlx.Tx) error) error { + tx, err := c.db.BeginTxx(ctx, nil) + if err != nil { + return fmt.Errorf("starting transaction: %w", err) + } + + if err := f(tx); err != nil { + if txErr := tx.Rollback(); txErr != nil { + return fmt.Errorf("rollback transaction error: %v (original error: %w)", txErr, err) + } + return err + } + + if err := tx.Commit(); err != nil { + return fmt.Errorf("committing transaction: %w", err) + } + + return nil +} + +func (c *Client) Migrate(cfg Config) (err error) { + m, err := initMigration(cfg) + if err != nil { + return fmt.Errorf("migration failed: %w", err) + } + + if err := m.Up(); err != nil { + if err == migrate.ErrNoChange { + return nil + } + return fmt.Errorf("migration failed: %w", err) + } + return nil +} + +// ExecQueries is used for executing list of db query +func (c *Client) ExecQueries(ctx context.Context, queries []string) error { + for _, query := range queries { + _, err := c.db.ExecContext(ctx, query) + if err != nil { + return err + } + } + return nil +} + +func (c *Client) Close() error { + return c.db.Close() +} + +// NewClient initializes database connection +func NewClient(logger logrus.FieldLogger, cfg Config) (*Client, error) { + db, err := sqlx.Connect("pgx", cfg.ConnectionURL().String()) + if err != nil { + return nil, fmt.Errorf("error creating and connecting DB: %w", err) + } + if db == nil { + return nil, errNilDBClient + } + return &Client{db}, nil +} + +func initMigration(cfg Config) (*migrate.Migrate, error) { + iofsDriver, err := iofs.New(fs, "migrations") + if err != nil { + log.Fatal(err) + } + m, err := migrate.NewWithSourceInstance("iofs", iofsDriver, cfg.ConnectionURL().String()) + if err != nil { + log.Fatal(err) + } + return m, nil +} + +func checkPostgresError(err error) error { + var pgErr *pgconn.PgError + if errors.As(err, &pgErr) { + switch pgErr.Code { + case pgerrcode.UniqueViolation: + return fmt.Errorf("%w [%s]", errDuplicateKey, pgErr.Detail) + } + } + return err +} diff --git a/store/postgres/postgres_test.go b/store/postgres/postgres_test.go new file mode 100644 index 00000000..b5aaaa3e --- /dev/null +++ b/store/postgres/postgres_test.go @@ -0,0 +1,128 @@ +package postgres_test + +import ( + "context" + "fmt" + "strconv" + "time" + + _ "github.com/jackc/pgx/v4/stdlib" + "github.com/odpf/columbus/store/postgres" + "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3/docker" + "github.com/sirupsen/logrus" +) + +var ( + pgConfig = postgres.Config{ + Host: "localhost", + User: "test_user", + Password: "test_pass", + Name: "test_db", + } +) + +func newTestClient(logger *logrus.Logger) (*postgres.Client, *dockertest.Pool, *dockertest.Resource, error) { + + opts := &dockertest.RunOptions{ + Repository: "postgres", + Tag: "13", + Env: []string{ + "POSTGRES_PASSWORD=" + pgConfig.Password, + "POSTGRES_USER=" + pgConfig.User, + "POSTGRES_DB=" + pgConfig.Name, + }, + } + + // uses a sensible default on windows (tcp/http) and linux/osx (socket) + pool, err := dockertest.NewPool("") + if err != nil { + return nil, nil, nil, fmt.Errorf("Could not create dockertest pool: %w", err) + } + + // pulls an image, creates a container based on it and runs it + resource, err := pool.RunWithOptions(opts, func(config *docker.HostConfig) { + // set AutoRemove to true so that stopped container goes away by itself + config.AutoRemove = true + config.RestartPolicy = docker.RestartPolicy{Name: "no"} + }) + if err != nil { + return nil, nil, nil, fmt.Errorf("Could not start resource: %w", err) + } + + pgConfig.Port, err = strconv.Atoi(resource.GetPort("5432/tcp")) + if err != nil { + return nil, nil, nil, fmt.Errorf("cannot parse external port of container to int: %w", err) + } + + // attach terminal logger to container if exists + // for debugging purpose + if logger.Level == logrus.DebugLevel { + logWaiter, err := pool.Client.AttachToContainerNonBlocking(docker.AttachToContainerOptions{ + Container: resource.Container.ID, + OutputStream: logger.Writer(), + ErrorStream: logger.Writer(), + Stderr: true, + Stdout: true, + Stream: true, + }) + if err != nil { + logger.WithError(err).Fatal("Could not connect to postgres container log output") + } + defer func() { + err = logWaiter.Close() + if err != nil { + logger.WithError(err).Error("Could not close container log") + } + + err = logWaiter.Wait() + if err != nil { + logger.WithError(err).Error("Could not wait for container log to close") + } + }() + } + + resource.Expire(120) // Tell docker to hard kill the container in 120 seconds + + // exponential backoff-retry, because the application in the container might not be ready to accept connections yet + pool.MaxWait = 60 * time.Second + + var pgClient *postgres.Client + if err = pool.Retry(func() error { + pgClient, err = postgres.NewClient(logger, pgConfig) + if err != nil { + return err + } + + return nil + }); err != nil { + return nil, nil, nil, fmt.Errorf("Could not connect to docker: %w", err) + } + + err = setup(context.Background(), pgClient) + if err != nil { + logger.Fatal(err) + } + return pgClient, pool, resource, nil +} + +func purgeDocker(pool *dockertest.Pool, resource *dockertest.Resource) error { + if err := pool.Purge(resource); err != nil { + return fmt.Errorf("Could not purge resource: %w", err) + } + return nil +} + +func setup(ctx context.Context, client *postgres.Client) (err error) { + var queries = []string{ + "DROP SCHEMA public CASCADE", + "CREATE SCHEMA public", + } + err = client.ExecQueries(ctx, queries) + if err != nil { + return + } + + err = client.Migrate(pgConfig) + return +} diff --git a/store/postgres/setup.go b/store/postgres/setup.go deleted file mode 100644 index c4e68cda..00000000 --- a/store/postgres/setup.go +++ /dev/null @@ -1,33 +0,0 @@ -package postgres - -import ( - "fmt" - "strings" - - "gorm.io/driver/postgres" - "gorm.io/gorm" -) - -type Config struct { - Host string - Port int - Name string - User string - Password string - SSLMode string -} - -// NewClient initializes database connection -func NewClient(cfg Config) (*gorm.DB, error) { - dsn := fmt.Sprintf( - "host=%s port=%d dbname=%s user=%s password=%s sslmode=%s", - strings.TrimSpace(cfg.Host), - cfg.Port, - strings.TrimSpace(cfg.Name), - strings.TrimSpace(cfg.User), - strings.TrimSpace(cfg.Password), - strings.TrimSpace(cfg.SSLMode), - ) - - return gorm.Open(postgres.Open(dsn), &gorm.Config{}) -} diff --git a/store/postgres/tag_model.go b/store/postgres/tag_model.go new file mode 100644 index 00000000..206b1556 --- /dev/null +++ b/store/postgres/tag_model.go @@ -0,0 +1,306 @@ +package postgres + +import ( + "strings" + "time" + + "github.com/odpf/columbus/tag" +) + +// TagModel is a model for tag value in database table +type TagModel struct { + ID uint `db:"id"` + Value string `db:"value"` + RecordURN string `db:"record_urn"` + RecordType string `db:"record_type"` + FieldID uint `db:"field_id"` + CreatedAt time.Time `db:"created_at"` + UpdatedAt time.Time `db:"updated_at"` + Field TagTemplateFieldModel `db:"-"` +} + +type TagModels []TagModel + +func (ts TagModels) buildMapByTemplateURN() map[string][]TagModel { + tagsByTemplateURN := make(map[string][]TagModel) + for _, t := range ts { + key := t.Field.TemplateURN + if tagsByTemplateURN[key] == nil { + tagsByTemplateURN[key] = []TagModel{} + } + tagsByTemplateURN[key] = append(tagsByTemplateURN[key], t) + } + return tagsByTemplateURN +} + +func (ts TagModels) toTags(recordType, recordURN string, templates TagTemplateModels) []tag.Tag { + templateByURN := templates.buildMapByURN() + tagsByTemplateURN := ts.buildMapByTemplateURN() + + output := []tag.Tag{} + for templateURN, tagModels := range tagsByTemplateURN { + var listOfTagValue []tag.TagValue + templateModel := templateByURN[templateURN] + for _, t := range tagModels { + var options []string + if t.Field.Options != nil { + options = strings.Split(*t.Field.Options, ",") + } + parsedValue, _ := tag.ParseTagValue(templateModel.URN, t.FieldID, t.Field.DataType, t.Value, options) + listOfTagValue = append(listOfTagValue, tag.TagValue{ + FieldID: t.FieldID, + FieldValue: parsedValue, + FieldURN: t.Field.URN, + FieldDisplayName: t.Field.DisplayName, + FieldDescription: t.Field.Description, + FieldDataType: t.Field.DataType, + FieldOptions: options, + FieldRequired: t.Field.Required, + CreatedAt: t.CreatedAt, + UpdatedAt: t.UpdatedAt, + }) + } + output = append(output, tag.Tag{ + RecordType: recordType, + RecordURN: recordURN, + TemplateURN: templateModel.URN, + TagValues: listOfTagValue, + TemplateDisplayName: templateModel.DisplayName, + TemplateDescription: templateModel.Description, + }) + } + return output +} + +// TagTemplateModel is a model for template database table +type TagTemplateModel struct { + URN string `db:"urn"` + DisplayName string `db:"display_name"` + Description string `db:"description"` + CreatedAt time.Time `db:"created_at"` + UpdatedAt time.Time `db:"updated_at"` + Fields TagTemplateFieldModels `db:"-"` +} + +func (tmp *TagTemplateModel) toTemplate() tag.Template { + return tag.Template{ + URN: tmp.URN, + DisplayName: tmp.DisplayName, + Description: tmp.Description, + Fields: tmp.Fields.toDomainFields(), + CreatedAt: tmp.CreatedAt, + UpdatedAt: tmp.UpdatedAt, + } +} + +func newTemplateModel(template *tag.Template) *TagTemplateModel { + fieldModels := newSliceOfFieldModel(template.Fields) + + return &TagTemplateModel{ + URN: template.URN, + DisplayName: template.DisplayName, + Description: template.Description, + Fields: fieldModels, + } +} + +type TagTemplateModels []TagTemplateModel + +func (tmps TagTemplateModels) buildMapByURN() map[string]TagTemplateModel { + templateByURN := make(map[string]TagTemplateModel) + for _, t := range tmps { + templateByURN[t.URN] = t + } + return templateByURN +} + +// TagTemplateFieldModel is a model for field tag in database table +type TagTemplateFieldModel struct { + ID uint `db:"id"` + URN string `db:"urn"` + DisplayName string `db:"display_name"` + Description string `db:"description"` + DataType string `db:"data_type"` + Options *string `db:"options"` + Required bool `db:"required"` + TemplateURN string `db:"template_urn"` + CreatedAt time.Time `db:"created_at"` + UpdatedAt time.Time `db:"updated_at"` + Template TagTemplateModel `db:"-"` +} + +type TagTemplateFieldModels []TagTemplateFieldModel + +func (fs *TagTemplateFieldModels) isIDExist(id uint) bool { + for _, field := range *fs { + if field.ID == id { + return true + } + } + return false +} + +func (fs *TagTemplateFieldModels) toDomainFields() []tag.Field { + output := make([]tag.Field, len(*fs)) + for i, field := range *fs { + var options []string + if field.Options != nil { + options = strings.Split(*field.Options, fieldOptionSeparator) + } + output[i] = tag.Field{ + ID: field.ID, + URN: field.URN, + DisplayName: field.DisplayName, + Description: field.Description, + DataType: field.DataType, + Options: options, + Required: field.Required, + CreatedAt: field.CreatedAt, + UpdatedAt: field.UpdatedAt, + } + } + return output +} + +func newSliceOfFieldModel(listOfDomainField []tag.Field) TagTemplateFieldModels { + newFields := TagTemplateFieldModels{} + for _, field := range listOfDomainField { + var options *string + if len(field.Options) > 0 { + joinedOptions := strings.Join(field.Options, fieldOptionSeparator) + options = &joinedOptions + } + newFields = append(newFields, TagTemplateFieldModel{ + ID: field.ID, + URN: field.URN, + DisplayName: field.DisplayName, + Description: field.Description, + DataType: field.DataType, + Options: options, + Required: field.Required, + }) + } + return newFields +} + +// TagJoinTemplateFieldModel is a placeholder for joined template and field +type TagJoinTemplateFieldModel struct { + Template TagTemplateModel `db:"tag_templates"` + Field TagTemplateFieldModel `db:"tag_template_fields"` +} + +// TagJoinTemplateFieldModels is a slice of placeholder for joined template and field +type TagJoinTemplateFieldModels []TagJoinTemplateFieldModel + +func (tfs TagJoinTemplateFieldModels) toTemplateModels() (templates []TagTemplateModel) { + templateMap := make(map[string]TagTemplateModel, 0) + + for _, tf := range tfs { + if _, ok := templateMap[tf.Template.URN]; !ok { + templateMap[tf.Template.URN] = tf.Template + } + templatePtr := templateMap[tf.Template.URN] + // check existing field + if !templatePtr.Fields.isIDExist(tf.Field.ID) { + templatePtr.Fields = append(templatePtr.Fields, tf.Field) + templateMap[tf.Template.URN] = templatePtr + } + } + + for _, t := range templateMap { + templates = append(templates, t) + } + + return +} + +func (tfs TagJoinTemplateFieldModels) toTemplates() (templates []tag.Template) { + templatesMap := map[string]TagTemplateModel{} + for _, tf := range tfs { + // build template + if _, ok := templatesMap[tf.Template.URN]; !ok { + templatesMap[tf.Template.URN] = tf.Template + } + + templatePtr := templatesMap[tf.Template.URN] + // check existing field + if !templatePtr.Fields.isIDExist(tf.Field.ID) { + templatePtr.Fields = append(templatePtr.Fields, tf.Field) + templatesMap[tf.Template.URN] = templatePtr + } + } + + for _, template := range templatesMap { + listOfDomainField := []tag.Field{} + for _, field := range template.Fields { + var options []string + if field.Options != nil { + options = strings.Split(*field.Options, ",") + } + listOfDomainField = append(listOfDomainField, tag.Field{ + ID: field.ID, + URN: field.URN, + DisplayName: field.DisplayName, + Description: field.Description, + DataType: field.DataType, + Required: field.Required, + Options: options, + CreatedAt: field.CreatedAt, + UpdatedAt: field.UpdatedAt, + }) + } + + templates = append(templates, tag.Template{ + URN: template.URN, + DisplayName: template.DisplayName, + Description: template.Description, + Fields: listOfDomainField, + CreatedAt: template.CreatedAt, + UpdatedAt: template.UpdatedAt, + }) + } + return +} + +// TemplateField is a placeholder for joined template, tag, and field +type TagJoinTemplateTagFieldModel struct { + Template TagTemplateModel `db:"tag_templates"` + Tag TagModel `db:"tags"` + Field TagTemplateFieldModel `db:"tag_template_fields"` +} + +// TagJoinTemplateTagFieldModels is a slice of placeholder for joined template, tag, and field +type TagJoinTemplateTagFieldModels []TagJoinTemplateTagFieldModel + +func (ttfs TagJoinTemplateTagFieldModels) toTemplateAndTagModels() (templates TagTemplateModels, tags TagModels) { + tmpltsMap := make(map[string]TagTemplateModel, 0) // template urn as key + tagsMap := make(map[uint]TagModel, 0) + + for _, ttf := range ttfs { + // build template + if _, ok := tmpltsMap[ttf.Template.URN]; !ok { + tmpltsMap[ttf.Template.URN] = ttf.Template + } + + templatePtr := tmpltsMap[ttf.Template.URN] + // check existing field + if !templatePtr.Fields.isIDExist(ttf.Field.ID) { + templatePtr.Fields = append(templatePtr.Fields, ttf.Field) + tmpltsMap[ttf.Template.URN] = templatePtr + } + + if _, ok := tagsMap[ttf.Tag.ID]; !ok { + ttf.Tag.Field = ttf.Field + tagsMap[ttf.Tag.ID] = ttf.Tag + } + } + + for _, tmp := range tmpltsMap { + templates = append(templates, tmp) + } + + for _, tg := range tagsMap { + tags = append(tags, tg) + } + return +} diff --git a/store/postgres/tag_model_test.go b/store/postgres/tag_model_test.go new file mode 100644 index 00000000..c60b494b --- /dev/null +++ b/store/postgres/tag_model_test.go @@ -0,0 +1,348 @@ +package postgres + +import ( + "sort" + "testing" + + "github.com/odpf/columbus/tag" + "github.com/stretchr/testify/assert" +) + +func TestTagModel(t *testing.T) { + + recordType := "sample-type" + recordURN := "sample-urn" + + templates := getTemplateModels() + tags := getTagModels() + + t.Run("successfully build map of tags model by template URN", func(t *testing.T) { + expectedTagsMap := map[string][]TagModel{ + "governance_policy": {tags[0], tags[1]}, + } + tagsMap := tags.buildMapByTemplateURN() + + assert.EqualValues(t, expectedTagsMap, tagsMap) + + }) + t.Run("successfully build tags from tags model", func(t *testing.T) { + + expectedTagDomains := []tag.Tag{ + { + RecordType: "sample-type", + RecordURN: "sample-urn", + TemplateURN: "governance_policy", + TagValues: []tag.TagValue{ + { + FieldID: 1, + FieldValue: "Public", + FieldURN: "classification", + FieldDisplayName: "classification", + FieldDescription: "The classification of this record", + FieldDataType: "enumerated", + FieldOptions: []string{"Public", "Restricted"}, + FieldRequired: true, + }, { + FieldID: 2, + FieldValue: "dexter@odpf.io", + FieldURN: "admin_email", + FieldDisplayName: "Admin Email", + FieldDescription: "Email of the admin of therecord.", + FieldDataType: "string", + FieldRequired: true, + }}, + TemplateDisplayName: "Governance Policy", + TemplateDescription: "Template that is mandatory to be used.", + }} + + actualTagDomains := tags.toTags(recordType, recordURN, templates) + + assert.EqualValues(t, expectedTagDomains, actualTagDomains) + }) +} + +func TestTemplateModel(t *testing.T) { + + templates := getTemplateModels() + + t.Run("successfully convert template model to template", func(t *testing.T) { + expectedTemplate := tag.Template{ + URN: "governance_policy", + DisplayName: "Governance Policy", + Description: "Template that is mandatory to be used.", + Fields: []tag.Field{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Options: []string{"Public", "Restricted"}, + Required: true, + }, + { + ID: 2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Required: true, + }, + }, + } + actualTemplate := templates[0].toTemplate() + + assert.EqualValues(t, expectedTemplate, actualTemplate) + }) + + t.Run("successfully build from template model from template", func(t *testing.T) { + + template := getTemplate() + option := "Public,Restricted" + expectedTemplateModel := &TagTemplateModel{ + URN: "governance_policy", + DisplayName: "Governance Policy", + Description: "Template that is mandatory to be used.", + Fields: TagTemplateFieldModels{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Options: &option, + Required: true, + }, + { + ID: 0x2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Required: true, + }, + }, + } + + templateModel := newTemplateModel(template) + + assert.EqualValues(t, expectedTemplateModel, templateModel) + }) +} + +func TestFieldModels(t *testing.T) { + fieldModels := getFieldModels() + t.Run("successfully convert fields model to fields", func(t *testing.T) { + expectedDomainFields := []tag.Field{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Options: []string{"Public", "Restricted"}, + Required: true, + }, + { + ID: 2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Required: true, + }, + } + actualDomainFields := fieldModels.toDomainFields() + + assert.EqualValues(t, expectedDomainFields, actualDomainFields) + }) + + t.Run("successfully build fields model from fields", func(t *testing.T) { + domainFields := fieldModels.toDomainFields() + option := "Public,Restricted" + expectedFieldModels := TagTemplateFieldModels{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Options: &option, + Required: true, + }, + { + ID: 2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Required: true, + }, + } + + actualFieldModels := newSliceOfFieldModel(domainFields) + + assert.EqualValues(t, expectedFieldModels, actualFieldModels) + }) + + t.Run("return true if ID exist in slice of fields model", func(t *testing.T) { + assert.True(t, fieldModels.isIDExist(1)) + }) + t.Run("return false if ID exist in slice of field model", func(t *testing.T) { + assert.False(t, fieldModels.isIDExist(100)) + }) +} + +func TestTemplateFields(t *testing.T) { + tfs := getTemplateFieldModels() + templateModels := getTemplateModels() + templates := getTemplate() + t.Run("successfully build template models", func(t *testing.T) { + + actualTemplateModels := tfs.toTemplateModels() + + assert.EqualValues(t, templateModels[0], actualTemplateModels[0]) + }) + t.Run("successfully build templates", func(t *testing.T) { + actualTemplates := tfs.toTemplates() + + assert.EqualValues(t, *templates, actualTemplates[0]) + }) +} + +func TestTemplateTagFields(t *testing.T) { + ttfs := getTemplateTagFieldModels() + t.Run("successfully build templates model and tags model", func(t *testing.T) { + + expectedTemplateModels := getTemplateModels() + expectedTagModels := getTagModels() + actualTemplateModels, actualTagModels := ttfs.toTemplateAndTagModels() + assert.EqualValues(t, expectedTemplateModels[0], actualTemplateModels[0]) + + sort.Slice(actualTagModels[:], func(i, j int) bool { + return actualTagModels[i].ID < actualTagModels[j].ID + }) + sort.Slice(expectedTagModels[:], func(i, j int) bool { + return expectedTagModels[i].ID < expectedTagModels[j].ID + }) + assert.EqualValues(t, expectedTagModels[0], actualTagModels[0]) + }) +} + +func getFieldModels() TagTemplateFieldModels { + option := "Public,Restricted" + return TagTemplateFieldModels{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Options: &option, + Required: true, + TemplateURN: "governance_policy", + }, + { + ID: 2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Options: nil, + Required: true, + TemplateURN: "governance_policy", + }, + } +} + +func getTemplate() *tag.Template { + return &tag.Template{ + URN: "governance_policy", + DisplayName: "Governance Policy", + Description: "Template that is mandatory to be used.", + Fields: []tag.Field{ + { + ID: 1, + URN: "classification", + DisplayName: "classification", + Description: "The classification of this record", + DataType: "enumerated", + Required: true, + Options: []string{"Public", "Restricted"}, + }, + { + ID: 2, + URN: "admin_email", + DisplayName: "Admin Email", + Description: "Email of the admin of therecord.", + DataType: "string", + Required: true, + }, + }, + } +} + +func getTemplateModels() TagTemplateModels { + fields := getFieldModels() + return TagTemplateModels{ + { + URN: "governance_policy", + DisplayName: "Governance Policy", + Description: "Template that is mandatory to be used.", + Fields: fields, + }, + } +} + +func getTagModels() TagModels { + fields := getFieldModels() + return TagModels{ + { + ID: 1, + Value: "Public", + RecordURN: "sample-urn", + RecordType: "sample-type", + FieldID: 1, + Field: fields[0], + }, + { + ID: 2, + Value: "dexter@odpf.io", + RecordURN: "sample-urn", + RecordType: "sample-type", + FieldID: 2, + Field: fields[1], + }, + } +} + +func getTemplateFieldModels() TagJoinTemplateFieldModels { + templates := getTemplateModels() + return TagJoinTemplateFieldModels{ + { + Template: templates[0], + Field: templates[0].Fields[0], + }, + { + Template: templates[0], + Field: templates[0].Fields[1], + }, + } +} + +func getTemplateTagFieldModels() TagJoinTemplateTagFieldModels { + templates := getTemplateModels() + tags := getTagModels() + return TagJoinTemplateTagFieldModels{ + { + Template: templates[0], + Tag: tags[0], + Field: templates[0].Fields[0], + }, + { + Template: templates[0], + Tag: tags[1], + Field: templates[0].Fields[1], + }, + } +} diff --git a/store/postgres/tag_repository.go b/store/postgres/tag_repository.go index 670c2b3d..e680eafc 100644 --- a/store/postgres/tag_repository.go +++ b/store/postgres/tag_repository.go @@ -1,319 +1,261 @@ package postgres import ( + "context" + "errors" "fmt" - "strings" + "time" - "github.com/jackc/pgconn" - "github.com/jackc/pgerrcode" + "github.com/jmoiron/sqlx" "github.com/odpf/columbus/tag" - "github.com/pkg/errors" - - "gorm.io/gorm" ) var ( - errNilDomainTag = errors.New("domain tag is nil") + errNilTag = errors.New("tag is nil") errEmptyRecordType = errors.New("record type should not be empty") errEmptyRecordURN = errors.New("record urn should not be empty") ) // TagRepository is a type that manages tag operation ot the primary database type TagRepository struct { - dbClient *gorm.DB + client *Client } // Create inserts tag to database -func (r *TagRepository) Create(domainTag *tag.Tag) error { - if r.dbClient == nil { - return errNilDBClient - } +func (r *TagRepository) Create(ctx context.Context, domainTag *tag.Tag) error { if domainTag == nil { - return errNilDomainTag + return errNilTag } - recordModelTemplate, err := r.getTemplateWithFields(domainTag.TemplateURN) + + templateFieldModels, err := readTemplatesByURNFromDB(ctx, r.client.db, domainTag.TemplateURN) if err != nil { return err } - domainTemplate := r.convertToDomainTemplate(recordModelTemplate) - err = r.dbClient.Transaction(func(tx *gorm.DB) error { - return r.insertDomainTagToDB(tx, domainTag) - }) - if err != nil { - return err + + if len(templateFieldModels) < 1 { + return tag.TemplateNotFoundError{URN: domainTag.TemplateURN} } - listOfRecordModelTag, err := r.readListOfModelTagFromDB(r.dbClient, domainTag.RecordType, domainTag.RecordURN, domainTemplate) - if err == nil { - err = r.complementDomainTag(domainTag, domainTemplate, listOfRecordModelTag) + templates := templateFieldModels.toTemplates() + + var insertedModelTags []TagModel + if err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error { + timestamp := time.Now().UTC() + + for _, tv := range domainTag.TagValues { + var insertedTagValue TagModel + if tv.FieldValue == nil { + continue + } + tagToInsert := &TagModel{ + RecordType: domainTag.RecordType, + RecordURN: domainTag.RecordURN, + FieldID: tv.FieldID, + Value: fmt.Sprintf("%v", tv.FieldValue), + CreatedAt: timestamp, + UpdatedAt: timestamp, + } + + if err := tx.QueryRowxContext(ctx, ` + INSERT INTO tags + (value, record_urn, record_type, field_id, created_at, updated_at) + VALUES + ($1, $2, $3, $4, $5, $6) + RETURNING *`, + tagToInsert.Value, tagToInsert.RecordURN, tagToInsert.RecordType, tagToInsert.FieldID, tagToInsert.CreatedAt, tagToInsert.UpdatedAt). + StructScan(&insertedTagValue); err != nil { + if err := checkPostgresError(err); errors.Is(err, errDuplicateKey) { + return tag.DuplicateError{ + RecordURN: tagToInsert.RecordURN, + RecordType: tagToInsert.RecordType, + TemplateURN: domainTag.TemplateURN, + } + } + return fmt.Errorf("failed to insert a domain tag: %w", err) + } + + insertedModelTags = append(insertedModelTags, insertedTagValue) + } + return nil + }); err != nil { return err } - return nil + return r.complementTag(domainTag, templates[0], insertedModelTags) } // Read reads tags grouped by its template -func (r *TagRepository) Read(filter tag.Tag) ([]tag.Tag, error) { - if r.dbClient == nil { - return nil, errNilDBClient - } +func (r *TagRepository) Read(ctx context.Context, filter tag.Tag) ([]tag.Tag, error) { + if filter.RecordType == "" { return nil, errEmptyRecordType } if filter.RecordURN == "" { return nil, errEmptyRecordURN } + + sqlQuery := ` + SELECT + t.urn as "tag_templates.urn", t.display_name as "tag_templates.display_name", t.description as "tag_templates.description", + t.created_at as "tag_templates.created_at", t.updated_at as "tag_templates.updated_at", + tg.id as "tags.id", tg.value as "tags.value", tg.record_urn as "tags.record_urn", tg.record_type as "tags.record_type", + tg.field_id as "tags.field_id", tg.created_at as "tags.created_at", tg.updated_at as "tags.updated_at", + f.id as "tag_template_fields.id", f.urn as "tag_template_fields.urn", f.display_name as "tag_template_fields.display_name", f.description as "tag_template_fields.description", + f.data_type as "tag_template_fields.data_type", f.options as "tag_template_fields.options", f.required as "tag_template_fields.required", f.template_urn as "tag_template_fields.template_urn", + f.created_at as "tag_template_fields.created_at", f.updated_at as "tag_template_fields.updated_at" + FROM + tag_templates t + JOIN + tag_template_fields f ON f.template_urn = t.urn + JOIN + tags tg ON f.id = tg.field_id + WHERE + tg.record_urn = $1 AND tg.record_type = $2` + sqlArgs := []interface{}{filter.RecordURN, filter.RecordType} + if filter.TemplateURN != "" { - recordModelTemplate, err := r.getTemplateWithFields(filter.TemplateURN) - if err != nil { - return nil, err - } - domainTag, err := r.readByRecordAndTemplateFromDB(r.dbClient, filter.RecordType, filter.RecordURN, recordModelTemplate) - if err != nil { - return nil, err + // filter by record and template + sqlQuery += " AND t.urn = $3" + sqlArgs = append(sqlArgs, filter.TemplateURN) + } + + var templateTagFields TagJoinTemplateTagFieldModels + if err := r.client.db.Select(&templateTagFields, sqlQuery, sqlArgs...); err != nil { + return nil, fmt.Errorf("failed reading domain tag: %w", err) + } + + // (nil, not found error) if no record and template urn = "" + // (empty, nil) if no record and template urn != "" + if len(templateTagFields) == 0 && filter.TemplateURN != "" { + return nil, tag.NotFoundError{ + URN: filter.RecordURN, + Type: filter.RecordType, + Template: filter.TemplateURN, } - return []tag.Tag{domainTag}, nil } - return r.readByRecordFromDB(r.dbClient, filter.RecordType, filter.RecordURN) + + templates, tags := templateTagFields.toTemplateAndTagModels() + + return tags.toTags(filter.RecordType, filter.RecordURN, templates), nil } // Update updates tags in the database -func (r *TagRepository) Update(domainTag *tag.Tag) error { - if r.dbClient == nil { - return errNilDBClient - } +func (r *TagRepository) Update(ctx context.Context, domainTag *tag.Tag) error { if domainTag == nil { - return errNilDomainTag + return errNilTag } - recordModelTemplate, err := r.getTemplateWithFields(domainTag.TemplateURN) + + templateFieldModels, err := readTemplatesByURNFromDB(ctx, r.client.db, domainTag.TemplateURN) if err != nil { return err } - domainTemplate := r.convertToDomainTemplate(recordModelTemplate) - err = r.dbClient.Transaction(func(tx *gorm.DB) error { - return r.updateDomainTagToDB(tx, domainTag) - }) - if err == nil { - listOfRecordModelTag, err := r.readListOfModelTagFromDB(r.dbClient, domainTag.RecordType, domainTag.RecordURN, domainTemplate) - if err == nil { - err = r.complementDomainTag(domainTag, domainTemplate, listOfRecordModelTag) + if len(templateFieldModels) < 1 { + return tag.TemplateNotFoundError{URN: domainTag.TemplateURN} + } + + templates := templateFieldModels.toTemplates() + + var updatedModelTags []TagModel + if err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error { + timestamp := time.Now().UTC() + + for _, value := range domainTag.TagValues { + if value.FieldValue == nil || value.FieldValue == "" { + continue + } + valueStr := fmt.Sprintf("%v", value.FieldValue) + tagModel := &TagModel{ + Value: valueStr, + RecordURN: domainTag.RecordURN, + RecordType: domainTag.RecordType, + FieldID: value.FieldID, + CreatedAt: timestamp, + UpdatedAt: timestamp, + } + + var updatedModelTag TagModel + if err := tx.QueryRowxContext(ctx, ` + INSERT INTO + tags + (value, record_urn, record_type, field_id, created_at, updated_at) + VALUES + ($1, $2, $3, $4, $5, $6) + ON CONFLICT + (record_urn, record_type, field_id) + DO UPDATE SET + (value, record_urn, record_type, field_id, created_at, updated_at) = + ($1, $2, $3, $4, $5, $6) + RETURNING *`, + tagModel.Value, tagModel.RecordURN, tagModel.RecordType, tagModel.FieldID, tagModel.CreatedAt, tagModel.UpdatedAt). + StructScan(&updatedModelTag); err != nil { + return err + } + updatedModelTags = append(updatedModelTags, updatedModelTag) } + return nil + }); err != nil { + return fmt.Errorf("failed to update a domain tag: %w", err) } - return err + + return r.complementTag(domainTag, templates[0], updatedModelTags) } // Delete deletes tags from database -func (r *TagRepository) Delete(domainTag tag.Tag) error { - if r.dbClient == nil { - return errNilDBClient - } +func (r *TagRepository) Delete(ctx context.Context, domainTag tag.Tag) error { if domainTag.RecordURN == "" { return errEmptyRecordURN } + deletedModelTags := []TagModel{} + fieldIDMap := map[uint]bool{} if domainTag.TemplateURN != "" { - recordModelTemplate, err := r.getTemplateWithFields(domainTag.TemplateURN) + recordTemplatesFields, err := readTemplatesByURNFromDB(ctx, r.client.db, domainTag.TemplateURN) if err != nil { return err } - return r.deleteByRecordAndTemplate(r.dbClient, domainTag.RecordType, domainTag.RecordURN, recordModelTemplate) - } - return r.dbClient.Where("record_type = ? and record_urn = ?", domainTag.RecordType, domainTag.RecordURN).Delete(&Tag{}).Error -} - -func (r *TagRepository) updateDomainTagToDB(tx *gorm.DB, domainTag *tag.Tag) error { - for _, value := range domainTag.TagValues { - if value.FieldValue == nil || value.FieldValue == "" { - continue - } - var recordModelTag Tag - queryResult := tx.Where("record_type = ? and record_urn = ? and field_id = ?", domainTag.RecordType, domainTag.RecordURN, value.FieldID).First(&recordModelTag) - recordModelTag.Value = fmt.Sprintf("%v", value.FieldValue) - if queryResult.Error != nil { - recordModelTag.RecordURN = domainTag.RecordURN - recordModelTag.FieldID = value.FieldID - createResult := tx.Create(&recordModelTag) - if createResult.Error != nil { - return createResult.Error - } - continue - } - updateResult := tx.Updates(&recordModelTag) - if updateResult.Error != nil { - return updateResult.Error + if len(recordTemplatesFields) < 1 { + return tag.TemplateNotFoundError{URN: domainTag.TemplateURN} } - } - return nil -} - -func (r *TagRepository) convertToDomainTemplate(modelTemplate Template) tag.Template { - listOfDomainField := []tag.Field{} - for _, field := range modelTemplate.Fields { - var options []string - if field.Options != nil { - options = strings.Split(*field.Options, ",") + for _, tf := range recordTemplatesFields { + fieldIDMap[tf.Field.ID] = true + deletedModelTags = append(deletedModelTags, TagModel{ + RecordURN: domainTag.RecordURN, + RecordType: domainTag.RecordType, + FieldID: tf.Field.ID, + }) } - listOfDomainField = append(listOfDomainField, tag.Field{ - ID: field.ID, - URN: field.URN, - DisplayName: field.DisplayName, - Description: field.Description, - DataType: field.DataType, - Required: field.Required, - Options: options, - CreatedAt: field.CreatedAt, - UpdatedAt: field.UpdatedAt, + } else { + deletedModelTags = append(deletedModelTags, TagModel{ + RecordURN: domainTag.RecordURN, + RecordType: domainTag.RecordType, }) } - return tag.Template{ - URN: modelTemplate.URN, - DisplayName: modelTemplate.DisplayName, - Description: modelTemplate.Description, - Fields: listOfDomainField, - CreatedAt: modelTemplate.CreatedAt, - UpdatedAt: modelTemplate.UpdatedAt, - } -} - -func (r *TagRepository) deleteByRecordAndTemplate(tx *gorm.DB, recordType, recordURN string, template Template) error { - var listOfFieldID []uint - for _, field := range template.Fields { - listOfFieldID = append(listOfFieldID, field.ID) - } - return tx.Where("record_type = ? and record_urn = ? and field_id in ?", recordType, recordURN, listOfFieldID).Delete(&Tag{}).Error -} -func (r *TagRepository) readByRecordFromDB(tx *gorm.DB, recordType, recordURN string) ([]tag.Tag, error) { - var listOfRecordModelTag []Tag - err := tx.Preload("Field"). - Where("record_type = ? AND record_urn = ?", recordType, recordURN). - Find(&listOfRecordModelTag).Error - if err != nil { - return nil, err - } - listOfTemplateURN := r.getListOfTemplateURN(listOfRecordModelTag) - listOfTemplate, err := r.getListOfTemplateByListOfURNFromDB(tx, listOfTemplateURN) - if err != nil { - return nil, err - } - templateByURN := r.mapTemplateByTemplateURN(listOfTemplate) - tagsByTemplateURN := r.mapTagsByTemplateURN(listOfRecordModelTag) - output := []tag.Tag{} - for templateURN, tags := range tagsByTemplateURN { - domainTag := r.convertToDomainTag(recordType, recordURN, templateByURN[templateURN], tags) - output = append(output, domainTag) - } - return output, nil -} + for _, tagModel := range deletedModelTags { + sqlQuery := "DELETE FROM tags WHERE tags.record_urn = $1 AND tags.record_type = $2" + sqlArgs := []interface{}{tagModel.RecordURN, tagModel.RecordType} -func (r *TagRepository) mapTagsByTemplateURN(tags []Tag) map[string][]Tag { - tagsByTemplateURN := make(map[string][]Tag) - for _, t := range tags { - key := t.Field.TemplateURN - if tagsByTemplateURN[key] == nil { - tagsByTemplateURN[key] = []Tag{} + if tagModel.FieldID != 0 { + sqlQuery += " AND tags.field_id = $3" + sqlArgs = append(sqlArgs, tagModel.FieldID) } - tagsByTemplateURN[key] = append(tagsByTemplateURN[key], t) - } - return tagsByTemplateURN -} -func (r *TagRepository) mapTemplateByTemplateURN(templates []Template) map[string]Template { - templateByURN := make(map[string]Template) - for _, t := range templates { - templateByURN[t.URN] = t - } - return templateByURN -} - -func (r *TagRepository) getListOfTemplateURN(tags []Tag) []string { - isURNRegistered := make(map[string]bool) - for _, t := range tags { - key := t.Field.TemplateURN - if !isURNRegistered[key] { - isURNRegistered[key] = true + if _, err := r.client.db.ExecContext(ctx, sqlQuery, sqlArgs...); err != nil { + return fmt.Errorf("failed to delete a domain tag: %w", err) } } - var output []string - for urn := range isURNRegistered { - output = append(output, urn) - } - return output -} - -func (r *TagRepository) getListOfTemplateByListOfURNFromDB(tx *gorm.DB, listOfTemplateURN []string) ([]Template, error) { - var listOfTemplate []Template - err := tx.Where("urn in ?", listOfTemplateURN).Find(&listOfTemplate).Error - if err != nil { - return nil, err - } - return listOfTemplate, nil -} - -func (r *TagRepository) readByRecordAndTemplateFromDB(tx *gorm.DB, recordType, recordURN string, template Template) (tag.Tag, error) { - var listOfRecordModelTag []Tag - for _, field := range template.Fields { - var recordModelTag Tag - result := tx.Preload("Field"). - Where("record_type = ? and record_urn = ? and field_id = ?", recordType, recordURN, field.ID). - First(&recordModelTag) - if result.Error != nil { - wrappedErr := fmt.Errorf("error looking for record urn [%s] and template urn [%s]: %w", recordURN, template.URN, result.Error) - - if errors.Is(result.Error, gorm.ErrRecordNotFound) { - wrappedErr = tag.NotFoundError{ - URN: recordURN, - Type: recordType, - Template: field.TemplateURN, - } - } - return tag.Tag{}, wrappedErr - } - listOfRecordModelTag = append(listOfRecordModelTag, recordModelTag) - } - return r.convertToDomainTag(recordType, recordURN, template, listOfRecordModelTag), nil -} - -func (r *TagRepository) convertToDomainTag(recordType, recordURN string, template Template, tags []Tag) tag.Tag { - var listOfDomainTagValue []tag.TagValue - for _, t := range tags { - var options []string - if t.Field.Options != nil { - options = strings.Split(*t.Field.Options, ",") - } - parsedValue, _ := tag.ParseTagValue(template.URN, t.FieldID, t.Field.DataType, t.Value, options) - listOfDomainTagValue = append(listOfDomainTagValue, tag.TagValue{ - FieldID: t.FieldID, - FieldValue: parsedValue, - FieldURN: t.Field.URN, - FieldDisplayName: t.Field.DisplayName, - FieldDescription: t.Field.Description, - FieldDataType: t.Field.DataType, - FieldOptions: options, - FieldRequired: t.Field.Required, - CreatedAt: t.CreatedAt, - UpdatedAt: t.UpdatedAt, - }) - } - return tag.Tag{ - RecordType: recordType, - RecordURN: recordURN, - TemplateURN: template.URN, - TagValues: listOfDomainTagValue, - TemplateDisplayName: template.DisplayName, - TemplateDescription: template.Description, - } + return nil } -func (r *TagRepository) complementDomainTag(domainTag *tag.Tag, domainTemplate tag.Template, listOfRecordModelTag []Tag) error { - tagByFieldID := make(map[uint]Tag) - for _, t := range listOfRecordModelTag { +func (r *TagRepository) complementTag(domainTag *tag.Tag, template tag.Template, tagModels []TagModel) error { + tagByFieldID := make(map[uint]TagModel) + for _, t := range tagModels { tagByFieldID[t.FieldID] = t } - var listOfDomainTagValue []tag.TagValue - for _, field := range domainTemplate.Fields { + var listOfTagValue []tag.TagValue + for _, field := range template.Fields { t := tagByFieldID[field.ID] parsedValue, _ := tag.ParseTagValue(domainTag.TemplateURN, field.ID, field.DataType, t.Value, field.Options) - listOfDomainTagValue = append(listOfDomainTagValue, tag.TagValue{ + listOfTagValue = append(listOfTagValue, tag.TagValue{ FieldID: field.ID, FieldValue: parsedValue, FieldURN: field.URN, @@ -326,70 +268,21 @@ func (r *TagRepository) complementDomainTag(domainTag *tag.Tag, domainTemplate t UpdatedAt: t.UpdatedAt, }) } - domainTag.TemplateURN = domainTemplate.URN - domainTag.TemplateDescription = domainTemplate.Description - domainTag.TemplateDisplayName = domainTemplate.DisplayName - domainTag.TagValues = listOfDomainTagValue - return nil -} - -func (r *TagRepository) getTemplateWithFields(templateURN string) (Template, error) { - var template Template - queryResult := r.dbClient.Preload("Fields").First(&template, "urn = ?", templateURN) - if queryResult.Error == gorm.ErrRecordNotFound { - return template, tag.TemplateNotFoundError{URN: templateURN} - } - - return template, queryResult.Error -} - -func (r *TagRepository) readListOfModelTagFromDB(tx *gorm.DB, recordType, recordURN string, domainTemplate tag.Template) ([]Tag, error) { - var tags []Tag - for _, field := range domainTemplate.Fields { - var t Tag - err := tx.Preload("Field").Where("record_type = ? and record_urn = ? and field_id = ?", recordType, recordURN, field.ID).First(&t).Error - if err != nil { - continue - } - tags = append(tags, t) - } - return tags, nil -} -func (r *TagRepository) insertDomainTagToDB(tx *gorm.DB, domainTag *tag.Tag) error { - for _, tv := range domainTag.TagValues { - if tv.FieldValue == nil { - continue - } - modelTag := Tag{ - RecordType: domainTag.RecordType, - RecordURN: domainTag.RecordURN, - FieldID: tv.FieldID, - Value: fmt.Sprintf("%v", tv.FieldValue), - } - createResult := tx.Create(&modelTag) - if createResult.Error != nil { - // this is pg driver specific error and not gorm - // might not work for DB other than pg - var pgErr *pgconn.PgError - if errors.As(createResult.Error, &pgErr) { - switch pgErr.Code { - case pgerrcode.UniqueViolation: - return tag.DuplicateError{RecordURN: domainTag.RecordURN, RecordType: domainTag.RecordType, TemplateURN: domainTag.TemplateURN} - } - } - - return createResult.Error - } - } + domainTag.TemplateURN = template.URN + domainTag.TemplateDescription = template.Description + domainTag.TemplateDisplayName = template.DisplayName + domainTag.TagValues = listOfTagValue return nil } // NewTagRepository initializes tag repository -func NewTagRepository(dbClient *gorm.DB) *TagRepository { - if dbClient == nil { - panic(errNilDBClient.Error()) +// all methods in tag repository uses passed by reference +// which will mutate the reference variable in method's argument +func NewTagRepository(client *Client) (*TagRepository, error) { + if client == nil { + return nil, errors.New("postgres client is nil") } return &TagRepository{ - dbClient: dbClient, - } + client: client, + }, nil } diff --git a/store/postgres/tag_repository_test.go b/store/postgres/tag_repository_test.go index 4270078d..38a2bea9 100644 --- a/store/postgres/tag_repository_test.go +++ b/store/postgres/tag_repository_test.go @@ -1,101 +1,142 @@ package postgres_test import ( + "context" "fmt" - "strings" + "sort" "testing" "github.com/odpf/columbus/store/postgres" "github.com/odpf/columbus/tag" - + "github.com/ory/dockertest/v3" + "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" - "gorm.io/gorm" ) type TagRepositoryTestSuite struct { suite.Suite - dbClient *gorm.DB - repository *postgres.TagRepository + ctx context.Context + client *postgres.Client + repository *postgres.TagRepository + templateRepository *postgres.TagTemplateRepository + pool *dockertest.Pool + resource *dockertest.Resource } -func (r *TagRepositoryTestSuite) TestNewTagRepository() { - r.Run("should return repository and nil if db client is not nil", func() { - dbClient := &gorm.DB{} +func (r *TagRepositoryTestSuite) SetupSuite() { + var err error - actualTagRepository := postgres.NewTagRepository(dbClient) + logger := logrus.New() + // logger.SetLevel(logrus.DebugLevel) + r.client, r.pool, r.resource, err = newTestClient(logger) + if err != nil { + logger.Fatal(err) + } - r.NotNil(actualTagRepository) - }) + r.ctx = context.TODO() + r.repository, err = postgres.NewTagRepository(r.client) + if err != nil { + logger.Fatal(err) + } + r.templateRepository, err = postgres.NewTagTemplateRepository(r.client) + if err != nil { + logger.Fatal(err) + } } -func (r *TagRepositoryTestSuite) Setup() { - r.dbClient, _ = newTestClient("file::memory:") - r.dbClient.AutoMigrate(&postgres.Template{}) - r.dbClient.AutoMigrate(&postgres.Field{}) - r.dbClient.AutoMigrate(&postgres.Tag{}) - repository := postgres.NewTagRepository(r.dbClient) - r.repository = repository +func (r *TagRepositoryTestSuite) TearDownSuite() { + // Clean tests + err := r.client.Close() + if err != nil { + r.T().Fatal(err) + } + err = purgeDocker(r.pool, r.resource) + if err != nil { + r.T().Fatal(err) + } } -func (r *TagRepositoryTestSuite) TestCreate() { - r.Run("should return error if domain tag is nil", func() { - r.Setup() - var domainTag *tag.Tag = nil - - expectedErrorMsg := "domain tag is nil" +func (r *TagRepositoryTestSuite) TestNewRepository() { + r.Run("should return repository and nil if postgres client is not nil", func() { + pgClient := &postgres.Client{} - actualError := r.repository.Create(domainTag) + actualTagRepository, err := postgres.NewTagRepository(pgClient) - r.EqualError(actualError, expectedErrorMsg) + r.NotNil(actualTagRepository) + r.Nil(err) }) +} + +func (r *TagRepositoryTestSuite) TestCreate() { + r.Run("should return error if tag is nil", func() { + err := setup(r.ctx, r.client) + r.NoError(err) - r.Run("should return error if db client is nil", func() { - domainTag := &tag.Tag{} - repository := &postgres.TagRepository{} + var domainTag *tag.Tag = nil - expectedErrorMsg := "db client is nil" + expectedErrorMsg := "tag is nil" - actualError := repository.Create(domainTag) + actualError := r.repository.Create(r.ctx, domainTag) r.EqualError(actualError, expectedErrorMsg) }) r.Run("should return error if template is not found", func() { - r.Setup() - t := r.getDomainTag() + err := setup(r.ctx, r.client) + r.NoError(err) + domain := getDomainTag() + + err = r.repository.Create(r.ctx, &domain) - err := r.repository.Create(&t) - r.ErrorIs(err, tag.TemplateNotFoundError{URN: t.TemplateURN}) + r.EqualError(err, tag.TemplateNotFoundError{URN: domain.TemplateURN}.Error()) }) r.Run("should return nil and create tag if no error found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() + err := setup(r.ctx, r.client) + r.NoError(err) - actualError := r.repository.Create(&domainTag) - r.NoError(actualError) + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + domainTag := getDomainTag() - for _, value := range domainTag.TagValues { - var actualRecord postgres.Tag - queryResult := r.dbClient.Where(postgres.Tag{ - RecordURN: domainTag.RecordURN, - FieldID: value.FieldID, - }).First(&actualRecord) + err = r.repository.Create(r.ctx, &domainTag) + r.NoError(err) - r.NoError(queryResult.Error) - } + tags, err := r.repository.Read(r.ctx, domainTag) + r.NoError(err) + + r.Equal(domainTag.RecordType, tags[0].RecordType) + r.Equal(domainTag.RecordURN, tags[0].RecordURN) + r.Equal(domainTag.TemplateDescription, tags[0].TemplateDescription) + r.Equal(domainTag.TemplateDisplayName, tags[0].TemplateDisplayName) + r.Equal(domainTag.TemplateURN, tags[0].TemplateURN) + r.NotEmpty(domainTag.TagValues) + r.NotEmpty(tags[0].TagValues) + + expectedTagValues := domainTag.TagValues + actualTagValues := tags[0].TagValues + + sort.Slice(expectedTagValues[:], func(i, j int) bool { + return expectedTagValues[i].FieldID < expectedTagValues[j].FieldID + }) + sort.Slice(actualTagValues[:], func(i, j int) bool { + return actualTagValues[i].FieldID < actualTagValues[j].FieldID + }) + r.EqualValues(expectedTagValues, actualTagValues) }) - r.Run("should return nil and update domain tag if no error found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() + r.Run("should return nil and update tag if no error found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) - actualError := r.repository.Create(&domainTag) - r.NoError(actualError) + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + domainTag := getDomainTag() + + err = r.repository.Create(r.ctx, &domainTag) + r.NoError(err) for _, value := range domainTag.TagValues { r.NotZero(value.CreatedAt) @@ -104,23 +145,10 @@ func (r *TagRepositoryTestSuite) TestCreate() { } func (r *TagRepositoryTestSuite) TestRead() { - r.Run("should return nil and error if db client is nil", func() { - var recordURN string = "sample-urn" - repository := &postgres.TagRepository{} - paramDomainTag := tag.Tag{ - RecordURN: recordURN, - } - - expectedErrorMsg := "db client is nil" - - actualTag, actualError := repository.Read(paramDomainTag) - - r.Nil(actualTag) - r.EqualError(actualError, expectedErrorMsg) - }) - r.Run("should return error if record type is empty", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + paramDomainTag := tag.Tag{ RecordType: "", RecordURN: "sample-urn", @@ -128,14 +156,16 @@ func (r *TagRepositoryTestSuite) TestRead() { expectedErrorMsg := "record type should not be empty" - actualTag, actualError := r.repository.Read(paramDomainTag) + actualTag, actualError := r.repository.Read(r.ctx, paramDomainTag) r.Nil(actualTag) r.EqualError(actualError, expectedErrorMsg) }) r.Run("should return nil and error if record urn is empty", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + var recordURN string = "" paramDomainTag := tag.Tag{ RecordType: "sample-type", @@ -144,59 +174,60 @@ func (r *TagRepositoryTestSuite) TestRead() { expectedErrorMsg := "record urn should not be empty" - actualTag, actualError := r.repository.Read(paramDomainTag) + actualTag, actualError := r.repository.Read(r.ctx, paramDomainTag) r.Nil(actualTag) r.EqualError(actualError, expectedErrorMsg) }) r.Run("should return empty and nil if no record found for the specified record", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + paramDomainTag := tag.Tag{ RecordType: "sample-type", RecordURN: "sample-urn", } - actualTag, actualError := r.repository.Read(paramDomainTag) + actualTag, actualError := r.repository.Read(r.ctx, paramDomainTag) r.NoError(actualError) r.Empty(actualTag) }) r.Run("should return record if found for the specified record", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() - err := r.repository.Create(&domainTag) + err := setup(r.ctx, r.client) + r.NoError(err) + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.Require().NoError(err) + + domainTag := getDomainTag() + err = r.repository.Create(r.ctx, &domainTag) r.Require().NoError(err) - tags, err := r.repository.Read(tag.Tag{ + tags, err := r.repository.Read(r.ctx, tag.Tag{ RecordType: domainTag.RecordType, RecordURN: domainTag.RecordURN, }) + r.NoError(err) r.NotEmpty(tags) - }) - - r.Run("should return nil and error if template urn is not empty but template is not found", func() { - r.Setup() - paramDomainTag := tag.Tag{ - RecordURN: "sample-urn", - RecordType: "sample-type", - TemplateURN: "governance_policy", - } - - _, err := r.repository.Read(paramDomainTag) - r.ErrorIs(err, tag.TemplateNotFoundError{URN: "governance_policy"}) + r.Len(tags[0].TagValues, 2) }) r.Run("should return nil and not found error if no record found for the specified record and template", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + var recordType string = "sample-type" var recordURN string = "sample-urn" var templateURN string = "governance_policy" - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + paramDomainTag := tag.Tag{ RecordType: recordType, RecordURN: recordURN, @@ -207,21 +238,26 @@ func (r *TagRepositoryTestSuite) TestRead() { recordType, recordURN, templateURN, ) - actualTag, actualError := r.repository.Read(paramDomainTag) + actualTag, actualError := r.repository.Read(r.ctx, paramDomainTag) r.ErrorAs(actualError, new(tag.NotFoundError)) r.EqualError(actualError, expectedErrorMsg) r.Nil(actualTag) }) - r.Run("should return maximum of one domain tag for the specified record and template", func() { - r.Setup() + r.Run("should return maximum of one tag for the specified record and template", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + var recordType string = "sample-type" var recordURN string = "sample-urn" var templateURN string = "governance_policy" - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() - if err := r.repository.Create(&domainTag); err != nil { + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + domainTag := getDomainTag() + + if err := r.repository.Create(r.ctx, &domainTag); err != nil { panic(err) } paramDomainTag := tag.Tag{ @@ -232,7 +268,7 @@ func (r *TagRepositoryTestSuite) TestRead() { expectedLength := 1 - actualTag, actualError := r.repository.Read(paramDomainTag) + actualTag, actualError := r.repository.Read(r.ctx, paramDomainTag) r.Len(actualTag, expectedLength) r.NoError(actualError) @@ -240,70 +276,70 @@ func (r *TagRepositoryTestSuite) TestRead() { } func (r *TagRepositoryTestSuite) TestUpdate() { - r.Run("should return error if domain tag is nil", func() { - r.Setup() - var domainTag *tag.Tag = nil - - expectedErrorMsg := "domain tag is nil" - - actualError := r.repository.Update(domainTag) - - r.EqualError(actualError, expectedErrorMsg) - }) + r.Run("should return error if tag is nil", func() { + err := setup(r.ctx, r.client) + r.NoError(err) - r.Run("should return error if db client is nil", func() { - domainTag := &tag.Tag{} - repository := &postgres.TagRepository{} + var domainTag *tag.Tag = nil - expectedErrorMsg := "db client is nil" + expectedErrorMsg := "tag is nil" - actualError := repository.Update(domainTag) + actualError := r.repository.Update(r.ctx, domainTag) r.EqualError(actualError, expectedErrorMsg) }) r.Run("should return error if template is not found", func() { - r.Setup() - t := r.getDomainTag() + err := setup(r.ctx, r.client) + r.NoError(err) + t := getDomainTag() - err := r.repository.Update(&t) - r.ErrorIs(err, tag.TemplateNotFoundError{URN: t.TemplateURN}) + err = r.repository.Update(r.ctx, &t) + r.EqualError(err, tag.TemplateNotFoundError{URN: t.TemplateURN}.Error()) }) r.Run("should return nil and update tag if no error found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() - err := r.repository.Create(&domainTag) + err := setup(r.ctx, r.client) + r.NoError(err) + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.Require().NoError(err) + + domainTag := getDomainTag() + err = r.repository.Create(r.ctx, &domainTag) r.Require().NoError(err) domainTag.TagValues[0].FieldValue = "Restricted" - actualError := r.repository.Update(&domainTag) + actualError := r.repository.Update(r.ctx, &domainTag) r.Require().NoError(actualError) - for _, value := range domainTag.TagValues { - var actualRecord postgres.Tag - queryResult := r.dbClient.Where( - "record_urn = ? and field_id = ?", domainTag.RecordURN, value.FieldID, - ).First(&actualRecord) + updatedTags, err := r.repository.Read(r.ctx, domainTag) + r.NoError(err) - r.NoError(queryResult.Error) - r.EqualValues(value.UpdatedAt, actualRecord.UpdatedAt) + for _, updatedTag := range updatedTags { + for idx, value := range updatedTag.TagValues { + r.NoError(err) + r.EqualValues(value.UpdatedAt, domainTag.TagValues[idx].UpdatedAt) + } } }) - r.Run("should return nil and update domain tag if no error found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() - if err := r.repository.Create(&domainTag); err != nil { + r.Run("should return nil and update tag if no error found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + domainTag := getDomainTag() + + if err := r.repository.Create(r.ctx, &domainTag); err != nil { panic(err) } domainTag.TagValues = domainTag.TagValues[:1] - actualError := r.repository.Update(&domainTag) + actualError := r.repository.Update(r.ctx, &domainTag) r.NoError(actualError) r.Len(domainTag.TagValues, 2) @@ -311,22 +347,10 @@ func (r *TagRepositoryTestSuite) TestUpdate() { } func (r *TagRepositoryTestSuite) TestDelete() { - r.Run("should return error if db client is nil", func() { - var recordURN string = "sample-urn" - repository := &postgres.TagRepository{} - paramDomainTag := tag.Tag{ - RecordURN: recordURN, - } - - expectedErrorMsg := "db client is nil" - - actualError := repository.Delete(paramDomainTag) - - r.EqualError(actualError, expectedErrorMsg) - }) - r.Run("should return error if record urn is empty", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + var recordURN string = "" paramDomainTag := tag.Tag{ RecordURN: recordURN, @@ -334,38 +358,48 @@ func (r *TagRepositoryTestSuite) TestDelete() { expectedErrorMsg := "record urn should not be empty" - actualError := r.repository.Delete(paramDomainTag) + actualError := r.repository.Delete(r.ctx, paramDomainTag) r.EqualError(actualError, expectedErrorMsg) }) r.Run("should delete tags related to the record and return error if record has one", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) - domainTag := r.getDomainTag() - if err := r.repository.Create(&domainTag); err != nil { + err := setup(r.ctx, r.client) + r.NoError(err) + + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + + domainTag := getDomainTag() + + if err := r.repository.Create(r.ctx, &domainTag); err != nil { r.T().Fatal(err) } + paramDomainTag := tag.Tag{ RecordType: domainTag.RecordType, RecordURN: domainTag.RecordURN, } - actualError := r.repository.Delete(paramDomainTag) - var listOfRecordModelTag []postgres.Tag - err := r.dbClient.Where("record_type = ? and record_urn = ?", domainTag.RecordType, domainTag.RecordURN). - Find(&listOfRecordModelTag).Error + actualError := r.repository.Delete(r.ctx, paramDomainTag) + r.NoError(actualError) + + foundTags, err := r.repository.Read(r.ctx, tag.Tag{ + RecordURN: paramDomainTag.RecordURN, + RecordType: paramDomainTag.RecordType, + }) if err != nil { r.T().Fatal(err) } - r.NoError(actualError) - r.Empty(listOfRecordModelTag) + r.Empty(foundTags) }) r.Run("should return error if template is not found", func() { - r.Setup() + err := setup(r.ctx, r.client) + r.NoError(err) + var recordURN string = "sample-urn" var templateURN string = "random-urn" paramDomainTag := tag.Tag{ @@ -373,64 +407,30 @@ func (r *TagRepositoryTestSuite) TestDelete() { TemplateURN: templateURN, } - err := r.repository.Delete(paramDomainTag) + err = r.repository.Delete(r.ctx, paramDomainTag) r.ErrorIs(err, tag.TemplateNotFoundError{URN: templateURN}) }) - r.Run("should delete only the tag for record and template and return nil if record has one", func() { - r.Setup() + r.Run("should delete only the tag for record and template and return no error if record has one", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + var recordURN string = "sample-urn" - domainTemplate := r.getDomainTemplate() - r.createDomainTemplate(domainTemplate) + domainTemplate := getTemplate() + err = r.templateRepository.Create(r.ctx, domainTemplate) + r.NoError(err) + paramDomainTag := tag.Tag{ RecordURN: recordURN, TemplateURN: domainTemplate.URN, } - actualError := r.repository.Delete(paramDomainTag) - var listOfRecordModelTag []postgres.Tag - err := r.dbClient.Where("record_urn = ?", recordURN).Find(&listOfRecordModelTag).Error - if err != nil { - panic(err) - } - + actualError := r.repository.Delete(r.ctx, paramDomainTag) r.NoError(actualError) - r.Empty(listOfRecordModelTag) }) } -func (r *TagRepositoryTestSuite) createDomainTemplate(domainTemplate *tag.Template) { - listOfModelField := make([]postgres.Field, len(domainTemplate.Fields)) - for i, domainField := range domainTemplate.Fields { - var options *string - if len(domainField.Options) > 0 { - var concatenatedOption string - strings.Join(domainField.Options, ",") - options = &concatenatedOption - } - listOfModelField[i] = postgres.Field{ - ID: domainField.ID, - URN: domainField.URN, - DisplayName: domainField.DisplayName, - Description: domainField.Description, - DataType: domainField.DataType, - Options: options, - Required: domainField.Required, - } - } - modelTemplate := postgres.Template{ - URN: domainTemplate.URN, - DisplayName: domainTemplate.DisplayName, - Description: domainTemplate.Description, - Fields: listOfModelField, - } - createResult := r.dbClient.Create(&modelTemplate) - if createResult.Error != nil { - r.T().Fatal(createResult.Error) - } -} - -func (r *TagRepositoryTestSuite) getDomainTemplate() *tag.Template { +func getTemplate() *tag.Template { return &tag.Template{ URN: "governance_policy", DisplayName: "Governance Policy", @@ -457,7 +457,7 @@ func (r *TagRepositoryTestSuite) getDomainTemplate() *tag.Template { } } -func (r *TagRepositoryTestSuite) getDomainTag() tag.Tag { +func getDomainTag() tag.Tag { return tag.Tag{ RecordType: "sample-type", RecordURN: "sample-urn", diff --git a/store/postgres/tag_template_repository.go b/store/postgres/tag_template_repository.go new file mode 100644 index 00000000..6b3d75bc --- /dev/null +++ b/store/postgres/tag_template_repository.go @@ -0,0 +1,318 @@ +package postgres + +import ( + "context" + "database/sql" + "errors" + "fmt" + "time" + + "github.com/jmoiron/sqlx" + "github.com/odpf/columbus/tag" +) + +const ( + fieldOptionSeparator = "," +) + +var ( + errNilTemplate = errors.New("template is nil") +) + +// TagTemplateRepository is a type that manages template operation to the primary database +type TagTemplateRepository struct { + client *Client +} + +// Create inserts template to database +func (r *TagTemplateRepository) Create(ctx context.Context, templateDomain *tag.Template) error { + if templateDomain == nil { + return errNilTemplate + } + + templateModel := newTemplateModel(templateDomain) + + timestamp := time.Now().UTC() + templateModel.CreatedAt = timestamp + templateModel.UpdatedAt = timestamp + + if err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error { + insertedTemplate := *templateModel + if err := insertTemplateToDBTx(ctx, tx, &insertedTemplate); err != nil { + return err + } + + for _, field := range templateModel.Fields { + field.CreatedAt = templateModel.CreatedAt + field.UpdatedAt = templateModel.UpdatedAt + field.TemplateURN = templateModel.URN + + if err := insertFieldToDBTx(ctx, tx, &field); err != nil { + return err + } + + insertedTemplate.Fields = append(insertedTemplate.Fields, field) + } + *templateModel = insertedTemplate + return nil + }); err != nil { + return errors.New("failed to insert template") + } + + *templateDomain = templateModel.toTemplate() + return nil +} + +// Read reads template from database by URN +func (r *TagTemplateRepository) Read(ctx context.Context, templateURN string) ([]tag.Template, error) { + templates := []tag.Template{} + var templatesFieldModels TagJoinTemplateFieldModels + + // return empty with nil error if not found + templatesFieldModels, err := readTemplatesByURNFromDB(ctx, r.client.db, templateURN) + if err != nil { + return nil, err + } + + templateModels := templatesFieldModels.toTemplateModels() + + for _, record := range templateModels { + templateDomain := record.toTemplate() + templates = append(templates, templateDomain) + } + return templates, nil +} + +// Read reads all template from database +func (r *TagTemplateRepository) ReadAll(ctx context.Context) ([]tag.Template, error) { + templates := []tag.Template{} + var templatesFieldModels TagJoinTemplateFieldModels + // return empty with nil error if not found + templatesFieldModels, err := readAllTemplatesFromDB(ctx, r.client.db) + if err != nil { + return nil, err + } + + templateModels := templatesFieldModels.toTemplateModels() + + for _, record := range templateModels { + templateDomain := record.toTemplate() + templates = append(templates, templateDomain) + } + return templates, nil +} + +// Update updates template into database +func (r *TagTemplateRepository) Update(ctx context.Context, targetURN string, templateDomain *tag.Template) error { + if templateDomain == nil { + return errNilTemplate + } + + templateModel := newTemplateModel(templateDomain) + updatedTemplateModel := *templateModel + if err := r.client.RunWithinTx(ctx, func(tx *sqlx.Tx) error { + timestamp := time.Now().UTC() + + updatedTemplateModel.UpdatedAt = timestamp + if err := updateTemplateToDBTx(ctx, tx, targetURN, &updatedTemplateModel); err != nil { + return fmt.Errorf("failed to update a field: %w", err) + } + + for _, field := range templateModel.Fields { + field.TemplateURN = templateModel.URN + field.UpdatedAt = timestamp + + if field.ID == 0 { + field.CreatedAt = timestamp + field.TemplateURN = templateModel.URN + + if err := insertFieldToDBTx(ctx, tx, &field); err != nil { + return fmt.Errorf("failed to insert a field: %w", err) + } + + updatedTemplateModel.Fields = append(updatedTemplateModel.Fields, field) + continue + } + + if err := updateFieldToDBTx(ctx, tx, &field); err != nil { + return fmt.Errorf("failed to update a field: %w", err) + } + updatedTemplateModel.Fields = append(updatedTemplateModel.Fields, field) + } + + *templateModel = updatedTemplateModel + return nil + }); err != nil { + return fmt.Errorf("failed to update template: %w", err) + } + + *templateDomain = updatedTemplateModel.toTemplate() + + return nil +} + +// Delete deletes template and its fields from database +func (r *TagTemplateRepository) Delete(ctx context.Context, templateURN string) error { + res, err := r.client.db.ExecContext(ctx, ` + DELETE FROM + tag_templates + WHERE + urn = $1`, templateURN) + if err != nil { + return fmt.Errorf("failed to delete template with urn: %w", err) + } + + tmpRowsAffected, err := res.RowsAffected() + if err != nil { + return fmt.Errorf("failed to get row affected in deleting template: %w", err) + } + + if tmpRowsAffected == 0 { + return tag.TemplateNotFoundError{URN: templateURN} + } + return nil +} + +func insertTemplateToDBTx(ctx context.Context, tx *sqlx.Tx, templateModel *TagTemplateModel) error { + var insertedTemplate TagTemplateModel + if err := tx.QueryRowxContext(ctx, ` + INSERT INTO + tag_templates + (urn,display_name,description,created_at,updated_at) + VALUES + ($1,$2,$3,$4,$5) + RETURNING * + `, + templateModel.URN, templateModel.DisplayName, templateModel.Description, templateModel.CreatedAt, templateModel.UpdatedAt). + StructScan(&insertedTemplate); err != nil { + return fmt.Errorf("failed to insert a template: %w", err) + } + + *templateModel = insertedTemplate + return nil +} + +func insertFieldToDBTx(ctx context.Context, tx *sqlx.Tx, field *TagTemplateFieldModel) error { + var insertedField TagTemplateFieldModel + if err := tx.QueryRowxContext(ctx, ` + INSERT INTO + tag_template_fields + (urn, display_name, description, data_type, options, required, template_urn, created_at, updated_at) + VALUES + ($1,$2,$3,$4,$5,$6,$7,$8,$9) + RETURNING * + `, + field.URN, field.DisplayName, field.Description, field.DataType, field.Options, field.Required, field.TemplateURN, field.CreatedAt, field.UpdatedAt). + StructScan(&insertedField); err != nil { + return fmt.Errorf("failed to insert a field: %w", err) + } + *field = insertedField + return nil +} + +func readAllTemplatesFromDB(ctx context.Context, db *sqlx.DB) (TagJoinTemplateFieldModels, error) { + var templateFields TagJoinTemplateFieldModels + // return empty with nil error if not found + if err := db.Select(&templateFields, ` + SELECT + t.urn as "tag_templates.urn", t.display_name as "tag_templates.display_name", t.description as "tag_templates.description", + t.created_at as "tag_templates.created_at", t.updated_at as "tag_templates.updated_at", + f.id as "tag_template_fields.id", f.urn as "tag_template_fields.urn", f.display_name as "tag_template_fields.display_name", f.description as "tag_template_fields.description", + f.data_type as "tag_template_fields.data_type", f.options as "tag_template_fields.options", f.required as "tag_template_fields.required", f.template_urn as "tag_template_fields.template_urn", + f.created_at as "tag_template_fields.created_at", f.updated_at as "tag_template_fields.updated_at" + FROM + tag_templates t + JOIN + tag_template_fields f + ON + f.template_urn = t.urn`); err != nil { + return nil, fmt.Errorf("tag_templates: failed to read all from DB %w", err) + } + + return templateFields, nil +} + +func readTemplatesByURNFromDB(ctx context.Context, db *sqlx.DB, templateURN string) (TagJoinTemplateFieldModels, error) { + var templateFields TagJoinTemplateFieldModels + // return empty with nil error if not found + if err := db.Select(&templateFields, ` + SELECT + t.urn as "tag_templates.urn", t.display_name as "tag_templates.display_name", t.description as "tag_templates.description", + t.created_at as "tag_templates.created_at", t.updated_at as "tag_templates.updated_at", + f.id as "tag_template_fields.id", f.urn as "tag_template_fields.urn", f.display_name as "tag_template_fields.display_name", f.description as "tag_template_fields.description", + f.data_type as "tag_template_fields.data_type", f.options as "tag_template_fields.options", f.required as "tag_template_fields.required", f.template_urn as "tag_template_fields.template_urn", + f.created_at as "tag_template_fields.created_at", f.updated_at as "tag_template_fields.updated_at" + FROM + tag_templates t + JOIN + tag_template_fields f + ON + f.template_urn = t.urn + WHERE + t.urn = $1`, templateURN); err != nil { + return nil, fmt.Errorf("tag_templates: failed to read from DB %w", err) + } + + return templateFields, nil +} + +func updateTemplateToDBTx(ctx context.Context, tx *sqlx.Tx, targetTemplateURN string, templateModel *TagTemplateModel) error { + var updatedTemplate TagTemplateModel + if err := tx.QueryRowxContext(ctx, ` + UPDATE + tag_templates + SET + urn = $1, display_name = $2, description = $3, updated_at = $4 + WHERE + urn = $5 + RETURNING *`, + templateModel.URN, templateModel.DisplayName, templateModel.Description, templateModel.UpdatedAt, targetTemplateURN). + StructScan(&updatedTemplate); err != nil { + // scan returns sql.ErrNoRows if no rows + if errors.Is(err, sql.ErrNoRows) { + return tag.TemplateNotFoundError{URN: templateModel.URN} + } + return fmt.Errorf("failed building update template sql: %w", err) + } + + *templateModel = updatedTemplate + return nil +} + +func updateFieldToDBTx(ctx context.Context, tx *sqlx.Tx, field *TagTemplateFieldModel) error { + var updatedField TagTemplateFieldModel + + if err := tx.QueryRowxContext(ctx, ` + UPDATE + tag_template_fields + SET + urn = $1, display_name = $2, description = $3, data_type = $4, options = $5, + required = $6, template_urn = $7, updated_at = $8 + WHERE + id = $9 AND template_urn = $7 + RETURNING *`, + field.URN, field.DisplayName, field.Description, field.DataType, field.Options, field.Required, + field.TemplateURN, field.UpdatedAt, field.ID). + StructScan(&updatedField); err != nil { + return fmt.Errorf("failed updating fields: %w", err) + } + + if updatedField.ID == 0 { + return errors.New("field not found when updating fields") + } + + *field = updatedField + return nil +} + +// NewTagTemplateRepository initializes template repository clients +// all methods in template repository uses passed by reference +// which will mutate the reference variable in method's argument +func NewTagTemplateRepository(c *Client) (*TagTemplateRepository, error) { + if c == nil { + return nil, errors.New("postgres client is nil") + } + return &TagTemplateRepository{ + client: c, + }, nil +} diff --git a/store/postgres/tag_template_repository_test.go b/store/postgres/tag_template_repository_test.go new file mode 100644 index 00000000..a64fb7e1 --- /dev/null +++ b/store/postgres/tag_template_repository_test.go @@ -0,0 +1,424 @@ +package postgres_test + +import ( + "context" + "encoding/json" + "testing" + "time" + + "github.com/odpf/columbus/store/postgres" + "github.com/odpf/columbus/tag" + "github.com/ory/dockertest/v3" + "github.com/sirupsen/logrus" + "github.com/stretchr/testify/suite" +) + +type TagTemplateRepositoryTestSuite struct { + suite.Suite + ctx context.Context + client *postgres.Client + repository *postgres.TagTemplateRepository + pool *dockertest.Pool + resource *dockertest.Resource +} + +func (r *TagTemplateRepositoryTestSuite) SetupSuite() { + var err error + + logger := logrus.New() + // logger.SetLevel(logrus.DebugLevel) + r.client, r.pool, r.resource, err = newTestClient(logger) + if err != nil { + logger.Fatal(err) + } + + r.ctx = context.TODO() + r.repository, err = postgres.NewTagTemplateRepository(r.client) + if err != nil { + logger.Fatal(err) + } +} + +func (r *TagTemplateRepositoryTestSuite) TearDownSuite() { + // Clean tests + err := r.client.Close() + if err != nil { + r.T().Fatal(err) + } + err = purgeDocker(r.pool, r.resource) + if err != nil { + r.T().Fatal(err) + } +} + +func (r *TagTemplateRepositoryTestSuite) TestNewRepository() { + r.Run("should return repository and nil if postgres client is not nil", func() { + pgClient := &postgres.Client{} + + actualRepository, err := postgres.NewTagTemplateRepository(pgClient) + r.NotNil(actualRepository) + r.Nil(err) + }) +} + +func (r *TagTemplateRepositoryTestSuite) TestCreate() { + + r.Run("should return error if template is nil", func() { + var template *tag.Template = nil + + expectedErrorMsg := "template is nil" + + actualError := r.repository.Create(r.ctx, template) + + r.EqualError(actualError, expectedErrorMsg) + }) + + r.Run("should return nil and insert new record if no error found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + actualError := r.repository.Create(r.ctx, &template) + r.NoError(actualError) + + var actualRecord tag.Template + templates, err := r.repository.Read(r.ctx, template.URN) + r.NoError(err) + + actualRecord = templates[0] + r.Equal(template.URN, actualRecord.URN) + r.Equal(template.DisplayName, actualRecord.DisplayName) + r.Equal(template.Description, actualRecord.Description) + r.Equal(len(template.Fields), len(actualRecord.Fields)) + r.Equal(template.Fields[0].DisplayName, actualRecord.Fields[0].DisplayName) + r.Equal(template.Fields[0].URN, actualRecord.Fields[0].URN) + }) + + r.Run("should return nil and update template", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + originalTemplate := r.getTemplate() + referenceTemplate := r.getTemplate() + + actualError := r.repository.Create(r.ctx, &originalTemplate) + r.NoError(actualError) + + r.Equal(referenceTemplate.URN, originalTemplate.URN) + r.NotEqual(referenceTemplate.CreatedAt, originalTemplate.CreatedAt) + r.NotEqual(referenceTemplate.UpdatedAt, originalTemplate.UpdatedAt) + r.Equal(referenceTemplate.Fields[0].ID, originalTemplate.Fields[0].ID) + r.Equal(referenceTemplate.Fields[0].URN, originalTemplate.Fields[0].URN) + r.NotEqual(referenceTemplate.Fields[0].CreatedAt, originalTemplate.Fields[0].CreatedAt) + r.NotEqual(referenceTemplate.Fields[0].UpdatedAt, originalTemplate.Fields[0].UpdatedAt) + }) + + r.Run("should return error if encountered uncovered error", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + r.repository.Create(r.ctx, &template) + actualError := r.repository.Create(r.ctx, &template) + + r.Error(actualError) + }) +} + +func (r *TagTemplateRepositoryTestSuite) TestRead() { + r.Run("should return empty and no error if no record found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + template := r.getTemplate() + + actualTemplate, actualError := r.repository.Read(r.ctx, template.URN) + + r.Empty(actualTemplate) + r.NoError(actualError) + }) + + r.Run("should return templates and nil if found any", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + if err := r.repository.Create(r.ctx, &template); err != nil { + panic(err) + } + now := time.Now() + + expectedTemplate := []tag.Template{template} + r.updateTimeForTemplate(&expectedTemplate[0], now) + + actualTemplate, actualError := r.repository.Read(r.ctx, template.URN) + r.updateTimeForTemplate(&actualTemplate[0], now) + + r.EqualValues(expectedTemplate, actualTemplate) + r.NoError(actualError) + }) + r.Run("should return template with multiple fields if exist", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + template.DisplayName = "Random Display" + template.Fields[0].DisplayName = "Another Random Display" + template.Fields = append(template.Fields, tag.Field{ + URN: "new_field", + DisplayName: "New Field", + Description: "This field is a new addition.", + DataType: "string", + }) + + err = r.repository.Create(r.ctx, &template) + r.NoError(err) + + templates, err := r.repository.Read(r.ctx, template.URN) + + r.NoError(err) + r.Len(templates[0].Fields, 2) + r.Equal(template.DisplayName, templates[0].DisplayName) + r.Equal(template.UpdatedAt, templates[0].UpdatedAt) + }) +} + +func (r *TagTemplateRepositoryTestSuite) TestReadAll() { + r.Run("should return empty and no error if no record found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + actualTemplate, actualError := r.repository.ReadAll(r.ctx) + + r.Empty(actualTemplate) + r.NoError(actualError) + }) + + r.Run("should return templates and nil if found any", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + if err := r.repository.Create(r.ctx, &template); err != nil { + panic(err) + } + now := time.Now() + + expectedTemplate := []tag.Template{template} + r.updateTimeForTemplate(&expectedTemplate[0], now) + + actualTemplate, actualError := r.repository.ReadAll(r.ctx) + r.updateTimeForTemplate(&actualTemplate[0], now) + + r.EqualValues(expectedTemplate, actualTemplate) + r.NoError(actualError) + }) + r.Run("should return template with multiple fields if exist", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + template.DisplayName = "Random Display" + template.Fields[0].DisplayName = "Another Random Display" + template.Fields = append(template.Fields, tag.Field{ + URN: "new_field", + DisplayName: "New Field", + Description: "This field is a new addition.", + DataType: "string", + }) + + err = r.repository.Create(r.ctx, &template) + r.NoError(err) + + templates, err := r.repository.ReadAll(r.ctx) + + r.NoError(err) + r.Len(templates[0].Fields, 2) + r.Equal(template.DisplayName, templates[0].DisplayName) + r.Equal(template.UpdatedAt, templates[0].UpdatedAt) + }) +} + +func (r *TagTemplateRepositoryTestSuite) TestUpdate() { + r.Run("should return error if template is nil", func() { + var template *tag.Template = nil + + expectedErrorMsg := "template is nil" + + actualError := r.repository.Update(r.ctx, "", template) + + r.EqualError(actualError, expectedErrorMsg) + }) + + r.Run("should return error if record not found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + actualError := r.repository.Update(r.ctx, template.URN, &template) + + r.Error(actualError) + }) + + r.Run("should return nil and updated template if update is success", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + err = r.repository.Create(r.ctx, &template) + r.NoError(err) + + template.DisplayName = "Random Display" + template.Fields[0].DisplayName = "Another Random Display" + template.Fields = append(template.Fields, tag.Field{ + URN: "new_field", + DisplayName: "New Field", + Description: "This field is a new addition.", + DataType: "string", + }) + + actualError := r.repository.Update(r.ctx, template.URN, &template) + r.NoError(actualError) + + templates, err := r.repository.Read(r.ctx, template.URN) + r.NoError(err) + + recordModelTemplate := templates[0] + r.Len(recordModelTemplate.Fields, 2) + r.Equal(template.DisplayName, recordModelTemplate.DisplayName) + r.True(template.UpdatedAt.Equal(recordModelTemplate.UpdatedAt)) + + expectedFields, err := json.Marshal(recordModelTemplate.Fields) + r.NoError(err) + + actualFields, err := json.Marshal(template.Fields) + r.NoError(err) + + r.JSONEq(string(expectedFields), string(actualFields)) + }) + + r.Run("should return error if trying to update with conflicting existing template", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template1 := r.getTemplate() + template1.URN = "hello1" + if err := r.repository.Create(r.ctx, &template1); err != nil { + panic(err) + } + template2 := r.getTemplate() + template2.URN = "hello2" + if err := r.repository.Create(r.ctx, &template2); err != nil { + panic(err) + } + targetURN := template2.URN + template2.URN = "hello1" + + actualError := r.repository.Update(r.ctx, targetURN, &template2) + + r.Error(actualError) + }) + + r.Run("should return error if trying to update with unrelated field", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + if err := r.repository.Create(r.ctx, &template); err != nil { + panic(err) + } + template.Fields[0].ID = 2 + + actualError := r.repository.Update(r.ctx, template.URN, &template) + + r.Error(actualError) + }) + + r.Run("should return error if trying to update with duplicated field", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + template.Fields = append(template.Fields, tag.Field{ + URN: "second_field", + DisplayName: "Second Field", + Description: "Random description for the second field.", + DataType: "string", + Required: false, + }) + + if err := r.repository.Create(r.ctx, &template); err != nil { + panic(err) + } + + template.Fields[1].URN = template.Fields[0].URN + + actualError := r.repository.Update(r.ctx, template.URN, &template) + + r.Error(actualError) + }) +} + +func (r *TagTemplateRepositoryTestSuite) TestDelete() { + r.Run("should return error if record not found", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + + err = r.repository.Delete(r.ctx, template.URN) + r.EqualError(err, "could not find template \"governance_policy\"") + }) + + r.Run("should return nil if record is deleted", func() { + err := setup(r.ctx, r.client) + r.NoError(err) + + template := r.getTemplate() + if err := r.repository.Create(r.ctx, &template); err != nil { + panic(err) + } + + actualError := r.repository.Delete(r.ctx, template.URN) + r.NoError(actualError) + + templates, err := r.repository.Read(r.ctx, template.URN) + r.NoError(err) + r.Empty(templates) + }) +} + +func (r *TagTemplateRepositoryTestSuite) getTemplate() tag.Template { + return tag.Template{ + URN: "governance_policy", + DisplayName: "Governance Policy", + Description: "Template that is mandatory to be used.", + Fields: []tag.Field{ + { + ID: 1, + URN: "team_owner", + DisplayName: "Team Owner", + Description: "Owner of the resource.", + DataType: "enumerated", + Required: true, + Options: []string{"PIC", "Escalated"}, + }, + }, + } +} + +func (r *TagTemplateRepositoryTestSuite) updateTimeForTemplate(template *tag.Template, t time.Time) { + template.CreatedAt = t + template.UpdatedAt = t + for i := 0; i < len(template.Fields); i++ { + template.Fields[i].CreatedAt = t + template.Fields[i].UpdatedAt = t + } +} + +func TestTagTemplateRepository(t *testing.T) { + suite.Run(t, &TagTemplateRepositoryTestSuite{}) +} diff --git a/store/postgres/template_repository.go b/store/postgres/template_repository.go deleted file mode 100644 index 46c19655..00000000 --- a/store/postgres/template_repository.go +++ /dev/null @@ -1,232 +0,0 @@ -package postgres - -import ( - "strings" - - "github.com/odpf/columbus/tag" - "github.com/pkg/errors" - "gorm.io/gorm" -) - -const fieldOptionSeparator = "," - -var ( - errNilDomainTemplate = errors.New("domain template is nil") -) - -// TemplateRepository is a type that manages template operation to the primary database -type TemplateRepository struct { - dbClient *gorm.DB -} - -// Create inserts template to database -func (r *TemplateRepository) Create(domainTemplate *tag.Template) error { - if domainTemplate == nil { - return errNilDomainTemplate - } - if r.dbClient == nil { - return errNilDBClient - } - modelTemplate := r.toModelTemplate(*domainTemplate) - if result := r.dbClient.Create(&modelTemplate); result.Error != nil { - return result.Error - } - r.updateDomainTemplate(domainTemplate, modelTemplate) - return nil -} - -// Read reads template from database -func (r *TemplateRepository) Read(filter tag.Template) ([]tag.Template, error) { - if r.dbClient == nil { - return nil, errNilDBClient - } - output := []tag.Template{} - modelTemplate := r.toModelTemplate(filter) - var rows []Template - res := r.dbClient.Where(modelTemplate).Preload("Fields").Find(&rows) - if res.Error != nil { - return output, errors.Wrap(res.Error, "error fetching templates") - } - for _, record := range rows { - tmplt := r.toDomainTemplate(record) - output = append(output, tmplt) - } - return output, nil -} - -// Update updates template into database -func (r *TemplateRepository) Update(domainTemplate *tag.Template) error { - if domainTemplate == nil { - return errNilDomainTemplate - } - if r.dbClient == nil { - return errNilDBClient - } - err := r.dbClient.Transaction(func(tx *gorm.DB) error { - templateToUpdateWith := r.toModelTemplate(*domainTemplate) - if err := r.updateModelTemplateToDB(tx, domainTemplate.URN, templateToUpdateWith); err != nil { - return err - } - return r.updateModelFieldsToDB(tx, templateToUpdateWith.URN, templateToUpdateWith.Fields) - }) - if err != nil { - return errors.Wrap(err, "error updating template") - } - var recordModelTemplate Template - res := r.dbClient.Preload("Fields").First(&recordModelTemplate, "urn = ?", domainTemplate.URN) - if errors.Is(res.Error, gorm.ErrRecordNotFound) { - return tag.TemplateNotFoundError{URN: domainTemplate.URN} - } - if res.Error != nil { - return errors.Wrap(res.Error, "error finding template") - } - - r.updateDomainTemplate(domainTemplate, recordModelTemplate) - return nil -} - -// Delete deletes template and its fields from database -func (r *TemplateRepository) Delete(filter tag.Template) error { - if r.dbClient == nil { - return errNilDBClient - } - var recordModelTemplate Template - res := r.dbClient.Preload("Fields").First(&recordModelTemplate, "urn = ?", filter.URN) - if errors.Is(res.Error, gorm.ErrRecordNotFound) { - return tag.TemplateNotFoundError{URN: filter.URN} - } - if res.Error != nil { - return errors.Wrap(res.Error, "error finding template") - } - deleteResult := r.dbClient.Transaction(func(tx *gorm.DB) error { - for _, field := range recordModelTemplate.Fields { - if err := tx.Delete(&field).Error; err != nil { - return err - } - } - return tx.Delete(&recordModelTemplate).Error - }) - return deleteResult -} - -func (r *TemplateRepository) updateModelTemplateToDB(tx *gorm.DB, targetURN string, templateToUpdateWith Template) error { - var recordModelTemplate Template - if err := tx.First(&recordModelTemplate, "urn = ?", targetURN).Error; err != nil { - return err - } - result := tx.Model(&recordModelTemplate).Updates(&templateToUpdateWith) - if result.Error != nil { - return result.Error - } - return nil -} - -func (r *TemplateRepository) updateModelFieldsToDB(tx *gorm.DB, templateURN string, fields []Field) error { - for _, field := range fields { - field.TemplateURN = templateURN - if field.ID == 0 { - createResult := tx.Create(&field) - if createResult.Error != nil { - return createResult.Error - } - } - var recordModelFieldByID Field - queryResult := tx.Where("id = ? and template_urn = ?", field.ID, field.TemplateURN). - First(&recordModelFieldByID) - if err := queryResult.Error; err != nil { - return err - } - recordModelFieldByID.URN = field.URN - recordModelFieldByID.DisplayName = field.DisplayName - recordModelFieldByID.Description = field.Description - recordModelFieldByID.DataType = field.DataType - recordModelFieldByID.Options = field.Options - recordModelFieldByID.Required = field.Required - if err := tx.Model(&recordModelFieldByID).Updates(&recordModelFieldByID).Error; err != nil { - return err - } - } - return nil -} - -func (r *TemplateRepository) updateDomainTemplate(target *tag.Template, source Template) { - target.URN = source.URN - target.DisplayName = source.DisplayName - target.Description = source.Description - target.CreatedAt = source.CreatedAt - target.UpdatedAt = source.UpdatedAt - target.Fields = r.toDomainField(source.Fields) -} - -func (r *TemplateRepository) toDomainTemplate(modelTemplate Template) tag.Template { - return tag.Template{ - URN: modelTemplate.URN, - DisplayName: modelTemplate.DisplayName, - Description: modelTemplate.Description, - Fields: r.toDomainField(modelTemplate.Fields), - CreatedAt: modelTemplate.CreatedAt, - UpdatedAt: modelTemplate.UpdatedAt, - } -} - -func (r *TemplateRepository) toDomainField(listOfModelField []Field) []tag.Field { - output := make([]tag.Field, len(listOfModelField)) - for i, field := range listOfModelField { - var options []string - if field.Options != nil { - options = strings.Split(*field.Options, fieldOptionSeparator) - } - output[i] = tag.Field{ - ID: field.ID, - URN: field.URN, - DisplayName: field.DisplayName, - Description: field.Description, - DataType: field.DataType, - Options: options, - Required: field.Required, - CreatedAt: field.CreatedAt, - UpdatedAt: field.UpdatedAt, - } - } - return output -} - -func (r *TemplateRepository) toModelTemplate(domainTemplate tag.Template) Template { - return Template{ - URN: domainTemplate.URN, - DisplayName: domainTemplate.DisplayName, - Description: domainTemplate.Description, - Fields: r.toModelField(domainTemplate.Fields), - } -} - -func (r *TemplateRepository) toModelField(listOfDomainField []tag.Field) []Field { - var output []Field - for _, field := range listOfDomainField { - var options *string - if len(field.Options) > 0 { - joinedOptions := strings.Join(field.Options, fieldOptionSeparator) - options = &joinedOptions - } - output = append(output, Field{ - ID: field.ID, - URN: field.URN, - DisplayName: field.DisplayName, - Description: field.Description, - DataType: field.DataType, - Options: options, - Required: field.Required, - }) - } - return output -} - -// NewTemplateRepository initializes template repository clients -func NewTemplateRepository(dbClient *gorm.DB) *TemplateRepository { - if dbClient == nil { - panic(errNilDBClient.Error()) - } - return &TemplateRepository{ - dbClient: dbClient, - } -} diff --git a/store/postgres/template_repository_test.go b/store/postgres/template_repository_test.go deleted file mode 100644 index be6e8275..00000000 --- a/store/postgres/template_repository_test.go +++ /dev/null @@ -1,337 +0,0 @@ -package postgres_test - -import ( - "testing" - "time" - - "github.com/odpf/columbus/store/postgres" - "github.com/odpf/columbus/tag" - - "github.com/stretchr/testify/suite" - "gorm.io/gorm" -) - -type TemplateRepositoryTestSuite struct { - suite.Suite - dbClient *gorm.DB - repository *postgres.TemplateRepository -} - -func (r *TemplateRepositoryTestSuite) Setup() { - r.dbClient, _ = newTestClient("file::memory:") - r.dbClient.AutoMigrate(&postgres.Template{}) - r.dbClient.AutoMigrate(&postgres.Field{}) - r.dbClient.AutoMigrate(&postgres.Tag{}) - repository := postgres.NewTemplateRepository(r.dbClient) - r.repository = repository -} - -func (r *TemplateRepositoryTestSuite) TestNewRepository() { - r.Run("should return repository and nil if db client is not nil", func() { - dbClient := &gorm.DB{} - - actualRepository := postgres.NewTemplateRepository(dbClient) - r.NotNil(actualRepository) - }) -} - -func (r *TemplateRepositoryTestSuite) TestCreate() { - r.Run("should return error if domain template is nil", func() { - r.Setup() - var domainTemplate *tag.Template = nil - - expectedErrorMsg := "domain template is nil" - - actualError := r.repository.Create(domainTemplate) - - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return error if db client is nil", func() { - domainTemplate := tag.Template{ - URN: "governance_policy", - } - repository := &postgres.TemplateRepository{} - - expectedErrorMsg := "db client is nil" - - actualError := repository.Create(&domainTemplate) - - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return nil and insert new record if no error found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - - actualError := r.repository.Create(&domainTemplate) - var actualRecord postgres.Template - result := r.dbClient.Preload("Fields").First(&actualRecord) - - r.NoError(actualError) - r.NotZero(result.RowsAffected) - r.Equal(domainTemplate.URN, actualRecord.URN) - r.Equal(domainTemplate.DisplayName, actualRecord.DisplayName) - r.Equal(domainTemplate.Description, actualRecord.Description) - r.Equal(len(domainTemplate.Fields), len(actualRecord.Fields)) - r.Equal(domainTemplate.Fields[0].DisplayName, actualRecord.Fields[0].DisplayName) - r.Equal(domainTemplate.Fields[0].URN, actualRecord.Fields[0].URN) - }) - - r.Run("should return nil and update domain template", func() { - r.Setup() - originalDomainTemplate := r.getDomainTemplate() - referenceDomainTemplate := r.getDomainTemplate() - - actualError := r.repository.Create(&originalDomainTemplate) - var actualRecord postgres.Template - r.dbClient.Preload("Fields").First(&actualRecord) - - r.NoError(actualError) - r.Equal(referenceDomainTemplate.URN, originalDomainTemplate.URN) - r.NotEqual(referenceDomainTemplate.CreatedAt, originalDomainTemplate.CreatedAt) - r.NotEqual(referenceDomainTemplate.UpdatedAt, originalDomainTemplate.UpdatedAt) - r.Equal(referenceDomainTemplate.Fields[0].ID, originalDomainTemplate.Fields[0].ID) - r.Equal(referenceDomainTemplate.Fields[0].URN, originalDomainTemplate.Fields[0].URN) - r.NotEqual(referenceDomainTemplate.Fields[0].CreatedAt, originalDomainTemplate.Fields[0].CreatedAt) - r.NotEqual(referenceDomainTemplate.Fields[0].UpdatedAt, originalDomainTemplate.Fields[0].UpdatedAt) - }) - - r.Run("should return error if encountered uncovered error", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - - r.repository.Create(&domainTemplate) - actualError := r.repository.Create(&domainTemplate) - - r.Error(actualError) - }) -} - -func (r *TemplateRepositoryTestSuite) TestRead() { - r.Run("should return nil and error if db client is nil", func() { - domainTemplate := r.getDomainTemplate() - repository := &postgres.TemplateRepository{} - - expectedErrorMsg := "db client is nil" - - actualTemplate, actualError := repository.Read(domainTemplate) - - r.Nil(actualTemplate) - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return empty and nil if no record found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - - actualTemplate, actualError := r.repository.Read(domainTemplate) - - r.Empty(actualTemplate) - r.NoError(actualError) - }) - - r.Run("should return domain templates and nil if found any", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - if err := r.repository.Create(&domainTemplate); err != nil { - panic(err) - } - now := time.Now() - - expectedTemplate := []tag.Template{domainTemplate} - r.updateTimeForDomainTemplate(&expectedTemplate[0], now) - - actualTemplate, actualError := r.repository.Read(domainTemplate) - r.updateTimeForDomainTemplate(&actualTemplate[0], now) - - r.EqualValues(expectedTemplate, actualTemplate) - r.NoError(actualError) - }) -} - -func (r *TemplateRepositoryTestSuite) TestUpdate() { - r.Run("should return error if domain template is nil", func() { - r.Setup() - var domainTemplate *tag.Template = nil - - expectedErrorMsg := "domain template is nil" - - actualError := r.repository.Update(domainTemplate) - - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return error if db client is nil", func() { - domainTemplate := r.getDomainTemplate() - repository := &postgres.TemplateRepository{} - - expectedErrorMsg := "db client is nil" - - actualError := repository.Update(&domainTemplate) - - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return error if record not found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - - actualError := r.repository.Update(&domainTemplate) - - r.Error(actualError) - }) - - r.Run("should return nil and updated domain template if update is success", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - err := r.repository.Create(&domainTemplate) - r.NoError(err) - - domainTemplate.DisplayName = "Random Display" - domainTemplate.Fields[0].DisplayName = "Another Random Display" - domainTemplate.Fields = append(domainTemplate.Fields, tag.Field{ - URN: "new_field", - DisplayName: "New Field", - Description: "This field is a new addition.", - DataType: "string", - }) - - actualError := r.repository.Update(&domainTemplate) - r.NoError(actualError) - - var recordModelTemplate postgres.Template - if err := r.dbClient.Preload("Fields").First(&recordModelTemplate).Error; err != nil { - panic(err) - } - r.Equal(domainTemplate.DisplayName, recordModelTemplate.DisplayName) - r.Equal(domainTemplate.Fields[0].DisplayName, recordModelTemplate.Fields[0].DisplayName) - r.Equal(domainTemplate.UpdatedAt, recordModelTemplate.UpdatedAt) - r.Equal(domainTemplate.Fields[0].UpdatedAt, recordModelTemplate.Fields[0].UpdatedAt) - }) - - r.Run("should return error if trying to update with duplicate template", func() { - r.Setup() - domainTemplate1 := r.getDomainTemplate() - domainTemplate1.URN = "hello1" - if err := r.repository.Create(&domainTemplate1); err != nil { - panic(err) - } - domainTemplate2 := r.getDomainTemplate() - domainTemplate2.URN = "hello2" - if err := r.repository.Create(&domainTemplate2); err != nil { - panic(err) - } - domainTemplate2.URN = "hello1" - - actualError := r.repository.Update(&domainTemplate2) - - r.Error(actualError) - }) - - r.Run("should return error if trying to update with unrelated field", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - if err := r.repository.Create(&domainTemplate); err != nil { - panic(err) - } - domainTemplate.Fields[0].ID = 2 - - actualError := r.repository.Update(&domainTemplate) - - r.Error(actualError) - }) - - r.Run("should return error if trying to update with duplicate field", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - domainTemplate.Fields = append(domainTemplate.Fields, tag.Field{ - URN: "second_field", - DisplayName: "Second Field", - Description: "Random description for the second field.", - DataType: "string", - Required: false, - }) - if err := r.repository.Create(&domainTemplate); err != nil { - panic(err) - } - domainTemplate.Fields[1].URN = domainTemplate.Fields[0].URN - - actualError := r.repository.Update(&domainTemplate) - - r.Error(actualError) - }) -} - -func (r *TemplateRepositoryTestSuite) TestDelete() { - r.Run("should return error if db client is nil", func() { - domainTemplate := r.getDomainTemplate() - repository := &postgres.TemplateRepository{} - - expectedErrorMsg := "db client is nil" - - actualError := repository.Delete(domainTemplate) - - r.EqualError(actualError, expectedErrorMsg) - }) - - r.Run("should return error if record not found", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - - err := r.repository.Delete(domainTemplate) - - r.Error(err) - r.ErrorAs(err, new(tag.TemplateNotFoundError)) - }) - - r.Run("should return nil if record is deleted", func() { - r.Setup() - domainTemplate := r.getDomainTemplate() - if err := r.repository.Create(&domainTemplate); err != nil { - panic(err) - } - - actualError := r.repository.Delete(domainTemplate) - var actualModelTemplate postgres.Template - templateResult := r.dbClient.First(&actualModelTemplate) - var actualModelField postgres.Field - fieldResult := r.dbClient.First(&actualModelField) - - r.NoError(actualError) - r.Zero(templateResult.RowsAffected) - r.Zero(fieldResult.RowsAffected) - }) -} - -func (r *TemplateRepositoryTestSuite) getDomainTemplate() tag.Template { - return tag.Template{ - URN: "governance_policy", - DisplayName: "Governance Policy", - Description: "Template that is mandatory to be used.", - Fields: []tag.Field{ - { - ID: 1, - URN: "team_owner", - DisplayName: "Team Owner", - Description: "Owner of the resource.", - DataType: "enumerated", - Required: true, - Options: []string{"PIC", "Escalated"}, - }, - }, - } -} - -func (r *TemplateRepositoryTestSuite) updateTimeForDomainTemplate(domainTemplate *tag.Template, t time.Time) { - domainTemplate.CreatedAt = t - domainTemplate.UpdatedAt = t - for i := 0; i < len(domainTemplate.Fields); i++ { - domainTemplate.Fields[i].CreatedAt = t - domainTemplate.Fields[i].UpdatedAt = t - } -} - -func TestTemplateRepository(t *testing.T) { - suite.Run(t, &TemplateRepositoryTestSuite{}) -} diff --git a/store/postgres/util_test.go b/store/postgres/util_test.go deleted file mode 100644 index 40d53e41..00000000 --- a/store/postgres/util_test.go +++ /dev/null @@ -1,11 +0,0 @@ -package postgres_test - -import ( - "gorm.io/driver/sqlite" - "gorm.io/gorm" -) - -// newTestClient initializes database connection -func newTestClient(dsn string) (*gorm.DB, error) { - return gorm.Open(sqlite.Open(dsn), &gorm.Config{}) -} diff --git a/tag/mocks/TagRepository.go b/tag/mocks/TagRepository.go index 62cba5a0..ad6d2826 100644 --- a/tag/mocks/TagRepository.go +++ b/tag/mocks/TagRepository.go @@ -1,8 +1,10 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.9.4. DO NOT EDIT. package mocks import ( + context "context" + tag "github.com/odpf/columbus/tag" mock "github.com/stretchr/testify/mock" ) @@ -12,13 +14,13 @@ type TagRepository struct { mock.Mock } -// Create provides a mock function with given fields: tag -func (_m *TagRepository) Create(t *tag.Tag) error { - ret := _m.Called(t) +// Create provides a mock function with given fields: ctx, _a1 +func (_m *TagRepository) Create(ctx context.Context, _a1 *tag.Tag) error { + ret := _m.Called(ctx, _a1) var r0 error - if rf, ok := ret.Get(0).(func(*tag.Tag) error); ok { - r0 = rf(t) + if rf, ok := ret.Get(0).(func(context.Context, *tag.Tag) error); ok { + r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) } @@ -26,13 +28,13 @@ func (_m *TagRepository) Create(t *tag.Tag) error { return r0 } -// Delete provides a mock function with given fields: filter -func (_m *TagRepository) Delete(filter tag.Tag) error { - ret := _m.Called(filter) +// Delete provides a mock function with given fields: ctx, filter +func (_m *TagRepository) Delete(ctx context.Context, filter tag.Tag) error { + ret := _m.Called(ctx, filter) var r0 error - if rf, ok := ret.Get(0).(func(tag.Tag) error); ok { - r0 = rf(filter) + if rf, ok := ret.Get(0).(func(context.Context, tag.Tag) error); ok { + r0 = rf(ctx, filter) } else { r0 = ret.Error(0) } @@ -40,13 +42,13 @@ func (_m *TagRepository) Delete(filter tag.Tag) error { return r0 } -// Read provides a mock function with given fields: filter -func (_m *TagRepository) Read(filter tag.Tag) ([]tag.Tag, error) { - ret := _m.Called(filter) +// Read provides a mock function with given fields: ctx, filter +func (_m *TagRepository) Read(ctx context.Context, filter tag.Tag) ([]tag.Tag, error) { + ret := _m.Called(ctx, filter) var r0 []tag.Tag - if rf, ok := ret.Get(0).(func(tag.Tag) []tag.Tag); ok { - r0 = rf(filter) + if rf, ok := ret.Get(0).(func(context.Context, tag.Tag) []tag.Tag); ok { + r0 = rf(ctx, filter) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]tag.Tag) @@ -54,8 +56,8 @@ func (_m *TagRepository) Read(filter tag.Tag) ([]tag.Tag, error) { } var r1 error - if rf, ok := ret.Get(1).(func(tag.Tag) error); ok { - r1 = rf(filter) + if rf, ok := ret.Get(1).(func(context.Context, tag.Tag) error); ok { + r1 = rf(ctx, filter) } else { r1 = ret.Error(1) } @@ -63,13 +65,13 @@ func (_m *TagRepository) Read(filter tag.Tag) ([]tag.Tag, error) { return r0, r1 } -// Update provides a mock function with given fields: tag -func (_m *TagRepository) Update(t *tag.Tag) error { - ret := _m.Called(t) +// Update provides a mock function with given fields: ctx, _a1 +func (_m *TagRepository) Update(ctx context.Context, _a1 *tag.Tag) error { + ret := _m.Called(ctx, _a1) var r0 error - if rf, ok := ret.Get(0).(func(*tag.Tag) error); ok { - r0 = rf(t) + if rf, ok := ret.Get(0).(func(context.Context, *tag.Tag) error); ok { + r0 = rf(ctx, _a1) } else { r0 = ret.Error(0) } diff --git a/tag/mocks/TemplateRepository.go b/tag/mocks/TemplateRepository.go index 4a752e26..eed83339 100644 --- a/tag/mocks/TemplateRepository.go +++ b/tag/mocks/TemplateRepository.go @@ -1,8 +1,10 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.9.4. DO NOT EDIT. package mocks import ( + context "context" + tag "github.com/odpf/columbus/tag" mock "github.com/stretchr/testify/mock" ) @@ -12,13 +14,13 @@ type TemplateRepository struct { mock.Mock } -// Create provides a mock function with given fields: template -func (_m *TemplateRepository) Create(template *tag.Template) error { - ret := _m.Called(template) +// Create provides a mock function with given fields: ctx, template +func (_m *TemplateRepository) Create(ctx context.Context, template *tag.Template) error { + ret := _m.Called(ctx, template) var r0 error - if rf, ok := ret.Get(0).(func(*tag.Template) error); ok { - r0 = rf(template) + if rf, ok := ret.Get(0).(func(context.Context, *tag.Template) error); ok { + r0 = rf(ctx, template) } else { r0 = ret.Error(0) } @@ -26,13 +28,13 @@ func (_m *TemplateRepository) Create(template *tag.Template) error { return r0 } -// Delete provides a mock function with given fields: filter -func (_m *TemplateRepository) Delete(filter tag.Template) error { - ret := _m.Called(filter) +// Delete provides a mock function with given fields: ctx, templateURN +func (_m *TemplateRepository) Delete(ctx context.Context, templateURN string) error { + ret := _m.Called(ctx, templateURN) var r0 error - if rf, ok := ret.Get(0).(func(tag.Template) error); ok { - r0 = rf(filter) + if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { + r0 = rf(ctx, templateURN) } else { r0 = ret.Error(0) } @@ -40,13 +42,36 @@ func (_m *TemplateRepository) Delete(filter tag.Template) error { return r0 } -// Read provides a mock function with given fields: filter -func (_m *TemplateRepository) Read(filter tag.Template) ([]tag.Template, error) { - ret := _m.Called(filter) +// Read provides a mock function with given fields: ctx, templateURN +func (_m *TemplateRepository) Read(ctx context.Context, templateURN string) ([]tag.Template, error) { + ret := _m.Called(ctx, templateURN) + + var r0 []tag.Template + if rf, ok := ret.Get(0).(func(context.Context, string) []tag.Template); ok { + r0 = rf(ctx, templateURN) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]tag.Template) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { + r1 = rf(ctx, templateURN) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ReadAll provides a mock function with given fields: ctx +func (_m *TemplateRepository) ReadAll(ctx context.Context) ([]tag.Template, error) { + ret := _m.Called(ctx) var r0 []tag.Template - if rf, ok := ret.Get(0).(func(tag.Template) []tag.Template); ok { - r0 = rf(filter) + if rf, ok := ret.Get(0).(func(context.Context) []tag.Template); ok { + r0 = rf(ctx) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]tag.Template) @@ -54,8 +79,8 @@ func (_m *TemplateRepository) Read(filter tag.Template) ([]tag.Template, error) } var r1 error - if rf, ok := ret.Get(1).(func(tag.Template) error); ok { - r1 = rf(filter) + if rf, ok := ret.Get(1).(func(context.Context) error); ok { + r1 = rf(ctx) } else { r1 = ret.Error(1) } @@ -63,13 +88,13 @@ func (_m *TemplateRepository) Read(filter tag.Template) ([]tag.Template, error) return r0, r1 } -// Update provides a mock function with given fields: template -func (_m *TemplateRepository) Update(template *tag.Template) error { - ret := _m.Called(template) +// Update provides a mock function with given fields: ctx, templateURN, template +func (_m *TemplateRepository) Update(ctx context.Context, templateURN string, template *tag.Template) error { + ret := _m.Called(ctx, templateURN, template) var r0 error - if rf, ok := ret.Get(0).(func(*tag.Template) error); ok { - r0 = rf(template) + if rf, ok := ret.Get(0).(func(context.Context, string, *tag.Template) error); ok { + r0 = rf(ctx, templateURN, template) } else { r0 = ret.Error(0) } diff --git a/tag/service.go b/tag/service.go index a0fbd70b..e8ec23ae 100644 --- a/tag/service.go +++ b/tag/service.go @@ -1,6 +1,7 @@ package tag import ( + "context" "fmt" "github.com/odpf/columbus/tag/validator" @@ -29,11 +30,11 @@ func (s *Service) Validate(tag *Tag) error { } // Create handles business process for create -func (s *Service) Create(tag *Tag) error { +func (s *Service) Create(ctx context.Context, tag *Tag) error { if err := s.Validate(tag); err != nil { return err } - template, err := s.templateService.Find(tag.TemplateURN) + template, err := s.templateService.Find(ctx, tag.TemplateURN) if err != nil { return errors.Wrap(err, "error finding template") } @@ -46,7 +47,7 @@ func (s *Service) Create(tag *Tag) error { if err := s.validateFieldValueIsValid(*tag, template); err != nil { return err } - if err := s.repository.Create(tag); err != nil { + if err := s.repository.Create(ctx, tag); err != nil { return err } @@ -54,18 +55,18 @@ func (s *Service) Create(tag *Tag) error { } // GetByRecord handles business process to get tags by its resource urn -func (s *Service) GetByRecord(recordType, recordURN string) ([]Tag, error) { +func (s *Service) GetByRecord(ctx context.Context, recordType, recordURN string) ([]Tag, error) { tag := Tag{RecordType: recordType, RecordURN: recordURN} - return s.repository.Read(tag) + return s.repository.Read(ctx, tag) } // FindByRecordAndTemplate handles business process to get tags by its resource id and template id -func (s *Service) FindByRecordAndTemplate(recordType, recordURN, templateURN string) (Tag, error) { - _, err := s.templateService.Find(templateURN) +func (s *Service) FindByRecordAndTemplate(ctx context.Context, recordType, recordURN, templateURN string) (Tag, error) { + _, err := s.templateService.Find(ctx, templateURN) if err != nil { return Tag{}, err } - listOfTag, err := s.repository.Read(Tag{RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN}) + listOfTag, err := s.repository.Read(ctx, Tag{RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN}) if err != nil { return Tag{}, err } @@ -79,12 +80,12 @@ func (s *Service) FindByRecordAndTemplate(recordType, recordURN, templateURN str } // Delete handles business process to delete a tag -func (s *Service) Delete(recordType, recordURN, templateURN string) error { - _, err := s.templateService.Find(templateURN) +func (s *Service) Delete(ctx context.Context, recordType, recordURN, templateURN string) error { + _, err := s.templateService.Find(ctx, templateURN) if err != nil { return errors.Wrap(err, "error finding template") } - if err := s.repository.Delete(Tag{ + if err := s.repository.Delete(ctx, Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: templateURN, @@ -95,15 +96,15 @@ func (s *Service) Delete(recordType, recordURN, templateURN string) error { } // Update handles business process for update -func (s *Service) Update(tag *Tag) error { +func (s *Service) Update(ctx context.Context, tag *Tag) error { if err := s.Validate(tag); err != nil { return err } - template, err := s.templateService.Find(tag.TemplateURN) + template, err := s.templateService.Find(ctx, tag.TemplateURN) if err != nil { return errors.Wrap(err, "error finding template") } - existingTags, err := s.repository.Read(Tag{ + existingTags, err := s.repository.Read(ctx, Tag{ RecordType: tag.RecordType, RecordURN: tag.RecordURN, TemplateURN: tag.TemplateURN, @@ -121,7 +122,7 @@ func (s *Service) Update(tag *Tag) error { if err := s.validateFieldValueIsValid(*tag, template); err != nil { return err } - if err := s.repository.Update(tag); err != nil { + if err := s.repository.Update(ctx, tag); err != nil { return errors.Wrap(err, "error updating tag") } return nil diff --git a/tag/service_test.go b/tag/service_test.go index 26f8c7ed..72aecf30 100644 --- a/tag/service_test.go +++ b/tag/service_test.go @@ -1,6 +1,7 @@ package tag_test import ( + "context" "errors" "fmt" "testing" @@ -9,6 +10,7 @@ import ( "github.com/odpf/columbus/tag/mocks" "github.com/odpf/columbus/tag/validator" + "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) @@ -163,6 +165,8 @@ func (s *ServiceTestSuite) TestValidate() { } func (s *ServiceTestSuite) TestCreate() { + ctx := context.TODO() + s.Run("should return error if value validations return error", func() { s.Setup() t := s.buildTag() @@ -175,7 +179,7 @@ func (s *ServiceTestSuite) TestCreate() { }, } - actualError := s.tagService.Create(&t) + actualError := s.tagService.Create(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) }) @@ -184,9 +188,9 @@ func (s *ServiceTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return(nil, errors.New("random error")) + s.templateRepo.On("Read", mock.Anything, template.URN).Return(nil, errors.New("random error")) - err := s.tagService.Create(&t) + err := s.tagService.Create(ctx, &t) s.Error(err) }) @@ -196,7 +200,7 @@ func (s *ServiceTestSuite) TestCreate() { t.TagValues[0].FieldID = 5 template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) expectedErrorMsg := "error with [fields[0].id : not part of template [governance_policy]]" expectedFieldError := tag.ValidationError{ @@ -205,7 +209,7 @@ func (s *ServiceTestSuite) TestCreate() { }, } - actualError := s.tagService.Create(&t) + actualError := s.tagService.Create(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -217,7 +221,7 @@ func (s *ServiceTestSuite) TestCreate() { t.TagValues = t.TagValues[:1] template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) expectedErrorMsg := "error with [fields[1].id : required by template [governance_policy]]" expectedFieldError := tag.ValidationError{ @@ -226,7 +230,7 @@ func (s *ServiceTestSuite) TestCreate() { }, } - actualError := s.tagService.Create(&t) + actualError := s.tagService.Create(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -238,7 +242,7 @@ func (s *ServiceTestSuite) TestCreate() { t.TagValues[1].FieldValue = "hello" template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) expectedErrorMsg := "error with [fields[1].value : template [governance_policy] on field [2] should be boolean]" expectedFieldError := tag.ValidationError{ @@ -247,7 +251,7 @@ func (s *ServiceTestSuite) TestCreate() { }, } - actualError := s.tagService.Create(&t) + actualError := s.tagService.Create(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -257,10 +261,10 @@ func (s *ServiceTestSuite) TestCreate() { s.Setup() t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Create", &t).Return(errors.New("random error")) + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Create", mock.Anything, &t).Return(errors.New("random error")) - err := s.tagService.Create(&t) + err := s.tagService.Create(ctx, &t) s.Error(err) }) @@ -269,29 +273,31 @@ func (s *ServiceTestSuite) TestCreate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Create", &t).Return(nil) + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Create", mock.Anything, &t).Return(nil) - actualError := s.tagService.Create(&t) + actualError := s.tagService.Create(ctx, &t) s.NoError(actualError) }) } func (s *ServiceTestSuite) TestGetByRecord() { + ctx := context.TODO() + s.Run("should return tags and error based on the repository", func() { s.Setup() t := s.buildTag() template := s.buildTemplate() expectedTag := []tag.Tag{t} - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, }).Return(expectedTag, nil) - actualTag, actualError := s.tagService.GetByRecord(t.RecordType, t.RecordURN) + actualTag, actualError := s.tagService.GetByRecord(ctx, t.RecordType, t.RecordURN) s.EqualValues(expectedTag, actualTag) s.NoError(actualError) @@ -299,13 +305,15 @@ func (s *ServiceTestSuite) TestGetByRecord() { } func (s *ServiceTestSuite) TestFindByRecordAndTemplate() { + ctx := context.TODO() + s.Run("should return error if error retrieving template", func() { s.Setup() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return(nil, errors.New("random error")) + s.templateRepo.On("Read", mock.Anything, template.URN).Return(nil, errors.New("random error")) - _, err := s.tagService.FindByRecordAndTemplate("record-type", "record-urn", template.URN) + _, err := s.tagService.FindByRecordAndTemplate(ctx, "record-type", "record-urn", template.URN) s.Error(err) }) @@ -314,14 +322,14 @@ func (s *ServiceTestSuite) TestFindByRecordAndTemplate() { var recordType string = "record-type" var urn string = "record-urn" template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: urn, TemplateURN: template.URN, }).Return([]tag.Tag{}, nil) - _, err := s.tagService.FindByRecordAndTemplate(recordType, urn, template.URN) + _, err := s.tagService.FindByRecordAndTemplate(ctx, recordType, urn, template.URN) s.ErrorIs(err, tag.NotFoundError{ Type: recordType, URN: urn, @@ -334,8 +342,8 @@ func (s *ServiceTestSuite) TestFindByRecordAndTemplate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, @@ -343,7 +351,7 @@ func (s *ServiceTestSuite) TestFindByRecordAndTemplate() { expectedTag := t - actualTag, actualError := s.tagService.FindByRecordAndTemplate(t.RecordType, t.RecordURN, template.URN) + actualTag, actualError := s.tagService.FindByRecordAndTemplate(ctx, t.RecordType, t.RecordURN, template.URN) s.EqualValues(expectedTag, actualTag) s.NoError(actualError) @@ -351,6 +359,8 @@ func (s *ServiceTestSuite) TestFindByRecordAndTemplate() { } func (s *ServiceTestSuite) TestUpdate() { + ctx := context.TODO() + s.Run("should return error if value validations return error", func() { s.Setup() t := s.buildTag() @@ -362,7 +372,7 @@ func (s *ServiceTestSuite) TestUpdate() { "record_urn": "cannot be empty", }, } - actualError := s.tagService.Update(&t) + actualError := s.tagService.Update(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -373,9 +383,9 @@ func (s *ServiceTestSuite) TestUpdate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return(nil, errors.New("random error")) + s.templateRepo.On("Read", mock.Anything, template.URN).Return(nil, errors.New("random error")) - err := s.tagService.Update(&t) + err := s.tagService.Update(ctx, &t) s.Error(err) }) @@ -384,14 +394,14 @@ func (s *ServiceTestSuite) TestUpdate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, }).Return([]tag.Tag{}, nil) - err := s.tagService.Update(&t) + err := s.tagService.Update(ctx, &t) s.Error(err) s.ErrorIs(err, tag.NotFoundError{URN: t.RecordURN, Type: t.RecordType, Template: t.TemplateURN}) @@ -403,8 +413,8 @@ func (s *ServiceTestSuite) TestUpdate() { t.TagValues[0].FieldID = 5 template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, @@ -417,7 +427,7 @@ func (s *ServiceTestSuite) TestUpdate() { }, } - actualError := s.tagService.Update(&t) + actualError := s.tagService.Update(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -428,8 +438,8 @@ func (s *ServiceTestSuite) TestUpdate() { t.TagValues[1].FieldValue = "hello" template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, @@ -442,7 +452,7 @@ func (s *ServiceTestSuite) TestUpdate() { }, } - actualError := s.tagService.Update(&t) + actualError := s.tagService.Update(ctx, &t) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -453,15 +463,15 @@ func (s *ServiceTestSuite) TestUpdate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, }).Return([]tag.Tag{t}, nil) - s.repository.On("Update", &t).Return(errors.New("random error")) + s.repository.On("Update", mock.Anything, &t).Return(errors.New("random error")) - err := s.tagService.Update(&t) + err := s.tagService.Update(ctx, &t) s.Error(err) }) @@ -470,28 +480,30 @@ func (s *ServiceTestSuite) TestUpdate() { t := s.buildTag() template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Read", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Read", mock.Anything, tag.Tag{ RecordType: t.RecordType, RecordURN: t.RecordURN, TemplateURN: t.TemplateURN, }).Return([]tag.Tag{t}, nil) - s.repository.On("Update", &t).Return(nil) + s.repository.On("Update", mock.Anything, &t).Return(nil) - actualError := s.tagService.Update(&t) + actualError := s.tagService.Update(ctx, &t) s.NoError(actualError) }) } func (s *ServiceTestSuite) TestDelete() { + ctx := context.TODO() + s.Run("should return error if error retrieving template", func() { s.Setup() templateURN := "template-urn" - s.templateRepo.On("Read", s.templateQuery(templateURN)).Return(nil, errors.New("random error")) + s.templateRepo.On("Read", mock.Anything, templateURN).Return(nil, errors.New("random error")) - err := s.tagService.Delete("record-type", "record-urn", templateURN) + err := s.tagService.Delete(ctx, "record-type", "record-urn", templateURN) s.Error(err) }) @@ -501,14 +513,14 @@ func (s *ServiceTestSuite) TestDelete() { recordURN := "sample-urn" template := s.buildTemplate() - s.templateRepo.On("Read", s.templateQuery(template.URN)).Return([]tag.Template{template}, nil) - s.repository.On("Delete", tag.Tag{ + s.templateRepo.On("Read", mock.Anything, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Delete", mock.Anything, tag.Tag{ RecordType: recordType, RecordURN: recordURN, TemplateURN: template.URN, }).Return(errors.New("random error")) - err := s.tagService.Delete(recordType, recordURN, template.URN) + err := s.tagService.Delete(ctx, recordType, recordURN, template.URN) s.Error(err) }) } @@ -571,10 +583,6 @@ func (s *ServiceTestSuite) buildTag() tag.Tag { } } -func (s *ServiceTestSuite) templateQuery(urn string) tag.Template { - return tag.Template{URN: urn} -} - func TestService(t *testing.T) { suite.Run(t, &ServiceTestSuite{}) } diff --git a/tag/tag.go b/tag/tag.go index 282fd310..ad9eaeec 100644 --- a/tag/tag.go +++ b/tag/tag.go @@ -1,6 +1,7 @@ package tag import ( + "context" "time" ) @@ -30,8 +31,8 @@ type TagValue struct { // TagRepository is a contract to communicate with the primary store type TagRepository interface { - Create(tag *Tag) error - Read(filter Tag) ([]Tag, error) - Update(tag *Tag) error - Delete(filter Tag) error + Create(ctx context.Context, tag *Tag) error + Read(ctx context.Context, filter Tag) ([]Tag, error) + Update(ctx context.Context, tag *Tag) error + Delete(ctx context.Context, filter Tag) error } diff --git a/tag/template.go b/tag/tag_template.go similarity index 70% rename from tag/template.go rename to tag/tag_template.go index ee75940c..93e337b6 100644 --- a/tag/template.go +++ b/tag/tag_template.go @@ -1,6 +1,7 @@ package tag import ( + "context" "time" ) @@ -27,10 +28,11 @@ type Field struct { UpdatedAt time.Time `json:"updated_at"` } -// TemplateRepository is a contract to communicate with the primary store -type TemplateRepository interface { - Create(template *Template) error - Read(filter Template) ([]Template, error) - Update(template *Template) error - Delete(filter Template) error +// TagTemplateRepository is a contract to communicate with the primary store +type TagTemplateRepository interface { + Create(ctx context.Context, template *Template) error + Read(ctx context.Context, templateURN string) ([]Template, error) + ReadAll(ctx context.Context) ([]Template, error) + Update(ctx context.Context, templateURN string, template *Template) error + Delete(ctx context.Context, templateURN string) error } diff --git a/tag/template_service.go b/tag/tag_template_service.go similarity index 70% rename from tag/template_service.go rename to tag/tag_template_service.go index c4744bbd..9b25a315 100644 --- a/tag/template_service.go +++ b/tag/tag_template_service.go @@ -1,6 +1,7 @@ package tag import ( + "context" "fmt" "github.com/odpf/columbus/tag/validator" @@ -18,7 +19,7 @@ var validDomainFieldDataType = []string{ // Service is a type of service that manages business process type TemplateService struct { validator validator.Validator - repository TemplateRepository + repository TagTemplateRepository } // Validate validates domain template based on the business rule @@ -32,7 +33,7 @@ func (s *TemplateService) Validate(template Template) error { } // Create handles create business operation for template -func (s *TemplateService) Create(template *Template) error { +func (s *TemplateService) Create(ctx context.Context, template *Template) error { if template == nil { return errors.New("template is nil") } @@ -41,10 +42,7 @@ func (s *TemplateService) Create(template *Template) error { return err } - filterForExistence := Template{ - URN: template.URN, - } - templateRecords, err := s.repository.Read(filterForExistence) + templateRecords, err := s.repository.Read(ctx, template.URN) if err != nil { return errors.Wrap(err, "error checking template existence") } @@ -52,7 +50,7 @@ func (s *TemplateService) Create(template *Template) error { return DuplicateTemplateError{URN: template.URN} } - err = s.repository.Create(template) + err = s.repository.Create(ctx, template) if err != nil { return errors.Wrap(err, "error creating template") } @@ -61,8 +59,15 @@ func (s *TemplateService) Create(template *Template) error { } // Index handles read business operation for template -func (s *TemplateService) Index(template Template) ([]Template, error) { - output, err := s.repository.Read(template) +func (s *TemplateService) Index(ctx context.Context, templateURN string) ([]Template, error) { + if templateURN == "" { + output, err := s.repository.ReadAll(ctx) + if err != nil { + return nil, errors.Wrap(err, "error fetching templates") + } + return output, nil + } + output, err := s.repository.Read(ctx, templateURN) if err != nil { return nil, errors.Wrap(err, "error fetching templates") } @@ -70,7 +75,7 @@ func (s *TemplateService) Index(template Template) ([]Template, error) { } // Update handles update business operation for template -func (s *TemplateService) Update(template *Template) error { +func (s *TemplateService) Update(ctx context.Context, templateURN string, template *Template) error { if template == nil { return errors.New("template is nil") } @@ -78,15 +83,12 @@ func (s *TemplateService) Update(template *Template) error { if err != nil { return err } - filterForExistence := Template{ - URN: template.URN, - } - templateRecords, err := s.repository.Read(filterForExistence) + templateRecords, err := s.repository.Read(ctx, templateURN) if err != nil { return errors.Wrap(err, "error checking template existence") } if len(templateRecords) == 0 { - return TemplateNotFoundError{URN: template.URN} + return TemplateNotFoundError{URN: templateURN} } // check for duplication @@ -112,7 +114,7 @@ func (s *TemplateService) Update(template *Template) error { } } - err = s.repository.Update(template) + err = s.repository.Update(ctx, templateURN, template) if err != nil { return errors.Wrap(err, "error updating template") } @@ -120,11 +122,8 @@ func (s *TemplateService) Update(template *Template) error { } // Find handles request to get template by urn -func (s *TemplateService) Find(urn string) (Template, error) { - queryDomainTemplate := Template{ - URN: urn, - } - listOfDomainTemplate, err := s.repository.Read(queryDomainTemplate) +func (s *TemplateService) Find(ctx context.Context, urn string) (Template, error) { + listOfDomainTemplate, err := s.repository.Read(ctx, urn) if err != nil { return Template{}, errors.Wrap(err, "error reading repository") } @@ -135,11 +134,8 @@ func (s *TemplateService) Find(urn string) (Template, error) { } // Delete handles request to delete template by urn -func (s *TemplateService) Delete(urn string) error { - template := Template{ - URN: urn, - } - err := s.repository.Delete(template) +func (s *TemplateService) Delete(ctx context.Context, urn string) error { + err := s.repository.Delete(ctx, urn) if err != nil { return errors.Wrap(err, "error deleting template") } @@ -147,7 +143,7 @@ func (s *TemplateService) Delete(urn string) error { } // NewTemplateService initializes service template service -func NewTemplateService(r TemplateRepository) *TemplateService { +func NewTemplateService(r TagTemplateRepository) *TemplateService { return &TemplateService{ validator: newTemplateValidator(), repository: r, diff --git a/tag/template_service_test.go b/tag/tag_template_service_test.go similarity index 81% rename from tag/template_service_test.go rename to tag/tag_template_service_test.go index 96debec2..f3c56c30 100644 --- a/tag/template_service_test.go +++ b/tag/tag_template_service_test.go @@ -1,6 +1,7 @@ package tag_test import ( + "context" "errors" "fmt" "testing" @@ -258,10 +259,12 @@ func (s *TemplateServiceTestSuite) TestValidate() { } func (s *TemplateServiceTestSuite) TestCreate() { + ctx := context.TODO() + s.Run("should return error if domain template is nil", func() { s.Setup() - err := s.service.Create(nil) + err := s.service.Create(ctx, nil) s.Error(err) }) @@ -277,7 +280,7 @@ func (s *TemplateServiceTestSuite) TestCreate() { }, } - actualError := s.service.Create(&template) + actualError := s.service.Create(ctx, &template) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -286,24 +289,18 @@ func (s *TemplateServiceTestSuite) TestCreate() { s.Run("should return error if error encountered when checking for duplication", func() { s.Setup() template := s.buildTemplate() - filterForExistence := tag.Template{ - URN: template.URN, - } - s.repository.On("Read", filterForExistence).Return(nil, errors.New("unexpected error")) + s.repository.On("Read", ctx, template.URN).Return(nil, errors.New("unexpected error")) - err := s.service.Create(&template) + err := s.service.Create(ctx, &template) s.Error(err) }) s.Run("should return error if template specified by the urn already exists", func() { s.Setup() template := s.buildTemplate() - filterForExistence := tag.Template{ - URN: template.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{{}}, nil) + s.repository.On("Read", ctx, template.URN).Return([]tag.Template{{}}, nil) - err := s.service.Create(&template) + err := s.service.Create(ctx, &template) s.Equal(tag.DuplicateTemplateError{URN: template.URN}, err) }) @@ -313,13 +310,11 @@ func (s *TemplateServiceTestSuite) TestCreate() { originalDomainTemplate := s.buildTemplate() referenceDomainTemplate := s.buildTemplate() referenceDomainTemplate.CreatedAt = now - filterForExistence := tag.Template{ - URN: originalDomainTemplate.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{}, nil) - s.repository.On("Create", &originalDomainTemplate).Return(errors.New("unexpected error")) - err := s.service.Create(&originalDomainTemplate) + s.repository.On("Read", ctx, originalDomainTemplate.URN).Return([]tag.Template{}, nil) + s.repository.On("Create", ctx, &originalDomainTemplate).Return(errors.New("unexpected error")) + + err := s.service.Create(ctx, &originalDomainTemplate) s.Error(err) }) @@ -329,16 +324,14 @@ func (s *TemplateServiceTestSuite) TestCreate() { originalDomainTemplate := s.buildTemplate() referenceDomainTemplate := s.buildTemplate() referenceDomainTemplate.CreatedAt = now - filterForExistence := tag.Template{ - URN: originalDomainTemplate.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{}, nil) - s.repository.On("Create", &originalDomainTemplate).Run(func(args mock.Arguments) { - tmplt := args.Get(0).(*tag.Template) + + s.repository.On("Read", ctx, originalDomainTemplate.URN).Return([]tag.Template{}, nil) + s.repository.On("Create", ctx, &originalDomainTemplate).Run(func(args mock.Arguments) { + tmplt := args.Get(1).(*tag.Template) tmplt.CreatedAt = now }).Return(nil) - actualError := s.service.Create(&originalDomainTemplate) + actualError := s.service.Create(ctx, &originalDomainTemplate) s.NoError(actualError) s.EqualValues(referenceDomainTemplate, originalDomainTemplate) @@ -346,23 +339,25 @@ func (s *TemplateServiceTestSuite) TestCreate() { } func (s *TemplateServiceTestSuite) TestIndex() { + ctx := context.TODO() + s.Run("should return nil and error if encountered unexpected error during read", func() { s.Setup() template := s.buildTemplate() - s.repository.On("Read", template).Return(nil, errors.New("unexpected error")) + s.repository.On("Read", ctx, template.URN).Return(nil, errors.New("unexpected error")) - _, err := s.service.Index(template) + _, err := s.service.Index(ctx, template.URN) s.Error(err) }) s.Run("should return domain templates and nil if no error found", func() { s.Setup() template := s.buildTemplate() - s.repository.On("Read", template).Return([]tag.Template{template}, nil) + s.repository.On("Read", ctx, template.URN).Return([]tag.Template{template}, nil) expectedTemplate := []tag.Template{template} - actualTemplate, actualError := s.service.Index(template) + actualTemplate, actualError := s.service.Index(ctx, template.URN) s.EqualValues(expectedTemplate, actualTemplate) s.NoError(actualError) @@ -370,11 +365,13 @@ func (s *TemplateServiceTestSuite) TestIndex() { } func (s *TemplateServiceTestSuite) TestUpdate() { + ctx := context.TODO() + s.Run("should return error if domain template is nil", func() { s.Setup() var template *tag.Template = nil - err := s.service.Update(template) + err := s.service.Update(ctx, "", template) s.EqualError(err, "template is nil") }) @@ -390,7 +387,7 @@ func (s *TemplateServiceTestSuite) TestUpdate() { }, } - actualError := s.service.Update(&template) + actualError := s.service.Update(ctx, template.URN, &template) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -399,12 +396,10 @@ func (s *TemplateServiceTestSuite) TestUpdate() { s.Run("should return error if encountered unexpected error during read for existence", func() { s.Setup() template := s.buildTemplate() - filterForExistence := tag.Template{ - URN: template.URN, - } - s.repository.On("Read", filterForExistence).Return(nil, errors.New("unexpected error")) - err := s.service.Update(&template) + s.repository.On("Read", ctx, template.URN).Return(nil, errors.New("unexpected error")) + + err := s.service.Update(ctx, template.URN, &template) s.Error(err) }) @@ -414,10 +409,7 @@ func (s *TemplateServiceTestSuite) TestUpdate() { newTemplate := s.buildTemplate() newTemplate.Fields[0].ID = 99 - filterForExistence := tag.Template{ - URN: newTemplate.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{template}, nil) + s.repository.On("Read", ctx, newTemplate.URN).Return([]tag.Template{template}, nil) expectedErrorMsg := "error with [fields.[0].id : [99] is not part of the template]" expectedFieldError := tag.ValidationError{ @@ -428,7 +420,7 @@ func (s *TemplateServiceTestSuite) TestUpdate() { }, } - actualError := s.service.Update(&newTemplate) + actualError := s.service.Update(ctx, newTemplate.URN, &newTemplate) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -440,10 +432,7 @@ func (s *TemplateServiceTestSuite) TestUpdate() { newTemplate := s.buildTemplate() newTemplate.Fields[0].URN = template.Fields[1].URN - filterForExistence := tag.Template{ - URN: newTemplate.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{template}, nil) + s.repository.On("Read", ctx, newTemplate.URN).Return([]tag.Template{template}, nil) expectedErrorMsg := "error with [fields.[0].urn : [team_custodianr] already exists within the template]" expectedFieldError := tag.ValidationError{ @@ -454,7 +443,7 @@ func (s *TemplateServiceTestSuite) TestUpdate() { }, } - actualError := s.service.Update(&newTemplate) + actualError := s.service.Update(ctx, template.URN, &newTemplate) s.EqualError(actualError, expectedErrorMsg) s.EqualValues(expectedFieldError, actualError.(tag.ValidationError)) @@ -465,13 +454,10 @@ func (s *TemplateServiceTestSuite) TestUpdate() { template := s.buildTemplate() newTemplate := s.buildTemplate() - filterForExistence := tag.Template{ - URN: newTemplate.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{template}, nil) - s.repository.On("Update", &newTemplate).Return(errors.New("unexpected error")) + s.repository.On("Read", ctx, newTemplate.URN).Return([]tag.Template{template}, nil) + s.repository.On("Update", ctx, newTemplate.URN, &newTemplate).Return(errors.New("unexpected error")) - err := s.service.Update(&newTemplate) + err := s.service.Update(ctx, template.URN, &newTemplate) s.Error(err) }) @@ -480,35 +466,34 @@ func (s *TemplateServiceTestSuite) TestUpdate() { template := s.buildTemplate() newTemplate := s.buildTemplate() - filterForExistence := tag.Template{ - URN: template.URN, - } - s.repository.On("Read", filterForExistence).Return([]tag.Template{template}, nil) - s.repository.On("Update", &newTemplate).Run(func(args mock.Arguments) { + s.repository.On("Read", ctx, template.URN).Return([]tag.Template{template}, nil) + s.repository.On("Update", ctx, newTemplate.URN, &newTemplate).Run(func(args mock.Arguments) { newTemplate.UpdatedAt = time.Now() }).Return(nil) - actualError := s.service.Update(&newTemplate) + actualError := s.service.Update(ctx, template.URN, &newTemplate) s.NoError(actualError) }) } func (s *TemplateServiceTestSuite) TestFind() { + ctx := context.TODO() + s.Run("should return empty and error if found unexpected error", func() { s.Setup() var urn string = "sample-urn" - s.repository.On("Read", mock.Anything).Return(nil, errors.New("unexpected error")) + s.repository.On("Read", ctx, urn).Return(nil, errors.New("unexpected error")) - _, err := s.service.Find(urn) + _, err := s.service.Find(ctx, urn) s.Error(err) }) s.Run("should return not found error if template is not found", func() { s.Setup() var urn string = "sample-urn" - s.repository.On("Read", mock.Anything).Return([]tag.Template{}, nil) + s.repository.On("Read", ctx, urn).Return([]tag.Template{}, nil) - _, err := s.service.Find(urn) + _, err := s.service.Find(ctx, urn) s.Error(err) s.ErrorIs(err, tag.TemplateNotFoundError{URN: urn}) }) @@ -517,11 +502,11 @@ func (s *TemplateServiceTestSuite) TestFind() { s.Setup() var urn string = "sample-urn" template := s.buildTemplate() - s.repository.On("Read", mock.Anything).Return([]tag.Template{template}, nil) + s.repository.On("Read", ctx, urn).Return([]tag.Template{template}, nil) expectedTemplate := template - actualTemplate, actualError := s.service.Find(urn) + actualTemplate, actualError := s.service.Find(ctx, urn) s.EqualValues(expectedTemplate, actualTemplate) s.NoError(actualError) @@ -529,12 +514,14 @@ func (s *TemplateServiceTestSuite) TestFind() { } func (s *TemplateServiceTestSuite) TestDelete() { + ctx := context.TODO() + s.Run("should return error if encountered unexpected error during delete", func() { s.Setup() var urn string = "sample-urn" - s.repository.On("Delete", mock.Anything).Return(errors.New("unexpected error")) + s.repository.On("Delete", ctx, mock.Anything).Return(errors.New("unexpected error")) - actualError := s.service.Delete(urn) + actualError := s.service.Delete(ctx, urn) s.Error(actualError) s.EqualValues("error deleting template: unexpected error", actualError.Error()) @@ -543,11 +530,11 @@ func (s *TemplateServiceTestSuite) TestDelete() { s.Run("should return delete result from repository", func() { s.Setup() var urn string = "sample-urn" - s.repository.On("Delete", mock.Anything).Return(nil).Once() - s.repository.On("Delete", mock.Anything).Return(errors.New("unexpected error")).Once() + s.repository.On("Delete", ctx, mock.Anything).Return(nil).Once() + s.repository.On("Delete", ctx, mock.Anything).Return(errors.New("unexpected error")).Once() - actualError1 := s.service.Delete(urn) - actualError2 := s.service.Delete(urn) + actualError1 := s.service.Delete(ctx, urn) + actualError2 := s.service.Delete(ctx, urn) s.NoError(actualError1) s.Error(actualError2)