From 7732392a963dcdb7bf1a0d47777b1f62c2332474 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 29 Apr 2022 20:23:48 +0800 Subject: [PATCH 001/408] Add bots --- models/bots/runner.go | 108 +++++++ models/bots/task.go | 131 +++++++++ models/migrations/v216.go | 52 ++++ modules/actions/gitea/action.go | 79 ++++++ modules/actions/gitea/gitea.go | 60 ++++ modules/actions/gitea/planner.go | 265 +++++++++++++++++ modules/actions/gitea/workflow.go | 377 +++++++++++++++++++++++++ modules/actions/gitea/workflow_test.go | 100 +++++++ modules/actions/github/github.go | 165 +++++++++++ modules/actions/runner/runner.go | 27 ++ modules/context/response.go | 11 + modules/notification/bots/bots.go | 209 ++++++++++++++ modules/notification/notification.go | 2 + routers/api/bots/bots.go | 149 ++++++++++ routers/init.go | 4 + services/bots/bots.go | 62 ++++ 16 files changed, 1801 insertions(+) create mode 100644 models/bots/runner.go create mode 100644 models/bots/task.go create mode 100644 models/migrations/v216.go create mode 100644 modules/actions/gitea/action.go create mode 100644 modules/actions/gitea/gitea.go create mode 100644 modules/actions/gitea/planner.go create mode 100644 modules/actions/gitea/workflow.go create mode 100644 modules/actions/gitea/workflow_test.go create mode 100644 modules/actions/github/github.go create mode 100644 modules/actions/runner/runner.go create mode 100644 modules/notification/bots/bots.go create mode 100644 routers/api/bots/bots.go create mode 100644 services/bots/bots.go diff --git a/models/bots/runner.go b/models/bots/runner.go new file mode 100644 index 0000000000000..f09f89d8ea6d5 --- /dev/null +++ b/models/bots/runner.go @@ -0,0 +1,108 @@ +// Copyright 2021 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "fmt" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" + "xorm.io/builder" +) + +// ErrRunnerNotExist represents an error for bot runner not exist +type ErrRunnerNotExist struct { + UUID string +} + +func (err ErrRunnerNotExist) Error() string { + return fmt.Sprintf("Bot runner [%s] is not exist", err.UUID) +} + +// Runner represents runner machines +type Runner struct { + ID int64 + UUID string `xorm:"CHAR(36) UNIQUE"` + Name string `xorm:"VARCHAR(32) UNIQUE"` + OS string `xorm:"VARCHAR(16) index"` // the runner running os + Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture + Type string `xorm:"VARCHAR(16)"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Description string `xorm:"TEXT"` + Base int // 0 native 1 docker 2 virtual machine + RepoRange string // glob match which repositories could use this runner + Token string + LastOnline timeutil.TimeStamp `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` +} + +func (Runner) TableName() string { + return "actions_runner" +} + +func init() { + db.RegisterModel(&Runner{}) +} + +type GetRunnerOptions struct { + RepoID int64 + OwnerID int64 +} + +func (opts GetRunnerOptions) toCond() builder.Cond { + cond := builder.NewCond() + if opts.RepoID > 0 { + cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + } + if opts.OwnerID > 0 { + cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) + } + cond = cond.Or(builder.Eq{"repo_id": 0, "owner_id": 0}) + return cond +} + +// GetUsableRunner returns the usable runner +func GetUsableRunner(opts GetRunnerOptions) (*Runner, error) { + var runner Runner + has, err := db.GetEngine(db.DefaultContext). + Where(opts.toCond()). + Asc("last_online"). + Get(&runner) + if err != nil { + return nil, err + } + if !has { + return nil, ErrRunnerNotExist{} + } + + return &runner, nil +} + +// GetRunnerByUUID returns a bot runner via uuid +func GetRunnerByUUID(uuid string) (*Runner, error) { + var runner Runner + has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", uuid).Get(&runner) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunnerNotExist{ + UUID: uuid, + } + } + return &runner, nil +} + +// FindRunnersByRepoID returns all workers for the repository +func FindRunnersByRepoID(repoID int64) ([]*Runner, error) { + var runners []*Runner + err := db.GetEngine(db.DefaultContext).Where("repo_id=? OR repo_id=0", repoID). + Find(&runners) + if err != nil { + return nil, err + } + err = db.GetEngine(db.DefaultContext).Join("INNER", "repository", "repository.owner_id = bot_runner.owner_id").Find(&runners) + return runners, err +} diff --git a/models/bots/task.go b/models/bots/task.go new file mode 100644 index 0000000000000..65eb9de77b5ad --- /dev/null +++ b/models/bots/task.go @@ -0,0 +1,131 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "errors" + "fmt" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/timeutil" + + "github.com/google/uuid" +) + +// TaskStatus represents a task status +type TaskStatus int + +// enumerate all the statuses of bot task +const ( + TaskPending TaskStatus = iota // wait for assign + TaskAssigned // assigned to a runner + TaskRunning // running + TaskFailed + TaskFinished + TaskCanceled + TaskTimeout +) + +// Task represnets bot tasks +type Task struct { + ID int64 + UUID string `xorm:"CHAR(36)"` + RepoID int64 `xorm:"index"` + TriggerUserID int64 + Ref string + CommitSHA string + Event webhook.HookEventType + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status TaskStatus `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` +} + +// TableName represents a bot task +func (Task) TableName() string { + return "actions_task" +} + +// InsertTask inserts a bot task +func InsertTask(t *Task) error { + if t.UUID == "" { + t.UUID = uuid.New().String() + } + return db.Insert(db.DefaultContext, t) +} + +// UpdateTask updates bot task +func UpdateTask(t *Task, cols ...string) error { + _, err := db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) + return err +} + +// ErrTaskNotExist represents an error for bot task not exist +type ErrTaskNotExist struct { + UUID string +} + +func (err ErrTaskNotExist) Error() string { + return fmt.Sprintf("Bot task [%s] is not exist", err.UUID) +} + +// GetTaskByUUID gets bot task by uuid +func GetTaskByUUID(taskUUID string) (*Task, error) { + var task Task + has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", taskUUID).Get(&task) + if err != nil { + return nil, err + } else if !has { + return nil, ErrTaskNotExist{ + UUID: taskUUID, + } + } + return &task, nil +} + +// GetCurTask return the task for the bot +func GetCurTask(runnerID int64) (*Task, error) { + var tasks []Task + // FIXME: for test, just return all tasks + err := db.GetEngine(db.DefaultContext).Where("status=?", TaskPending).Find(&tasks) + // err := x.Where("runner_id = ?", botID). + // And("status=?", BotTaskPending). + // Find(&tasks) + if err != nil { + return nil, err + } + if len(tasks) == 0 { + return nil, nil + } + return &tasks[0], err +} + +// AssignTaskToRunner assign a task to a runner +func AssignTaskToRunner(taskID int64, runnerID int64) error { + cnt, err := db.GetEngine(db.DefaultContext). + Where("runner_id=0"). + And("id=?", taskID). + Cols("runner_id"). + Update(&Task{ + RunnerID: runnerID, + }) + if err != nil { + return err + } + if cnt != 1 { + return errors.New("assign faild") + } + return nil +} + +type TaskStage struct{} + +type StageStep struct{} diff --git a/models/migrations/v216.go b/models/migrations/v216.go new file mode 100644 index 0000000000000..114cc6c4c7156 --- /dev/null +++ b/models/migrations/v216.go @@ -0,0 +1,52 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/xorm" +) + +func addBotTables(x *xorm.Engine) error { + type BotRunner struct { + ID int64 + UUID string `xorm:"CHAR(36) UNIQUE"` + Name string `xorm:"VARCHAR(32) UNIQUE"` + OS string `xorm:"VARCHAR(16) index"` // the runner running os + Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture + Type string `xorm:"VARCHAR(16)"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Description string `xorm:"TEXT"` + Base int // 0 native 1 docker 2 virtual machine + RepoRange string // glob match which repositories could use this runner + Token string + LastOnline timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + } + + type BotTask struct { + ID int64 + UUID string `xorm:"CHAR(36)"` + RepoID int64 `xorm:"index"` + Type string `xorm:"VARCHAR(16)"` // 0 commit 1 pullrequest + Ref string + CommitSHA string + Event string + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status int + Content string `xorm:"LONGTEXT"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` + } + + return x.Sync2(new(BotRunner), new(BotTask)) +} diff --git a/modules/actions/gitea/action.go b/modules/actions/gitea/action.go new file mode 100644 index 0000000000000..ef4a4a41dda36 --- /dev/null +++ b/modules/actions/gitea/action.go @@ -0,0 +1,79 @@ +package gitea + +import ( + "fmt" + "io" + "strings" + + "gopkg.in/yaml.v3" +) + +// ActionRunsUsing is the type of runner for the action +type ActionRunsUsing string + +func (a *ActionRunsUsing) UnmarshalYAML(unmarshal func(interface{}) error) error { + var using string + if err := unmarshal(&using); err != nil { + return err + } + + // Force input to lowercase for case insensitive comparison + format := ActionRunsUsing(strings.ToLower(using)) + switch format { + case ActionRunsUsingNode12, ActionRunsUsingDocker: + *a = format + default: + return fmt.Errorf(fmt.Sprintf("The runs.using key in action.yml must be one of: %v, got %s", []string{ + ActionRunsUsingDocker, + ActionRunsUsingNode12, + }, format)) + } + return nil +} + +const ( + // ActionRunsUsingNode12 for running with node12 + ActionRunsUsingNode12 = "node12" + // ActionRunsUsingDocker for running with docker + ActionRunsUsingDocker = "docker" +) + +// Action describes a metadata file for GitHub actions. The metadata filename must be either action.yml or action.yaml. The data in the metadata file defines the inputs, outputs and main entrypoint for your action. +type Action struct { + Name string `yaml:"name"` + Author string `yaml:"author"` + Description string `yaml:"description"` + Inputs map[string]Input `yaml:"inputs"` + Outputs map[string]Output `yaml:"outputs"` + Runs struct { + Using ActionRunsUsing `yaml:"using"` + Env map[string]string `yaml:"env"` + Main string `yaml:"main"` + Image string `yaml:"image"` + Entrypoint []string `yaml:"entrypoint"` + Args []string `yaml:"args"` + } `yaml:"runs"` + Branding struct { + Color string `yaml:"color"` + Icon string `yaml:"icon"` + } `yaml:"branding"` +} + +// Input parameters allow you to specify data that the action expects to use during runtime. GitHub stores input parameters as environment variables. Input ids with uppercase letters are converted to lowercase during runtime. We recommended using lowercase input ids. +type Input struct { + Description string `yaml:"description"` + Required bool `yaml:"required"` + Default string `yaml:"default"` +} + +// Output parameters allow you to declare data that an action sets. Actions that run later in a workflow can use the output data set in previously run actions. For example, if you had an action that performed the addition of two inputs (x + y = z), the action could output the sum (z) for other actions to use as an input. +type Output struct { + Description string `yaml:"description"` +} + +// ReadAction reads an action from a reader +func ReadAction(in io.Reader) (*Action, error) { + a := new(Action) + err := yaml.NewDecoder(in).Decode(a) + return a, err +} diff --git a/modules/actions/gitea/gitea.go b/modules/actions/gitea/gitea.go new file mode 100644 index 0000000000000..8f7c0835e5dec --- /dev/null +++ b/modules/actions/gitea/gitea.go @@ -0,0 +1,60 @@ +package gitea + +import ( + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/bot/runner" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/modules/json" +) + +func init() { + runner.RegisterRunnerType(new(GiteaRunner)) +} + +type GiteaRunner struct { +} + +func (gw *GiteaRunner) Name() string { + return "gitea" +} + +func (gw *GiteaRunner) Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) { + tree, err := commit.SubTree(".gitea/workflow") + if err != nil { + return false, "", err + } + entries, err := tree.ListEntries() + if err != nil { + return false, "", err + } + + var wfs []*Workflow + for _, entry := range entries { + blob := entry.Blob() + rd, err := blob.DataAsync() + if err != nil { + return false, "", err + } + defer rd.Close() + wf, err := ReadWorkflow(rd) + if err != nil { + log.Error("ReadWorkflow file %s failed: %v", entry.Name(), err) + continue + } + + // FIXME: we have to convert the event type to github known name + if !util.IsStringInSlice(string(event), wf.On()) { + continue + } + + wfs = append(wfs, wf) + } + + wfBs, err := json.Marshal(wfs) + if err != nil { + return false, "", err + } + return true, string(wfBs), nil +} diff --git a/modules/actions/gitea/planner.go b/modules/actions/gitea/planner.go new file mode 100644 index 0000000000000..6d80e79d49c5b --- /dev/null +++ b/modules/actions/gitea/planner.go @@ -0,0 +1,265 @@ +package gitea + +import ( + "io" + "io/ioutil" + "math" + "os" + "path/filepath" + "sort" + + "github.com/pkg/errors" + log "github.com/sirupsen/logrus" +) + +// WorkflowPlanner contains methods for creating plans +type WorkflowPlanner interface { + PlanEvent(eventName string) *Plan + PlanJob(jobName string) *Plan + GetEvents() []string +} + +// Plan contains a list of stages to run in series +type Plan struct { + Stages []*Stage +} + +// Stage contains a list of runs to execute in parallel +type Stage struct { + Runs []*Run +} + +// Run represents a job from a workflow that needs to be run +type Run struct { + Workflow *Workflow + JobID string +} + +func (r *Run) String() string { + jobName := r.Job().Name + if jobName == "" { + jobName = r.JobID + } + return jobName +} + +// Job returns the job for this Run +func (r *Run) Job() *Job { + return r.Workflow.GetJob(r.JobID) +} + +// NewWorkflowPlanner will load a specific workflow or all workflows from a directory +func NewWorkflowPlanner(path string) (WorkflowPlanner, error) { + fi, err := os.Stat(path) + if err != nil { + return nil, err + } + + var files []os.FileInfo + var dirname string + + if fi.IsDir() { + log.Debugf("Loading workflows from '%s'", path) + dirname = path + files, err = ioutil.ReadDir(path) + } else { + log.Debugf("Loading workflow '%s'", path) + dirname, err = filepath.Abs(filepath.Dir(path)) + files = []os.FileInfo{fi} + } + if err != nil { + return nil, err + } + + wp := new(workflowPlanner) + for _, file := range files { + ext := filepath.Ext(file.Name()) + if ext == ".yml" || ext == ".yaml" { + f, err := os.Open(filepath.Join(dirname, file.Name())) + if err != nil { + return nil, err + } + + log.Debugf("Reading workflow '%s'", f.Name()) + workflow, err := ReadWorkflow(f) + if err != nil { + f.Close() + if err == io.EOF { + return nil, errors.WithMessagef(err, "unable to read workflow, %s file is empty", file.Name()) + } + return nil, err + } + if workflow.Name == "" { + workflow.Name = file.Name() + } + wp.workflows = append(wp.workflows, workflow) + f.Close() + } + } + + return wp, nil +} + +type workflowPlanner struct { + workflows []*Workflow +} + +// PlanEvent builds a new list of runs to execute in parallel for an event name +func (wp *workflowPlanner) PlanEvent(eventName string) *Plan { + plan := new(Plan) + if len(wp.workflows) == 0 { + log.Debugf("no events found for workflow: %s", eventName) + } + + for _, w := range wp.workflows { + for _, e := range w.When().Events { + if e.Type == eventName { + plan.mergeStages(createStages(w, w.GetJobIDs()...)) + } + } + } + return plan +} + +// PlanJob builds a new run to execute in parallel for a job name +func (wp *workflowPlanner) PlanJob(jobName string) *Plan { + plan := new(Plan) + if len(wp.workflows) == 0 { + log.Debugf("no jobs found for workflow: %s", jobName) + } + + for _, w := range wp.workflows { + plan.mergeStages(createStages(w, jobName)) + } + return plan +} + +// GetEvents gets all the events in the workflows file +func (wp *workflowPlanner) GetEvents() []string { + events := make([]string, 0) + for _, w := range wp.workflows { + found := false + for _, e := range events { + for _, we := range w.When().Events { + if e == we.Type { + found = true + break + } + } + if found { + break + } + } + + if !found { + for _, evt := range w.When().Events { + events = append(events, evt.Type) + } + } + } + + // sort the list based on depth of dependencies + sort.Slice(events, func(i, j int) bool { + return events[i] < events[j] + }) + + return events +} + +// MaxRunNameLen determines the max name length of all jobs +func (p *Plan) MaxRunNameLen() int { + maxRunNameLen := 0 + for _, stage := range p.Stages { + for _, run := range stage.Runs { + runNameLen := len(run.String()) + if runNameLen > maxRunNameLen { + maxRunNameLen = runNameLen + } + } + } + return maxRunNameLen +} + +// GetJobIDs will get all the job names in the stage +func (s *Stage) GetJobIDs() []string { + names := make([]string, 0) + for _, r := range s.Runs { + names = append(names, r.JobID) + } + return names +} + +// Merge stages with existing stages in plan +func (p *Plan) mergeStages(stages []*Stage) { + newStages := make([]*Stage, int(math.Max(float64(len(p.Stages)), float64(len(stages))))) + for i := 0; i < len(newStages); i++ { + newStages[i] = new(Stage) + if i >= len(p.Stages) { + newStages[i].Runs = append(newStages[i].Runs, stages[i].Runs...) + } else if i >= len(stages) { + newStages[i].Runs = append(newStages[i].Runs, p.Stages[i].Runs...) + } else { + newStages[i].Runs = append(newStages[i].Runs, p.Stages[i].Runs...) + newStages[i].Runs = append(newStages[i].Runs, stages[i].Runs...) + } + } + p.Stages = newStages +} + +func createStages(w *Workflow, jobIDs ...string) []*Stage { + // first, build a list of all the necessary jobs to run, and their dependencies + jobDependencies := make(map[string][]string) + for len(jobIDs) > 0 { + newJobIDs := make([]string, 0) + for _, jID := range jobIDs { + // make sure we haven't visited this job yet + if _, ok := jobDependencies[jID]; !ok { + if job := w.GetJob(jID); job != nil { + jobDependencies[jID] = job.Needs() + newJobIDs = append(newJobIDs, job.Needs()...) + } + } + } + jobIDs = newJobIDs + } + + // next, build an execution graph + stages := make([]*Stage, 0) + for len(jobDependencies) > 0 { + stage := new(Stage) + for jID, jDeps := range jobDependencies { + // make sure all deps are in the graph already + if listInStages(jDeps, stages...) { + stage.Runs = append(stage.Runs, &Run{ + Workflow: w, + JobID: jID, + }) + delete(jobDependencies, jID) + } + } + if len(stage.Runs) == 0 { + log.Fatalf("Unable to build dependency graph!") + } + stages = append(stages, stage) + } + + return stages +} + +// return true iff all strings in srcList exist in at least one of the stages +func listInStages(srcList []string, stages ...*Stage) bool { + for _, src := range srcList { + found := false + for _, stage := range stages { + for _, search := range stage.GetJobIDs() { + if src == search { + found = true + } + } + } + if !found { + return false + } + } + return true +} diff --git a/modules/actions/gitea/workflow.go b/modules/actions/gitea/workflow.go new file mode 100644 index 0000000000000..2a8a5d04f037b --- /dev/null +++ b/modules/actions/gitea/workflow.go @@ -0,0 +1,377 @@ +package gitea + +import ( + "fmt" + "io" + "reflect" + "regexp" + "strings" + + log "github.com/sirupsen/logrus" + "gopkg.in/yaml.v3" +) + +// Workflow is the structure of the files in .github/workflows +type Workflow struct { + Name string `yaml:"name"` + RawWhen yaml.Node `yaml:"when"` + Env map[string]string `yaml:"env"` + Jobs map[string]*Job `yaml:"jobs"` + Defaults Defaults `yaml:"defaults"` +} + +type Event struct { + Type string + Ref string +} + +type When struct { + Events []Event +} + +func (w *When) Match(tp string) bool { + for _, evt := range w.Events { + if strings.EqualFold(tp, evt.Type) { + return true + } + } + return false +} + +// When events for the workflow +func (w *Workflow) When() *When { + switch w.RawWhen.Kind { + case yaml.ScalarNode: + var val string + err := w.RawWhen.Decode(&val) + if err != nil { + log.Fatal(err) + } + return &When{ + Events: []Event{ + { + Type: val, + }, + }, + } + case yaml.SequenceNode: + var vals []string + err := w.RawWhen.Decode(&vals) + if err != nil { + log.Fatal(err) + } + var when When + for _, val := range vals { + when.Events = append(when.Events, Event{ + Type: val, + }) + } + return &when + case yaml.MappingNode: + var val map[string]interface{} + err := w.RawWhen.Decode(&val) + if err != nil { + log.Fatal(err) + } + var keys []string + for k := range val { + keys = append(keys, k) + } + var when When + for _, val := range keys { + when.Events = append(when.Events, Event{ + Type: val, + }) + } + return &when + } + return nil +} + +// Job is the structure of one job in a workflow +type Job struct { + Name string `yaml:"name"` + RawNeeds yaml.Node `yaml:"needs"` + RawRunsOn yaml.Node `yaml:"runs-on"` + Env map[string]string `yaml:"env"` + If string `yaml:"if"` + Steps []*Step `yaml:"steps"` + TimeoutMinutes int64 `yaml:"timeout-minutes"` + Services map[string]*ContainerSpec `yaml:"services"` + Strategy *Strategy `yaml:"strategy"` + RawContainer yaml.Node `yaml:"container"` + Defaults Defaults `yaml:"defaults"` +} + +// Strategy for the job +type Strategy struct { + FailFast bool `yaml:"fail-fast"` + MaxParallel int `yaml:"max-parallel"` + Matrix map[string][]interface{} `yaml:"matrix"` +} + +// Default settings that will apply to all steps in the job or workflow +type Defaults struct { + Run RunDefaults `yaml:"run"` +} + +// Defaults for all run steps in the job or workflow +type RunDefaults struct { + Shell string `yaml:"shell"` + WorkingDirectory string `yaml:"working-directory"` +} + +// Container details for the job +func (j *Job) Container() *ContainerSpec { + var val *ContainerSpec + switch j.RawContainer.Kind { + case yaml.ScalarNode: + val = new(ContainerSpec) + err := j.RawContainer.Decode(&val.Image) + if err != nil { + log.Fatal(err) + } + case yaml.MappingNode: + val = new(ContainerSpec) + err := j.RawContainer.Decode(val) + if err != nil { + log.Fatal(err) + } + } + return val +} + +// Needs list for Job +func (j *Job) Needs() []string { + + switch j.RawNeeds.Kind { + case yaml.ScalarNode: + var val string + err := j.RawNeeds.Decode(&val) + if err != nil { + log.Fatal(err) + } + return []string{val} + case yaml.SequenceNode: + var val []string + err := j.RawNeeds.Decode(&val) + if err != nil { + log.Fatal(err) + } + return val + } + return nil +} + +// RunsOn list for Job +func (j *Job) RunsOn() []string { + + switch j.RawRunsOn.Kind { + case yaml.ScalarNode: + var val string + err := j.RawRunsOn.Decode(&val) + if err != nil { + log.Fatal(err) + } + return []string{val} + case yaml.SequenceNode: + var val []string + err := j.RawRunsOn.Decode(&val) + if err != nil { + log.Fatal(err) + } + return val + } + return nil +} + +// GetMatrixes returns the matrix cross product +func (j *Job) GetMatrixes() []map[string]interface{} { + matrixes := make([]map[string]interface{}, 0) + /*if j.Strategy != nil { + includes := make([]map[string]interface{}, 0) + for _, v := range j.Strategy.Matrix["include"] { + includes = append(includes, v.(map[string]interface{})) + } + delete(j.Strategy.Matrix, "include") + + excludes := make([]map[string]interface{}, 0) + for _, v := range j.Strategy.Matrix["exclude"] { + excludes = append(excludes, v.(map[string]interface{})) + } + delete(j.Strategy.Matrix, "exclude") + + matrixProduct := common.CartesianProduct(j.Strategy.Matrix) + + MATRIX: + for _, matrix := range matrixProduct { + for _, exclude := range excludes { + if commonKeysMatch(matrix, exclude) { + log.Debugf("Skipping matrix '%v' due to exclude '%v'", matrix, exclude) + continue MATRIX + } + } + matrixes = append(matrixes, matrix) + } + for _, include := range includes { + log.Debugf("Adding include '%v'", include) + matrixes = append(matrixes, include) + } + + } else { + matrixes = append(matrixes, make(map[string]interface{})) + }*/ + return matrixes +} + +func commonKeysMatch(a map[string]interface{}, b map[string]interface{}) bool { + for aKey, aVal := range a { + if bVal, ok := b[aKey]; ok && !reflect.DeepEqual(aVal, bVal) { + return false + } + } + return true +} + +// ContainerSpec is the specification of the container to use for the job +type ContainerSpec struct { + Image string `yaml:"image"` + Env map[string]string `yaml:"env"` + Ports []string `yaml:"ports"` + Volumes []string `yaml:"volumes"` + Options string `yaml:"options"` + Entrypoint string + Args string + Name string + Reuse bool +} + +// Step is the structure of one step in a job +type Step struct { + ID string `yaml:"id"` + If string `yaml:"if"` + Name string `yaml:"name"` + Uses string `yaml:"uses"` + Run string `yaml:"run"` + WorkingDirectory string `yaml:"working-directory"` + Shell string `yaml:"shell"` + Env map[string]string `yaml:"env"` + With map[string]string `yaml:"with"` + ContinueOnError bool `yaml:"continue-on-error"` + TimeoutMinutes int64 `yaml:"timeout-minutes"` +} + +// String gets the name of step +func (s *Step) String() string { + if s.Name != "" { + return s.Name + } else if s.Uses != "" { + return s.Uses + } else if s.Run != "" { + return s.Run + } + return s.ID +} + +// GetEnv gets the env for a step +func (s *Step) GetEnv() map[string]string { + rtnEnv := make(map[string]string) + for k, v := range s.Env { + rtnEnv[k] = v + } + for k, v := range s.With { + envKey := regexp.MustCompile("[^A-Z0-9-]").ReplaceAllString(strings.ToUpper(k), "_") + envKey = fmt.Sprintf("INPUT_%s", strings.ToUpper(envKey)) + rtnEnv[envKey] = v + } + return rtnEnv +} + +// ShellCommand returns the command for the shell +func (s *Step) ShellCommand() string { + shellCommand := "" + + switch s.Shell { + case "", "bash": + shellCommand = "bash --noprofile --norc -eo pipefail {0}" + case "pwsh": + shellCommand = "pwsh -command \"& '{0}'\"" + case "python": + shellCommand = "python {0}" + case "sh": + shellCommand = "sh -e -c {0}" + case "cmd": + shellCommand = "%ComSpec% /D /E:ON /V:OFF /S /C \"CALL \"{0}\"\"" + case "powershell": + shellCommand = "powershell -command \"& '{0}'\"" + default: + shellCommand = s.Shell + } + return shellCommand +} + +// StepType describes what type of step we are about to run +type StepType int + +const ( + // StepTypeRun is all steps that have a `run` attribute + StepTypeRun StepType = iota + + //StepTypeUsesDockerURL is all steps that have a `uses` that is of the form `docker://...` + StepTypeUsesDockerURL + + //StepTypeUsesActionLocal is all steps that have a `uses` that is a local action in a subdirectory + StepTypeUsesActionLocal + + //StepTypeUsesActionRemote is all steps that have a `uses` that is a reference to a github repo + StepTypeUsesActionRemote +) + +// Type returns the type of the step +func (s *Step) Type() StepType { + if s.Run != "" { + return StepTypeRun + } else if strings.HasPrefix(s.Uses, "docker://") { + return StepTypeUsesDockerURL + } else if strings.HasPrefix(s.Uses, "./") { + return StepTypeUsesActionLocal + } + return StepTypeUsesActionRemote +} + +// ReadWorkflow returns a list of jobs for a given workflow file reader +func ReadWorkflow(in io.Reader) (*Workflow, error) { + w := new(Workflow) + err := yaml.NewDecoder(in).Decode(w) + return w, err +} + +// GetJob will get a job by name in the workflow +func (w *Workflow) GetJob(jobID string) *Job { + for id, j := range w.Jobs { + if jobID == id { + if j.Name == "" { + j.Name = id + } + return j + } + } + return nil +} + +// GetJobIDs will get all the job names in the workflow +func (w *Workflow) GetJobIDs() []string { + ids := make([]string, 0) + for id := range w.Jobs { + ids = append(ids, id) + } + return ids +} + +func (w *Workflow) On() []string { + var evts []string + for _, job := range w.Jobs { + evts = append(evts, job.RunsOn()...) + } + return evts +} \ No newline at end of file diff --git a/modules/actions/gitea/workflow_test.go b/modules/actions/gitea/workflow_test.go new file mode 100644 index 0000000000000..6df4a15e75d93 --- /dev/null +++ b/modules/actions/gitea/workflow_test.go @@ -0,0 +1,100 @@ +package gitea + +import ( + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestReadWorkflow_StringEvent(t *testing.T) { + yaml := ` +name: local-action-docker-url +on: push + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: ./actions/docker-url +` + + workflow, err := ReadWorkflow(strings.NewReader(yaml)) + assert.NoError(t, err, "read workflow should succeed") + + assert.Len(t, workflow.On(), 1) + assert.Contains(t, workflow.On(), "push") +} + +func TestReadWorkflow_ListEvent(t *testing.T) { + yaml := ` +name: local-action-docker-url +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: ./actions/docker-url +` + + workflow, err := ReadWorkflow(strings.NewReader(yaml)) + assert.NoError(t, err, "read workflow should succeed") + + assert.Len(t, workflow.On(), 2) + assert.Contains(t, workflow.On(), "push") + assert.Contains(t, workflow.On(), "pull_request") +} + +func TestReadWorkflow_MapEvent(t *testing.T) { + yaml := ` +name: local-action-docker-url +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: ./actions/docker-url +` + + workflow, err := ReadWorkflow(strings.NewReader(yaml)) + assert.NoError(t, err, "read workflow should succeed") + assert.Len(t, workflow.On(), 2) + assert.Contains(t, workflow.On(), "push") + assert.Contains(t, workflow.On(), "pull_request") +} + +func TestReadWorkflow_StringContainer(t *testing.T) { + yaml := ` +name: local-action-docker-url + +jobs: + test: + container: nginx:latest + runs-on: ubuntu-latest + steps: + - uses: ./actions/docker-url + test2: + container: + image: nginx:latest + env: + foo: bar + runs-on: ubuntu-latest + steps: + - uses: ./actions/docker-url +` + + workflow, err := ReadWorkflow(strings.NewReader(yaml)) + assert.NoError(t, err, "read workflow should succeed") + assert.Len(t, workflow.Jobs, 2) + assert.Contains(t, workflow.Jobs["test"].Container().Image, "nginx:latest") + assert.Contains(t, workflow.Jobs["test2"].Container().Image, "nginx:latest") + assert.Contains(t, workflow.Jobs["test2"].Container().Env["foo"], "bar") +} diff --git a/modules/actions/github/github.go b/modules/actions/github/github.go new file mode 100644 index 0000000000000..b39539fa0da19 --- /dev/null +++ b/modules/actions/github/github.go @@ -0,0 +1,165 @@ +package github + +import ( + "context" + "encoding/json" + "fmt" + "io" + "os" + "path/filepath" + + bot_model "code.gitea.io/gitea/models/bot" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/bot/runner" + "code.gitea.io/gitea/modules/git" + + //"code.gitea.io/gitea/modules/log" + //"code.gitea.io/gitea/modules/util" + + "github.com/nektos/act/pkg/model" + act_runner "github.com/nektos/act/pkg/runner" +) + +func init() { + runner.RegisterRunnerType(new(GithubRunner)) +} + +type GithubRunner struct { +} + +func (gw *GithubRunner) Name() string { + return "github" +} + +func (gw *GithubRunner) Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) { + tree, err := commit.SubTree(".github/workflow") + if err != nil { + return false, "", err + } + entries, err := tree.ListEntries() + if err != nil { + return false, "", err + } + + var content = make(map[string]string) + for _, entry := range entries { + blob := entry.Blob() + rd, err := blob.DataAsync() + if err != nil { + return false, "", err + } + + bs, err := io.ReadAll(rd) + rd.Close() + if err != nil { + return false, "", err + } + content[entry.Name()] = string(bs) + } + + res, err := json.Marshal(content) + if err != nil { + return false, "", err + } + return true, string(res), nil +} + +func (gw *GithubRunner) Run(task *bot_model.Task) error { + tmpDir, err := os.MkdirTemp("", fmt.Sprintf("%d", task.ID)) + if err != nil { + return err + } + + var files = make(map[string]string) + if err := json.Unmarshal([]byte(task.Content), &files); err != nil { + return err + } + for name, content := range files { + f, err := os.Create(filepath.Join(tmpDir, name)) + if err != nil { + return err + } + if _, err := f.WriteString(content); err != nil { + f.Close() + return err + } + f.Close() + } + + repo, err := repo_model.GetRepositoryByID(task.RepoID) + if err != nil { + return err + } + + evtFilePath := filepath.Join(tmpDir, "event.json") + evtFile, err := os.Create(evtFilePath) + if err != nil { + return err + } + + if _, err := evtFile.WriteString(task.EventPayload); err != nil { + evtFile.Close() + return err + } + evtFile.Close() + + planner, err := model.NewWorkflowPlanner(tmpDir, false) + if err != nil { + return err + } + plan := planner.PlanEvent(task.Event) + + actor, err := user_model.GetUserByID(task.TriggerUserID) + if err != nil { + return err + } + + // run the plan + config := &act_runner.Config{ + Actor: actor.LoginName, + EventName: task.Event, + EventPath: evtFilePath, + DefaultBranch: repo.DefaultBranch, + /*ForcePull: input.forcePull, + ForceRebuild: input.forceRebuild, + ReuseContainers: input.reuseContainers, + Workdir: input.Workdir(), + BindWorkdir: input.bindWorkdir, + LogOutput: !input.noOutput,*/ + //Env: envs, + Secrets: map[string]string{ + "token": "614e597274a527b6fcf6ddfe45def79430126f08", + }, + //InsecureSecrets: input.insecureSecrets,*/ + Platforms: map[string]string{ + "ubuntu-latest": "node:12-buster-slim", + "ubuntu-20.04": "node:12-buster-slim", + "ubuntu-18.04": "node:12-buster-slim", + }, + /*Privileged: input.privileged, + UsernsMode: input.usernsMode, + ContainerArchitecture: input.containerArchitecture, + ContainerDaemonSocket: input.containerDaemonSocket, + UseGitIgnore: input.useGitIgnore,*/ + GitHubInstance: "gitea.com", + /*ContainerCapAdd: input.containerCapAdd, + ContainerCapDrop: input.containerCapDrop, + AutoRemove: input.autoRemove, + ArtifactServerPath: input.artifactServerPath, + ArtifactServerPort: input.artifactServerPort,*/ + } + r, err := act_runner.New(config) + if err != nil { + return err + } + + //ctx, cancel := context.WithTimeout(context.Background(), ) + + executor := r.NewPlanExecutor(plan).Finally(func(ctx context.Context) error { + //cancel() + return nil + }) + return executor(context.Background()) +} diff --git a/modules/actions/runner/runner.go b/modules/actions/runner/runner.go new file mode 100644 index 0000000000000..2a9540ad769c2 --- /dev/null +++ b/modules/actions/runner/runner.go @@ -0,0 +1,27 @@ +package runner + +import ( + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/git" +) + +var runnerTypes = make(map[string]RunnerType) + +type RunnerType interface { + Name() string + Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) + Run(task *bots_model.Task) error +} + +func RegisterRunnerType(runnerType RunnerType) { + runnerTypes[runnerType.Name()] = runnerType +} + +func GetRunnerType(name string) RunnerType { + return runnerTypes[name] +} + +func GetRunnerTypes() map[string]RunnerType { + return runnerTypes +} diff --git a/modules/context/response.go b/modules/context/response.go index 112964dbe14cd..24844baa081e6 100644 --- a/modules/context/response.go +++ b/modules/context/response.go @@ -5,6 +5,9 @@ package context import ( + "bufio" + "errors" + "net" "net/http" ) @@ -84,6 +87,14 @@ func (r *Response) Before(f func(ResponseWriter)) { r.befores = append(r.befores, f) } +func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) { + if h, ok := r.ResponseWriter.(http.Hijacker); ok { + return h.Hijack() + } + + return nil, nil, errors.New("unimplemented http.Hijacker ") +} + // NewResponse creates a response func NewResponse(resp http.ResponseWriter) *Response { if v, ok := resp.(*Response); ok { diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go new file mode 100644 index 0000000000000..8fc31ed3cf563 --- /dev/null +++ b/modules/notification/bots/bots.go @@ -0,0 +1,209 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + "encoding/json" + "fmt" + + "code.gitea.io/gitea/models" + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/perm" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/convert" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification/base" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/repository" + "code.gitea.io/gitea/modules/setting" + api "code.gitea.io/gitea/modules/structs" + bots_service "code.gitea.io/gitea/services/bots" +) + +type botsNotifier struct { + base.NullNotifier +} + +var _ base.Notifier = &botsNotifier{} + +// NewNotifier create a new botsNotifier notifier +func NewNotifier() base.Notifier { + return &botsNotifier{} +} + +func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEventType, payload string) { + err := issue.LoadRepo(db.DefaultContext) + if err != nil { + log.Error("issue.LoadRepo: %v", err) + return + } + if issue.Repo.IsEmpty || issue.Repo.IsArchived { + return + } + + ref := issue.Ref + if ref == "" { + ref = issue.Repo.DefaultBranch + } + + gitRepo, err := git.OpenRepository(context.Background(), issue.Repo.RepoPath()) + if err != nil { + log.Error("issue.LoadRepo: %v", err) + return + } + defer gitRepo.Close() + + // Get the commit object for the ref + commit, err := gitRepo.GetCommit(ref) + if err != nil { + log.Error("gitRepo.GetCommit: %v", err) + return + } + + task := bots_model.Task{ + RepoID: issue.RepoID, + TriggerUserID: doer.ID, + Event: evt, + EventPayload: payload, + Status: bots_model.TaskPending, + Ref: ref, + CommitSHA: commit.ID.String(), + } + + if err := bots_model.InsertTask(&task); err != nil { + log.Error("InsertBotTask: %v", err) + } else { + bots_service.PushToQueue(&task) + } +} + +// TODO: implement all events +func (a *botsNotifier) NotifyNewIssue(issue *models.Issue, mentions []*user_model.User) { + payload := map[string]interface{}{ + "issue": map[string]interface{}{ + "number": issue.Index, + }, + } + bs, err := json.Marshal(payload) + if err != nil { + log.Error("NotifyNewIssue: %v", err) + return + } + notifyIssue(issue, issue.Poster, webhook.HookEventIssues, string(bs)) +} + +// NotifyIssueChangeStatus notifies close or reopen issue to notifiers +func (a *botsNotifier) NotifyIssueChangeStatus(doer *user_model.User, issue *models.Issue, actionComment *models.Comment, closeOrReopen bool) { +} + +func (a *botsNotifier) NotifyIssueChangeLabels(doer *user_model.User, issue *models.Issue, + addedLabels []*models.Label, removedLabels []*models.Label, +) { + payload := map[string]interface{}{ + "issue": map[string]interface{}{ + "number": issue.Index, + }, + } + bs, err := json.Marshal(payload) + if err != nil { + log.Error("NotifyNewIssue: %v", err) + return + } + notifyIssue(issue, doer, webhook.HookEventIssueLabel, string(bs)) +} + +// NotifyCreateIssueComment notifies comment on an issue to notifiers +func (a *botsNotifier) NotifyCreateIssueComment(doer *user_model.User, repo *repo_model.Repository, + issue *models.Issue, comment *models.Comment, mentions []*user_model.User) { +} + +func (a *botsNotifier) NotifyNewPullRequest(pull *models.PullRequest, mentions []*user_model.User) { +} + +func (a *botsNotifier) NotifyRenameRepository(doer *user_model.User, repo *repo_model.Repository, oldRepoName string) { +} + +func (a *botsNotifier) NotifyTransferRepository(doer *user_model.User, repo *repo_model.Repository, oldOwnerName string) { +} + +func (a *botsNotifier) NotifyCreateRepository(doer *user_model.User, u *user_model.User, repo *repo_model.Repository) { +} + +func (a *botsNotifier) NotifyForkRepository(doer *user_model.User, oldRepo, repo *repo_model.Repository) { +} + +func (a *botsNotifier) NotifyPullRequestReview(pr *models.PullRequest, review *models.Review, comment *models.Comment, mentions []*user_model.User) { +} + +func (*botsNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *user_model.User) { +} + +func (a *botsNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) { + ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("webhook.NotifyPushCommits User: %s[%d] in %s[%d]", pusher.Name, pusher.ID, repo.FullName(), repo.ID)) + defer finished() + + apiPusher := convert.ToUser(pusher, nil) + apiCommits, apiHeadCommit, err := commits.ToAPIPayloadCommits(ctx, repo.RepoPath(), repo.HTMLURL()) + if err != nil { + log.Error("commits.ToAPIPayloadCommits failed: %v", err) + return + } + + payload := &api.PushPayload{ + Ref: opts.RefFullName, + Before: opts.OldCommitID, + After: opts.NewCommitID, + CompareURL: setting.AppURL + commits.CompareURL, + Commits: apiCommits, + HeadCommit: apiHeadCommit, + Repo: convert.ToRepo(repo, perm.AccessModeOwner), + Pusher: apiPusher, + Sender: apiPusher, + } + + bs, err := json.Marshal(payload) + if err != nil { + log.Error("json.Marshal(payload) failed: %v", err) + return + } + + task := bots_model.Task{ + RepoID: repo.ID, + TriggerUserID: pusher.ID, + Event: webhook.HookEventPush, + EventPayload: string(bs), + Status: bots_model.TaskPending, + } + + if err := bots_model.InsertTask(&task); err != nil { + log.Error("InsertBotTask: %v", err) + } else { + bots_service.PushToQueue(&task) + } +} + +func (a *botsNotifier) NotifyCreateRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName, refID string) { +} + +func (a *botsNotifier) NotifyDeleteRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName string) { +} + +func (a *botsNotifier) NotifySyncPushCommits(pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) { +} + +func (a *botsNotifier) NotifySyncCreateRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName, refID string) { +} + +func (a *botsNotifier) NotifySyncDeleteRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName string) { +} + +func (a *botsNotifier) NotifyNewRelease(rel *models.Release) { +} diff --git a/modules/notification/notification.go b/modules/notification/notification.go index a117a60815b47..e122dcf604dbe 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -13,6 +13,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/notification/action" "code.gitea.io/gitea/modules/notification/base" + "code.gitea.io/gitea/modules/notification/bots" "code.gitea.io/gitea/modules/notification/indexer" "code.gitea.io/gitea/modules/notification/mail" "code.gitea.io/gitea/modules/notification/mirror" @@ -40,6 +41,7 @@ func NewContext() { RegisterNotifier(webhook.NewNotifier()) RegisterNotifier(action.NewNotifier()) RegisterNotifier(mirror.NewNotifier()) + RegisterNotifier(bots.NewNotifier()) } // NotifyNewWikiPage notifies creating new wiki pages to notifiers diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go new file mode 100644 index 0000000000000..0e91c19617782 --- /dev/null +++ b/routers/api/bots/bots.go @@ -0,0 +1,149 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "encoding/json" + "errors" + "fmt" + "net/http" + "strings" + "time" + + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/web" + + "github.com/gorilla/websocket" +) + +func Routes() *web.Route { + r := web.NewRoute() + r.Get("/", Serve) + return r +} + +var upgrader = websocket.Upgrader{ + ReadBufferSize: 4096, + WriteBufferSize: 4096, + EnableCompression: true, + CheckOrigin: func(r *http.Request) bool { + return true + }, +} + +var pongWait = 60 * time.Second + +type Message struct { + Version int // + Type int // message type, 1 register 2 error + RunnerUUID string // runner uuid + ErrCode int // error code + ErrContent string // errors message +} + +func Serve(w http.ResponseWriter, r *http.Request) { + log.Trace("websocket init request begin from %s", r.RemoteAddr) + c, err := upgrader.Upgrade(w, r, nil) + if err != nil { + log.Error("websocket upgrade failed: %v", err) + return + } + defer c.Close() + log.Trace("websocket upgrade from %s successfully", r.RemoteAddr) + + c.SetReadDeadline(time.Now().Add(pongWait)) + c.SetPongHandler(func(string) error { c.SetReadDeadline(time.Now().Add(pongWait)); return nil }) + +MESSAGE_BUMP: + for { + // read log from client + mt, message, err := c.ReadMessage() + if err != nil { + if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) || + websocket.IsCloseError(err, websocket.CloseNormalClosure) { + c.Close() + break + } + if !strings.Contains(err.Error(), "i/o timeout") { + log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err) + } + break + } else { + log.Trace("websocket[%s] received message: %s", r.RemoteAddr, message) + } + + // read message first + var msg Message + if err = json.Unmarshal(message, &msg); err != nil { + log.Error("websocket[%s] unmarshal failed: %#v", r.RemoteAddr, err) + break + } + + switch msg.Version { + case 1: + switch msg.Type { + case 1: + log.Info("websocket[%s] registered", r.RemoteAddr) + runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) + if err != nil { + if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { + log.Error("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) + break + } + err = c.WriteMessage(mt, message) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + break + } + } else { + fmt.Printf("-----%v\n", runner) + // TODO: handle read message + err = c.WriteMessage(mt, message) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + break + } + } + default: + returnMsg := Message{ + Version: 1, + Type: 2, + ErrCode: 1, + ErrContent: "type is not supported", + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + break MESSAGE_BUMP + } + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + break MESSAGE_BUMP + } + default: + returnMsg := Message{ + Version: 1, + Type: 2, + ErrCode: 1, + ErrContent: "version is not supported", + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + break MESSAGE_BUMP + } + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + break MESSAGE_BUMP + } + + // TODO: find new task and send to client + } +} diff --git a/routers/init.go b/routers/init.go index fecc5c439c6de..80c44bf61b7f8 100644 --- a/routers/init.go +++ b/routers/init.go @@ -31,6 +31,7 @@ import ( "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" + bots_router "code.gitea.io/gitea/routers/api/bots" packages_router "code.gitea.io/gitea/routers/api/packages" apiv1 "code.gitea.io/gitea/routers/api/v1" "code.gitea.io/gitea/routers/common" @@ -39,6 +40,7 @@ import ( "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/oauth2" "code.gitea.io/gitea/services/automerge" + bots_service "code.gitea.io/gitea/services/bots" "code.gitea.io/gitea/services/cron" "code.gitea.io/gitea/services/mailer" markup_service "code.gitea.io/gitea/services/markup" @@ -160,6 +162,7 @@ func GlobalInitInstalled(ctx context.Context) { mustInit(pull_service.Init) mustInit(automerge.Init) mustInit(task.Init) + mustInit(bots_service.Init) mustInit(repo_migrations.Init) eventsource.GetManager().Init() @@ -195,5 +198,6 @@ func NormalRoutes(ctx context.Context) *web.Route { // This implements the OCI API (Note this is not preceded by /api but is instead /v2) r.Mount("/v2", packages_router.ContainerRoutes(ctx)) } + r.Mount("/api/actions", bots_router.Routes()) return r } diff --git a/services/bots/bots.go b/services/bots/bots.go new file mode 100644 index 0000000000000..39701105658bb --- /dev/null +++ b/services/bots/bots.go @@ -0,0 +1,62 @@ +// Copyright 2022 Gitea. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "fmt" + + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/queue" + //"code.gitea.io/gitea/modules/json" +) + +// taskQueue is a global queue of tasks +var taskQueue queue.Queue + +// PushToQueue +func PushToQueue(task *bots_model.Task) { + taskQueue.Push(task) +} + +// Dispatch assign a task to a runner +func Dispatch(task *bots_model.Task) (*bots_model.Runner, error) { + runner, err := bots_model.GetUsableRunner(bots_model.GetRunnerOptions{ + RepoID: task.RepoID, + }) + if err != nil { + return nil, err + } + + return runner, bots_model.AssignTaskToRunner(task.ID, runner.ID) +} + +// Init will start the service to get all unfinished tasks and run them +func Init() error { + taskQueue = queue.CreateQueue("actions_task", handle, &bots_model.Task{}) + if taskQueue == nil { + return fmt.Errorf("Unable to create Task Queue") + } + + go graceful.GetManager().RunWithShutdownFns(taskQueue.Run) + + return nil +} + +func handle(data ...queue.Data) []queue.Data { + var unhandled []queue.Data + for _, datum := range data { + task := datum.(*bots_model.Task) + runner, err := Dispatch(task) + if err != nil { + log.Error("Run task failed: %v", err) + unhandled = append(unhandled, task) + } else { + log.Trace("task %v assigned to %s", task.UUID, runner.UUID) + } + } + return unhandled +} From 5a479bb03478e943b09c7dd0bd993a3785142aca Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 3 May 2022 16:03:24 +0800 Subject: [PATCH 002/408] Add builds UI --- models/bots/runner.go | 3 +- models/bots/task.go | 177 +++++++++++++++++++++--- models/bots/task_list.go | 37 +++++ models/migrations/v216.go | 51 ++++--- models/repo/repo.go | 4 + models/repo/repo_unit.go | 2 +- models/unit/unit.go | 14 ++ modules/context/context.go | 1 + modules/context/repo.go | 1 + modules/notification/bots/bots.go | 57 ++++++++ options/locale/locale_en-US.ini | 4 + routers/api/bots/bots.go | 51 ++++++- routers/web/repo/builds/builds.go | 99 +++++++++++++ routers/web/repo/setting.go | 9 ++ routers/web/web.go | 9 ++ services/forms/repo_form.go | 1 + templates/repo/builds/build_list.tmpl | 38 +++++ templates/repo/builds/list.tmpl | 35 +++++ templates/repo/builds/openclose.tmpl | 10 ++ templates/repo/builds/view.tmpl | 16 +++ templates/repo/builds/view_content.tmpl | 8 ++ templates/repo/header.tmpl | 9 ++ templates/repo/settings/options.tmpl | 13 ++ 23 files changed, 599 insertions(+), 50 deletions(-) create mode 100644 models/bots/task_list.go create mode 100644 routers/web/repo/builds/builds.go create mode 100644 templates/repo/builds/build_list.tmpl create mode 100644 templates/repo/builds/list.tmpl create mode 100644 templates/repo/builds/openclose.tmpl create mode 100644 templates/repo/builds/view.tmpl create mode 100644 templates/repo/builds/view_content.tmpl diff --git a/models/bots/runner.go b/models/bots/runner.go index f09f89d8ea6d5..dd97b92866c63 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" + "xorm.io/builder" ) @@ -40,7 +41,7 @@ type Runner struct { } func (Runner) TableName() string { - return "actions_runner" + return "bots_runner" } func init() { diff --git a/models/bots/task.go b/models/bots/task.go index 65eb9de77b5ad..73a9da867c996 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -5,16 +5,26 @@ package bots import ( + "context" "errors" "fmt" "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" "github.com/google/uuid" + "xorm.io/builder" ) +func init() { + db.RegisterModel(new(Task)) + db.RegisterModel(new(BuildIndex)) +} + // TaskStatus represents a task status type TaskStatus int @@ -31,27 +41,70 @@ const ( // Task represnets bot tasks type Task struct { - ID int64 - UUID string `xorm:"CHAR(36)"` - RepoID int64 `xorm:"index"` - TriggerUserID int64 - Ref string - CommitSHA string - Event webhook.HookEventType - Token string // token for this task - Grant string // permissions for this task - EventPayload string `xorm:"LONGTEXT"` - RunnerID int64 `xorm:"index"` - Status TaskStatus `xorm:"index"` - Created timeutil.TimeStamp `xorm:"created"` - StartTime timeutil.TimeStamp - EndTime timeutil.TimeStamp - Updated timeutil.TimeStamp `xorm:"updated"` + ID int64 + Title string + UUID string `xorm:"CHAR(36)"` + Index int64 `xorm:"index unique(repo_index)"` + RepoID int64 `xorm:"index unique(repo_index)"` + TriggerUserID int64 + TriggerUser *user_model.User `xorm:"-"` + Ref string + CommitSHA string + Event webhook.HookEventType + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status TaskStatus `xorm:"index"` + WorkflowsStatuses map[string]map[string]TaskStatus `xorm:"LONGTEXT"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` +} + +func (t *Task) IsPending() bool { + return t.Status == TaskPending || t.Status == TaskAssigned +} + +func (t *Task) IsRunning() bool { + return t.Status == TaskRunning +} + +func (t *Task) IsFailed() bool { + return t.Status == TaskFailed || t.Status == TaskCanceled || t.Status == TaskTimeout +} + +func (t *Task) IsSuccess() bool { + return t.Status == TaskFinished } // TableName represents a bot task func (Task) TableName() string { - return "actions_task" + return "bots_task" +} + +func (t *Task) HTMLURL() string { + return fmt.Sprintf("") +} + +func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) error { + _, err := db.GetEngine(ctx).ID(repo.ID). + SetExpr("num_builds", + builder.Select("count(*)").From("bots_task"). + Where(builder.Eq{"repo_id": repo.ID}), + ). + SetExpr("num_closed_builds", + builder.Select("count(*)").From("bots_task"). + Where(builder.Eq{ + "repo_id": repo.ID, + }.And( + builder.In("status", TaskFailed, TaskCanceled, TaskTimeout, TaskFinished), + ), + ), + ). + Update(repo) + return err } // InsertTask inserts a bot task @@ -59,7 +112,27 @@ func InsertTask(t *Task) error { if t.UUID == "" { t.UUID = uuid.New().String() } - return db.Insert(db.DefaultContext, t) + index, err := db.GetNextResourceIndex("build_index", t.RepoID) + if err != nil { + return err + } + t.Index = index + + ctx, commiter, err := db.TxContext() + if err != nil { + return err + } + defer commiter.Close() + + if err := db.Insert(ctx, t); err != nil { + return err + } + + if err := updateRepoBuildsNumbers(ctx, &repo_model.Repository{ID: t.RepoID}); err != nil { + return err + } + + return commiter.Commit() } // UpdateTask updates bot task @@ -70,7 +143,9 @@ func UpdateTask(t *Task, cols ...string) error { // ErrTaskNotExist represents an error for bot task not exist type ErrTaskNotExist struct { - UUID string + RepoID int64 + Index int64 + UUID string } func (err ErrTaskNotExist) Error() string { @@ -91,8 +166,8 @@ func GetTaskByUUID(taskUUID string) (*Task, error) { return &task, nil } -// GetCurTask return the task for the bot -func GetCurTask(runnerID int64) (*Task, error) { +// GetCurTaskByID return the task for the bot +func GetCurTaskByID(runnerID int64) (*Task, error) { var tasks []Task // FIXME: for test, just return all tasks err := db.GetEngine(db.DefaultContext).Where("status=?", TaskPending).Find(&tasks) @@ -108,6 +183,31 @@ func GetCurTask(runnerID int64) (*Task, error) { return &tasks[0], err } +// GetCurTaskByUUID return the task for the bot +func GetCurTaskByUUID(runnerUUID string) (*Task, error) { + runner, err := GetRunnerByUUID(runnerUUID) + if err != nil { + return nil, err + } + return GetCurTaskByID(runner.ID) +} + +func GetTaskByRepoAndIndex(repoID, index int64) (*Task, error) { + var task Task + has, err := db.GetEngine(db.DefaultContext).Where("repo_id=?", repoID). + And("`index` = ?", index). + Get(&task) + if err != nil { + return nil, err + } else if !has { + return nil, ErrTaskNotExist{ + RepoID: repoID, + Index: index, + } + } + return &task, nil +} + // AssignTaskToRunner assign a task to a runner func AssignTaskToRunner(taskID int64, runnerID int64) error { cnt, err := db.GetEngine(db.DefaultContext). @@ -126,6 +226,41 @@ func AssignTaskToRunner(taskID int64, runnerID int64) error { return nil } +type FindTaskOptions struct { + db.ListOptions + RepoID int64 + IsClosed util.OptionalBool +} + +func (opts FindTaskOptions) toConds() builder.Cond { + cond := builder.NewCond() + if opts.RepoID > 0 { + cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + } + if opts.IsClosed.IsTrue() { + cond = cond.And(builder.Expr("status IN (?,?,?,?)", TaskCanceled, TaskFailed, TaskTimeout, TaskFinished)) + } else if opts.IsClosed.IsFalse() { + cond = cond.And(builder.Expr("status IN (?,?,?)", TaskPending, TaskAssigned, TaskRunning)) + } + return cond +} + +func FindTasks(opts FindTaskOptions) (TaskList, error) { + sess := db.GetEngine(db.DefaultContext).Where(opts.toConds()) + if opts.ListOptions.PageSize > 0 { + skip, take := opts.GetSkipTake() + sess.Limit(take, skip) + } + var tasks []*Task + return tasks, sess.Find(&tasks) +} + +func CountTasks(opts FindTaskOptions) (int64, error) { + return db.GetEngine(db.DefaultContext).Table("bots_task").Where(opts.toConds()).Count() +} + type TaskStage struct{} type StageStep struct{} + +type BuildIndex db.ResourceIndex diff --git a/models/bots/task_list.go b/models/bots/task_list.go new file mode 100644 index 0000000000000..351e334f7d7bc --- /dev/null +++ b/models/bots/task_list.go @@ -0,0 +1,37 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + user_model "code.gitea.io/gitea/models/user" +) + +type TaskList []*Task + +// GetUserIDs returns a slice of user's id +func (tasks TaskList) GetUserIDs() []int64 { + userIDsMap := make(map[int64]struct{}) + for _, task := range tasks { + userIDsMap[task.TriggerUserID] = struct{}{} + } + userIDs := make([]int64, 0, len(userIDsMap)) + for userID := range userIDsMap { + userIDs = append(userIDs, userID) + } + return userIDs +} + +func (tasks TaskList) LoadTriggerUser() error { + userIDs := tasks.GetUserIDs() + users := make(map[int64]*user_model.User, len(userIDs)) + if err := db.GetEngine(db.DefaultContext).In("id", userIDs).Find(&users); err != nil { + return err + } + for _, task := range tasks { + task.TriggerUser = users[task.TriggerUserID] + } + return nil +} diff --git a/models/migrations/v216.go b/models/migrations/v216.go index 114cc6c4c7156..fd0d700574482 100644 --- a/models/migrations/v216.go +++ b/models/migrations/v216.go @@ -5,13 +5,14 @@ package migrations import ( + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" "xorm.io/xorm" ) func addBotTables(x *xorm.Engine) error { - type BotRunner struct { + type BotsRunner struct { ID int64 UUID string `xorm:"CHAR(36) UNIQUE"` Name string `xorm:"VARCHAR(32) UNIQUE"` @@ -24,29 +25,37 @@ func addBotTables(x *xorm.Engine) error { Base int // 0 native 1 docker 2 virtual machine RepoRange string // glob match which repositories could use this runner Token string - LastOnline timeutil.TimeStamp + LastOnline timeutil.TimeStamp `xorm:"index"` Created timeutil.TimeStamp `xorm:"created"` } - type BotTask struct { - ID int64 - UUID string `xorm:"CHAR(36)"` - RepoID int64 `xorm:"index"` - Type string `xorm:"VARCHAR(16)"` // 0 commit 1 pullrequest - Ref string - CommitSHA string - Event string - Token string // token for this task - Grant string // permissions for this task - EventPayload string `xorm:"LONGTEXT"` - RunnerID int64 `xorm:"index"` - Status int - Content string `xorm:"LONGTEXT"` - Created timeutil.TimeStamp `xorm:"created"` - StartTime timeutil.TimeStamp - EndTime timeutil.TimeStamp - Updated timeutil.TimeStamp `xorm:"updated"` + type BotsTask struct { + ID int64 + Title string + UUID string `xorm:"CHAR(36)"` + Index int64 `xorm:"index unique(repo_index)"` + RepoID int64 `xorm:"index unique(repo_index)"` + TriggerUserID int64 + Ref string + CommitSHA string + Event string + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status int `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` } - return x.Sync2(new(BotRunner), new(BotTask)) + type Repository struct { + NumBuilds int `xorm:"NOT NULL DEFAULT 0"` + NumClosedBuilds int `xorm:"NOT NULL DEFAULT 0"` + } + + type BuildIndex db.ResourceIndex + + return x.Sync2(new(BotsRunner), new(BotsTask), new(Repository), new(BuildIndex)) } diff --git a/models/repo/repo.go b/models/repo/repo.go index a3dac8383f7bc..37d8cffd60a07 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -142,6 +142,9 @@ type Repository struct { NumProjects int `xorm:"NOT NULL DEFAULT 0"` NumClosedProjects int `xorm:"NOT NULL DEFAULT 0"` NumOpenProjects int `xorm:"-"` + NumBuilds int `xorm:"NOT NULL DEFAULT 0"` + NumClosedBuilds int `xorm:"NOT NULL DEFAULT 0"` + NumOpenBuilds int `xorm:"-"` IsPrivate bool `xorm:"INDEX"` IsEmpty bool `xorm:"INDEX"` @@ -234,6 +237,7 @@ func (repo *Repository) AfterLoad() { repo.NumOpenPulls = repo.NumPulls - repo.NumClosedPulls repo.NumOpenMilestones = repo.NumMilestones - repo.NumClosedMilestones repo.NumOpenProjects = repo.NumProjects - repo.NumClosedProjects + repo.NumOpenBuilds = repo.NumBuilds - repo.NumClosedBuilds } // LoadAttributes loads attributes of the repository. diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index c21c1e7a79e2a..c4090255cbaa0 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -175,7 +175,7 @@ func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { r.Config = new(PullRequestsConfig) case unit.TypeIssues: r.Config = new(IssuesConfig) - case unit.TypeCode, unit.TypeReleases, unit.TypeWiki, unit.TypeProjects, unit.TypePackages: + case unit.TypeCode, unit.TypeReleases, unit.TypeWiki, unit.TypeProjects, unit.TypePackages, unit.TypeBuilds: fallthrough default: r.Config = new(UnitConfig) diff --git a/models/unit/unit.go b/models/unit/unit.go index b83bd61831a44..672494be9894d 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -28,6 +28,7 @@ const ( TypeExternalTracker // 7 ExternalTracker TypeProjects // 8 Kanban board TypePackages // 9 Packages + TypeBuilds // 10 Builds ) // Value returns integer value for unit type @@ -55,6 +56,8 @@ func (u Type) String() string { return "TypeProjects" case TypePackages: return "TypePackages" + case TypeBuilds: + return "TypeBuilds" } return fmt.Sprintf("Unknown Type %d", u) } @@ -78,6 +81,7 @@ var ( TypeExternalTracker, TypeProjects, TypePackages, + TypeBuilds, } // DefaultRepoUnits contains the default unit types @@ -289,6 +293,15 @@ var ( perm.AccessModeRead, } + UnitBuilds = Unit{ + TypeBuilds, + "repo.builds", + "/builds", + "repo.builds.desc", + 7, + perm.AccessModeOwner, + } + // Units contains all the units Units = map[Type]Unit{ TypeCode: UnitCode, @@ -300,6 +313,7 @@ var ( TypeExternalWiki: UnitExternalWiki, TypeProjects: UnitProjects, TypePackages: UnitPackages, + TypeBuilds: UnitBuilds, } ) diff --git a/modules/context/context.go b/modules/context/context.go index 47368bb280584..78d3472b673cd 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -807,6 +807,7 @@ func Contexter(ctx context.Context) func(next http.Handler) http.Handler { ctx.Data["UnitIssuesGlobalDisabled"] = unit.TypeIssues.UnitGlobalDisabled() ctx.Data["UnitPullsGlobalDisabled"] = unit.TypePullRequests.UnitGlobalDisabled() ctx.Data["UnitProjectsGlobalDisabled"] = unit.TypeProjects.UnitGlobalDisabled() + ctx.Data["UnitBuildsGlobalDisabled"] = unit.TypeBuilds.UnitGlobalDisabled() ctx.Data["locale"] = locale ctx.Data["AllLangs"] = translation.AllLangs() diff --git a/modules/context/repo.go b/modules/context/repo.go index 1a83c49e95a26..5408991d728d3 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -1043,6 +1043,7 @@ func UnitTypes() func(ctx *Context) { ctx.Data["UnitTypeExternalTracker"] = unit_model.TypeExternalTracker ctx.Data["UnitTypeProjects"] = unit_model.TypeProjects ctx.Data["UnitTypePackages"] = unit_model.TypePackages + ctx.Data["UnitTypeBuilds"] = unit_model.TypeBuilds } } diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 8fc31ed3cf563..a6dec9f449940 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -39,6 +39,28 @@ func NewNotifier() base.Notifier { return &botsNotifier{} } +func detectWorkflows(commit *git.Commit, event webhook.HookEventType, ref string) (bool, error) { + tree, err := commit.SubTree(".github/workflows") + if _, ok := err.(git.ErrNotExist); ok { + tree, err = commit.SubTree(".gitea/workflows") + } + if _, ok := err.(git.ErrNotExist); ok { + return false, nil + } + if err != nil { + return false, err + } + + entries, err := tree.ListEntries() + if err != nil { + return false, err + } + + log.Trace("detected %s has %d entries", commit.ID, len(entries)) + + return len(entries) > 0, nil +} + func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEventType, payload string) { err := issue.LoadRepo(db.DefaultContext) if err != nil { @@ -68,7 +90,18 @@ func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEve return } + hasWorkflows, err := detectWorkflows(commit, evt, ref) + if err != nil { + log.Error("detectWorkflows: %v", err) + return + } + if !hasWorkflows { + log.Trace("repo %s with commit %s couldn't find workflows", issue.Repo.RepoPath(), commit.ID) + return + } + task := bots_model.Task{ + Title: commit.CommitMessage, RepoID: issue.RepoID, TriggerUserID: doer.ID, Event: evt, @@ -157,6 +190,29 @@ func (a *botsNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_mod return } + gitRepo, err := git.OpenRepository(ctx, repo.RepoPath()) + if err != nil { + log.Error("commits.ToAPIPayloadCommits failed: %v", err) + return + } + defer gitRepo.Close() + + commit, err := gitRepo.GetCommit(commits.HeadCommit.Sha1) + if err != nil { + log.Error("commits.ToAPIPayloadCommits failed: %v", err) + return + } + + hasWorkflows, err := detectWorkflows(commit, webhook.HookEventPush, opts.RefFullName) + if err != nil { + log.Error("detectWorkflows: %v", err) + return + } + if !hasWorkflows { + log.Trace("repo %s with commit %s couldn't find workflows", repo.RepoPath(), commit.ID) + return + } + payload := &api.PushPayload{ Ref: opts.RefFullName, Before: opts.OldCommitID, @@ -176,6 +232,7 @@ func (a *botsNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_mod } task := bots_model.Task{ + Title: commit.Message(), RepoID: repo.ID, TriggerUserID: pusher.ID, Event: webhook.HookEventPush, diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8503cb78d712f..7cfaac0efd065 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1219,6 +1219,10 @@ projects.open = Open projects.close = Close projects.board.assigned_to = Assigned to +builds = Builds +builds.desc = Manage builds +builds.opened_by = opened %[1]s by %[2]s + issues.desc = Organize bug reports, tasks and milestones. issues.filter_assignees = Filter Assignee issues.filter_milestones = Filter Milestone diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 0e91c19617782..32fdc75673f34 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -37,11 +37,13 @@ var upgrader = websocket.Upgrader{ var pongWait = 60 * time.Second type Message struct { - Version int // - Type int // message type, 1 register 2 error - RunnerUUID string // runner uuid - ErrCode int // error code - ErrContent string // errors message + Version int // + Type int // message type, 1 register 2 error 3 task 4 no task + RunnerUUID string // runner uuid + ErrCode int // error code + ErrContent string // errors message + EventName string + EventPayload string } func Serve(w http.ResponseWriter, r *http.Request) { @@ -112,7 +114,7 @@ MESSAGE_BUMP: Version: 1, Type: 2, ErrCode: 1, - ErrContent: "type is not supported", + ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), } bs, err := json.Marshal(&returnMsg) if err != nil { @@ -145,5 +147,42 @@ MESSAGE_BUMP: } // TODO: find new task and send to client + task, err := bots_model.GetCurTaskByUUID(msg.RunnerUUID) + if err != nil { + log.Error("websocket[%s] get task failed: %v", r.RemoteAddr, err) + break + } + if task == nil { + returnMsg := Message{ + Version: 1, + Type: 4, + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + break MESSAGE_BUMP + } + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } else { + returnMsg := Message{ + Version: 1, + Type: 3, + EventName: task.Event.Event(), + EventPayload: task.EventPayload, + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + break + } + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + } } diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go new file mode 100644 index 0000000000000..f7d8be4a58173 --- /dev/null +++ b/routers/web/repo/builds/builds.go @@ -0,0 +1,99 @@ +// Copyright 2018 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package builds + +import ( + "net/http" + + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/convert" + "code.gitea.io/gitea/modules/util" +) + +const ( + tplListBuilds base.TplName = "repo/builds/list" + tplViewBuild base.TplName = "repo/builds/view" +) + +// MustEnableBuilds check if builds are enabled in settings +func MustEnableBuilds(ctx *context.Context) { + if unit.TypeBuilds.UnitGlobalDisabled() { + ctx.NotFound("EnableTypeBuilds", nil) + return + } + + if ctx.Repo.Repository != nil { + if !ctx.Repo.CanRead(unit.TypeBuilds) { + ctx.NotFound("MustEnableBuilds", nil) + return + } + } +} + +func List(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.builds") + ctx.Data["PageIsBuildList"] = true + + page := ctx.FormInt("page") + if page <= 0 { + page = 1 + } + + opts := bots_model.FindTaskOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), + }, + RepoID: ctx.Repo.Repository.ID, + } + if ctx.FormString("state") == "closed" { + opts.IsClosed = util.OptionalBoolTrue + } else { + opts.IsClosed = util.OptionalBoolFalse + } + tasks, err := bots_model.FindTasks(opts) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + if err := tasks.LoadTriggerUser(); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + total, err := bots_model.CountTasks(opts) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["Tasks"] = tasks + + pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) + pager.SetDefaultParams(ctx) + ctx.Data["Page"] = pager + + ctx.HTML(http.StatusOK, tplListBuilds) +} + +func ViewBuild(ctx *context.Context) { + index := ctx.ParamsInt64("index") + task, err := bots_model.GetTaskByRepoAndIndex(ctx.Repo.Repository.ID, index) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["Title"] = task.Title + " - " + ctx.Tr("repo.builds") + ctx.Data["PageIsBuildList"] = true + ctx.Data["Build"] = task + + ctx.HTML(http.StatusOK, tplViewBuild) +} diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 2b5691ce88501..69088e18216f0 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -489,6 +489,15 @@ func SettingsPost(ctx *context.Context) { deleteUnitTypes = append(deleteUnitTypes, unit_model.TypePackages) } + if form.EnableBuilds && !unit_model.TypeBuilds.UnitGlobalDisabled() { + units = append(units, repo_model.RepoUnit{ + RepoID: repo.ID, + Type: unit_model.TypeBuilds, + }) + } else if !unit_model.TypeBuilds.UnitGlobalDisabled() { + deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeBuilds) + } + if form.EnablePulls && !unit_model.TypePullRequests.UnitGlobalDisabled() { units = append(units, repo_model.RepoUnit{ RepoID: repo.ID, diff --git a/routers/web/web.go b/routers/web/web.go index fe5007abb76ac..2dff1d3544eb2 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -35,6 +35,7 @@ import ( "code.gitea.io/gitea/routers/web/misc" "code.gitea.io/gitea/routers/web/org" "code.gitea.io/gitea/routers/web/repo" + "code.gitea.io/gitea/routers/web/repo/builds" "code.gitea.io/gitea/routers/web/user" user_setting "code.gitea.io/gitea/routers/web/user/setting" "code.gitea.io/gitea/routers/web/user/setting/security" @@ -665,6 +666,7 @@ func RegisterRoutes(m *web.Route) { reqRepoIssuesOrPullsReader := context.RequireRepoReaderOr(unit.TypeIssues, unit.TypePullRequests) reqRepoProjectsReader := context.RequireRepoReader(unit.TypeProjects) reqRepoProjectsWriter := context.RequireRepoWriter(unit.TypeProjects) + reqRepoBuildsReader := context.RequireRepoReader(unit.TypeBuilds) reqPackageAccess := func(accessMode perm.AccessMode) func(ctx *context.Context) { return func(ctx *context.Context) { @@ -1169,6 +1171,13 @@ func RegisterRoutes(m *web.Route) { }, reqRepoProjectsWriter, context.RepoMustNotBeArchived()) }, reqRepoProjectsReader, repo.MustEnableProjects) + m.Group("/builds", func() { + m.Get("", builds.List) + m.Group("/{index}", func() { + m.Get("", builds.ViewBuild) + }) + }, reqRepoBuildsReader, builds.MustEnableBuilds) + m.Group("/wiki", func() { m.Combo("/"). Get(repo.Wiki). diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 64f47aadd5cae..6652178cf86a8 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -148,6 +148,7 @@ type RepoSettingForm struct { EnableProjects bool EnablePackages bool EnablePulls bool + EnableBuilds bool PullsIgnoreWhitespace bool PullsAllowMerge bool PullsAllowRebase bool diff --git a/templates/repo/builds/build_list.tmpl b/templates/repo/builds/build_list.tmpl new file mode 100644 index 0000000000000..55d177cbcbb6d --- /dev/null +++ b/templates/repo/builds/build_list.tmpl @@ -0,0 +1,38 @@ +
+ {{range .Tasks}} +
  • +
    + {{if $.CanWriteIssuesOrPulls}} +
    + + +
    + {{end}} +
    + {{if .IsPending}} + + {{end}} + {{if .IsRunning}} + + {{end}} + {{if .IsSuccess}} + + {{end}} + {{if .IsFailed}} + + {{end}} +
    +
    +
    +
    + + #{{.Index}} {{.Title}} + + {{ $timeStr := TimeSinceUnix .Updated $.i18n.Lang }} + {{$.i18n.Tr "repo.builds.opened_by" $timeStr (.TriggerUser.GetDisplayName | Escape) | Safe}} +
    +
    +
    • + {{end}} +
    +{{template "base/paginate" .}} diff --git a/templates/repo/builds/list.tmpl b/templates/repo/builds/list.tmpl new file mode 100644 index 0000000000000..7692536e7b2ea --- /dev/null +++ b/templates/repo/builds/list.tmpl @@ -0,0 +1,35 @@ +{{template "base/head" .}} +
    + {{template "repo/header" .}} +
    +
    +
    + {{template "repo/builds/openclose" .}} +
    +
    +
    +
    + {{template "repo/builds/openclose" .}} +
    +
    + {{/* Ten wide does not cope well and makes the columns stack. + This seems to be related to jQuery's hide/show: in fact, switching + issue-actions and issue-filters and having this ten wide will show + this one correctly, but not the other one. */}} +
    +
    + {{if not .Repository.IsArchived}} + + {{if .IsShowClosed}} +
    {{.i18n.Tr "repo.issues.action_open"}}
    + {{else}} +
    {{.i18n.Tr "repo.issues.action_close"}}
    + {{end}} + {{end}} +
    +
    +
    + {{template "repo/builds/build_list" .}} +
    +
    +{{template "base/footer" .}} diff --git a/templates/repo/builds/openclose.tmpl b/templates/repo/builds/openclose.tmpl new file mode 100644 index 0000000000000..aa8c621c01796 --- /dev/null +++ b/templates/repo/builds/openclose.tmpl @@ -0,0 +1,10 @@ +
    + + {{svg "octicon-issue-opened" 16 "mr-3"}} + {{.i18n.Tr "repo.issues.open_tab" .Repository.NumOpenBuilds}} + + + {{svg "octicon-issue-closed" 16 "mr-3"}} + {{.i18n.Tr "repo.issues.close_tab" .Repository.NumClosedBuilds}} + +
    diff --git a/templates/repo/builds/view.tmpl b/templates/repo/builds/view.tmpl new file mode 100644 index 0000000000000..8b01e586dc1e0 --- /dev/null +++ b/templates/repo/builds/view.tmpl @@ -0,0 +1,16 @@ +{{template "base/head" .}} +
    + {{template "repo/header" .}} +
    +
    +
    +

    + {{RenderIssueTitle $.Context .Build.Title $.RepoLink $.Repository.ComposeMetas}} + #{{.Build.Index}} +

    +
    +
    + {{template "repo/builds/view_content" .}} +
    +
    +{{template "base/footer" .}} diff --git a/templates/repo/builds/view_content.tmpl b/templates/repo/builds/view_content.tmpl new file mode 100644 index 0000000000000..7dc3ca9ac8c03 --- /dev/null +++ b/templates/repo/builds/view_content.tmpl @@ -0,0 +1,8 @@ +
    + {{if .Flash}} +
    + {{template "base/alert" .}} +
    + {{end}} + +
    diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index e6bd839f5704e..e166acae1e528 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -183,6 +183,15 @@ {{end}} + {{ if and (not .UnitBuildsGlobalDisabled) (.Permission.CanRead $.UnitTypeBuilds)}} + + {{svg "octicon-git-builds"}} {{.i18n.Tr "repo.builds"}} + {{if .Repository.NumOpenBuilds}} + {{CountFmt .Repository.NumOpenBuilds}} + {{end}} + + {{end}} + {{if .Permission.CanRead $.UnitTypePackages}} {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 3c5996e903a73..d515f2414160d 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -420,6 +420,19 @@ + {{$isBuildsEnabled := .Repository.UnitEnabled $.UnitTypeBuilds}} +
    + + {{if .UnitTypeBuilds.UnitGlobalDisabled}} +
    + {{else}} +
    + {{end}} + + +
    +
    + {{if not .IsMirror}}
    {{$pullRequestEnabled := .Repository.UnitEnabled $.UnitTypePullRequests}} From 2c4f6fd42f5f4d6ca2682b83a1def3bb624ffae6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 5 May 2022 00:39:20 +0800 Subject: [PATCH 003/408] add most tables --- go.mod | 1 + models/bots/build.go | 289 +++++++++++++++ models/bots/build_job.go | 42 +++ models/bots/{task_list.go => build_list.go} | 14 +- models/bots/build_log.go | 43 +++ models/bots/task.go | 266 -------------- models/migrations/v216.go | 9 +- modules/actions/gitea/action.go | 79 ---- modules/actions/gitea/gitea.go | 60 ---- modules/actions/gitea/planner.go | 265 -------------- modules/actions/gitea/workflow.go | 377 -------------------- modules/actions/gitea/workflow_test.go | 100 ------ modules/actions/github/github.go | 165 --------- modules/actions/runner/runner.go | 27 -- modules/bots/bots.go | 61 ++++ modules/notification/bots/bots.go | 94 ++--- routers/api/bots/bots.go | 2 +- routers/web/repo/builds/builds.go | 66 +++- routers/web/web.go | 1 + services/bots/bots.go | 28 +- templates/repo/builds/build_list.tmpl | 17 +- templates/repo/builds/status.tmpl | 14 + templates/repo/builds/view.tmpl | 1 + templates/repo/builds/view_content.tmpl | 25 +- templates/repo/builds/view_left.tmpl | 18 + 25 files changed, 598 insertions(+), 1466 deletions(-) create mode 100644 models/bots/build.go create mode 100644 models/bots/build_job.go rename models/bots/{task_list.go => build_list.go} (73%) create mode 100644 models/bots/build_log.go delete mode 100644 models/bots/task.go delete mode 100644 modules/actions/gitea/action.go delete mode 100644 modules/actions/gitea/gitea.go delete mode 100644 modules/actions/gitea/planner.go delete mode 100644 modules/actions/gitea/workflow.go delete mode 100644 modules/actions/gitea/workflow_test.go delete mode 100644 modules/actions/github/github.go delete mode 100644 modules/actions/runner/runner.go create mode 100644 modules/bots/bots.go create mode 100644 templates/repo/builds/status.tmpl create mode 100644 templates/repo/builds/view_left.tmpl diff --git a/go.mod b/go.mod index ca8c79c689003..5e6529e0e4416 100644 --- a/go.mod +++ b/go.mod @@ -233,6 +233,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect github.com/mschoch/smat v0.2.0 // indirect + github.com/nektos/act v0.2.26 // indirect github.com/nwaples/rardecode v1.1.3 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect diff --git a/models/bots/build.go b/models/bots/build.go new file mode 100644 index 0000000000000..cd24205370f31 --- /dev/null +++ b/models/bots/build.go @@ -0,0 +1,289 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + "errors" + "fmt" + + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" + + "github.com/google/uuid" + "xorm.io/builder" +) + +func init() { + db.RegisterModel(new(Build)) + db.RegisterModel(new(BuildIndex)) +} + +// BuildStatus represents a build status +type BuildStatus int + +// enumerate all the statuses of bot build +const ( + BuildPending BuildStatus = iota // wait for assign + BuildAssigned // assigned to a runner + BuildRunning // running + BuildFailed + BuildFinished + BuildCanceled + BuildTimeout +) + +func (status BuildStatus) IsPending() bool { + return status == BuildPending || status == BuildAssigned +} + +func (status BuildStatus) IsRunning() bool { + return status == BuildRunning +} + +func (status BuildStatus) IsFailed() bool { + return status == BuildFailed || status == BuildCanceled || status == BuildTimeout +} + +func (status BuildStatus) IsSuccess() bool { + return status == BuildFinished +} + +// Build represnets bot build task +type Build struct { + ID int64 + Title string + UUID string `xorm:"CHAR(36)"` + Index int64 `xorm:"index unique(repo_index)"` + RepoID int64 `xorm:"index unique(repo_index)"` + TriggerUserID int64 + TriggerUser *user_model.User `xorm:"-"` + Ref string + CommitSHA string + Event webhook.HookEventType + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status BuildStatus `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` +} + +// TableName represents a bot build +func (Build) TableName() string { + return "bots_build" +} + +func (t *Build) HTMLURL() string { + return fmt.Sprintf("") +} + +func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) error { + _, err := db.GetEngine(ctx).ID(repo.ID). + SetExpr("num_builds", + builder.Select("count(*)").From("bots_build"). + Where(builder.Eq{"repo_id": repo.ID}), + ). + SetExpr("num_closed_builds", + builder.Select("count(*)").From("bots_build"). + Where(builder.Eq{ + "repo_id": repo.ID, + }.And( + builder.In("status", BuildFailed, BuildCanceled, BuildTimeout, BuildFinished), + ), + ), + ). + Update(repo) + return err +} + +// InsertBuild inserts a bot build task +func InsertBuild(t *Build, workflowsStatuses map[string]map[string]BuildStatus) error { + if t.UUID == "" { + t.UUID = uuid.New().String() + } + index, err := db.GetNextResourceIndex("bots_build_index", t.RepoID) + if err != nil { + return err + } + t.Index = index + + ctx, commiter, err := db.TxContext() + if err != nil { + return err + } + defer commiter.Close() + + if err := db.Insert(ctx, t); err != nil { + return err + } + + if err := updateRepoBuildsNumbers(ctx, &repo_model.Repository{ID: t.RepoID}); err != nil { + return err + } + + var buildJobs []BuildJob + for filename, workflow := range workflowsStatuses { + for job, status := range workflow { + buildJobs = append(buildJobs, BuildJob{ + BuildID: t.ID, + Filename: filename, + Jobname: job, + Status: status, + }) + } + } + if err := db.Insert(ctx, buildJobs); err != nil { + return err + } + + if err := commiter.Commit(); err != nil { + return err + } + + if err := CreateBuildLog(t.ID); err != nil { + log.Error("create build log for %d table failed, will try it again when received logs", t.ID) + } + return nil +} + +// UpdateBuild updates bot build +func UpdateBuild(t *Build, cols ...string) error { + _, err := db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) + return err +} + +// ErrBuildNotExist represents an error for bot build not exist +type ErrBuildNotExist struct { + RepoID int64 + Index int64 + UUID string +} + +func (err ErrBuildNotExist) Error() string { + return fmt.Sprintf("Bot build [%s] is not exist", err.UUID) +} + +// GetBuildByUUID gets bot build by uuid +func GetBuildByUUID(buildUUID string) (*Build, error) { + var build Build + has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", buildUUID).Get(&build) + if err != nil { + return nil, err + } else if !has { + return nil, ErrBuildNotExist{ + UUID: buildUUID, + } + } + return &build, nil +} + +// GetCurBuildByID return the build for the bot +func GetCurBuildByID(runnerID int64) (*Build, error) { + var builds []Build + err := db.GetEngine(db.DefaultContext). + Where("runner_id=?", runnerID). + And("status=?", BuildPending). + Asc("created"). + Find(&builds) + if err != nil { + return nil, err + } + if len(builds) == 0 { + return nil, nil + } + return &builds[0], err +} + +// GetCurBuildByUUID return the task for the bot +func GetCurBuildByUUID(runnerUUID string) (*Build, error) { + runner, err := GetRunnerByUUID(runnerUUID) + if err != nil { + return nil, err + } + return GetCurBuildByID(runner.ID) +} + +func GetBuildByRepoAndIndex(repoID, index int64) (*Build, error) { + var build Build + has, err := db.GetEngine(db.DefaultContext).Where("repo_id=?", repoID). + And("`index` = ?", index). + Get(&build) + if err != nil { + return nil, err + } else if !has { + return nil, ErrBuildNotExist{ + RepoID: repoID, + Index: index, + } + } + return &build, nil +} + +// AssignBuildToRunner assign a build to a runner +func AssignBuildToRunner(buildID int64, runnerID int64) error { + cnt, err := db.GetEngine(db.DefaultContext). + Where("runner_id=0"). + And("id=?", buildID). + Cols("runner_id"). + Update(&Build{ + RunnerID: runnerID, + }) + if err != nil { + return err + } + if cnt != 1 { + return errors.New("assign faild") + } + return nil +} + +type FindBuildOptions struct { + db.ListOptions + RepoID int64 + IsClosed util.OptionalBool +} + +func (opts FindBuildOptions) toConds() builder.Cond { + cond := builder.NewCond() + if opts.RepoID > 0 { + cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + } + if opts.IsClosed.IsTrue() { + cond = cond.And(builder.Expr("status IN (?,?,?,?)", BuildCanceled, BuildFailed, BuildTimeout, BuildFinished)) + } else if opts.IsClosed.IsFalse() { + cond = cond.And(builder.Expr("status IN (?,?,?)", BuildPending, BuildAssigned, BuildRunning)) + } + return cond +} + +func FindBuilds(opts FindBuildOptions) (BuildList, error) { + sess := db.GetEngine(db.DefaultContext).Where(opts.toConds()) + if opts.ListOptions.PageSize > 0 { + skip, take := opts.GetSkipTake() + sess.Limit(take, skip) + } + var builds []*Build + return builds, sess.Find(&builds) +} + +func CountBuilds(opts FindBuildOptions) (int64, error) { + return db.GetEngine(db.DefaultContext).Table("bots_build").Where(opts.toConds()).Count() +} + +type BuildIndex db.ResourceIndex + +// TableName represents a bot build index +func (BuildIndex) TableName() string { + return "bots_build_index" +} diff --git a/models/bots/build_job.go b/models/bots/build_job.go new file mode 100644 index 0000000000000..62ec3b0fd0b11 --- /dev/null +++ b/models/bots/build_job.go @@ -0,0 +1,42 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +type BuildJob struct { + ID int64 + BuildID int64 `xorm:"index"` + Filename string + Jobname string + Status BuildStatus + LogToFile bool // read log from database or from storage + Created timeutil.TimeStamp `xorm:"created"` +} + +func (bj BuildJob) TableName() string { + return "bots_build_job" +} + +func init() { + db.RegisterModel(new(BuildJob)) +} + +func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildJob, error) { + jobs := make(map[string]map[string]*BuildJob) + err := db.GetEngine(db.DefaultContext).Iterate(new(BuildJob), func(idx int, bean interface{}) error { + job := bean.(*BuildJob) + _, ok := jobs[job.Filename] + if !ok { + jobs[job.Filename] = make(map[string]*BuildJob) + } + jobs[job.Filename][job.Jobname] = job + return nil + }) + return jobs, err +} diff --git a/models/bots/task_list.go b/models/bots/build_list.go similarity index 73% rename from models/bots/task_list.go rename to models/bots/build_list.go index 351e334f7d7bc..fdc6ef66f004b 100644 --- a/models/bots/task_list.go +++ b/models/bots/build_list.go @@ -9,13 +9,13 @@ import ( user_model "code.gitea.io/gitea/models/user" ) -type TaskList []*Task +type BuildList []*Build // GetUserIDs returns a slice of user's id -func (tasks TaskList) GetUserIDs() []int64 { +func (builds BuildList) GetUserIDs() []int64 { userIDsMap := make(map[int64]struct{}) - for _, task := range tasks { - userIDsMap[task.TriggerUserID] = struct{}{} + for _, build := range builds { + userIDsMap[build.TriggerUserID] = struct{}{} } userIDs := make([]int64, 0, len(userIDsMap)) for userID := range userIDsMap { @@ -24,13 +24,13 @@ func (tasks TaskList) GetUserIDs() []int64 { return userIDs } -func (tasks TaskList) LoadTriggerUser() error { - userIDs := tasks.GetUserIDs() +func (builds BuildList) LoadTriggerUser() error { + userIDs := builds.GetUserIDs() users := make(map[int64]*user_model.User, len(userIDs)) if err := db.GetEngine(db.DefaultContext).In("id", userIDs).Find(&users); err != nil { return err } - for _, task := range tasks { + for _, task := range builds { task.TriggerUser = users[task.TriggerUserID] } return nil diff --git a/models/bots/build_log.go b/models/bots/build_log.go new file mode 100644 index 0000000000000..93d3b695e0381 --- /dev/null +++ b/models/bots/build_log.go @@ -0,0 +1,43 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "fmt" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +// BuildLog represents a build's log, every build has a standalone table +type BuildLog struct { + ID int64 + BuildJobID int64 `xorm:"index"` + LineNumber int + Content string `xorm:"LONGTEXT"` + Created timeutil.TimeStamp `xorm:"created"` +} + +func init() { + db.RegisterModel(new(BuildLog)) +} + +func GetBuildLogTableName(buildID int64) string { + return fmt.Sprintf("bots_build_log_%d", buildID) +} + +// CreateBuildLog table for a build +func CreateBuildLog(buildID int64) error { + return db.GetEngine(db.DefaultContext). + Table(GetBuildLogTableName(buildID)). + Sync2(new(BuildLog)) +} + +func GetBuildLogs(buildID, jobID int64) (logs []BuildLog, err error) { + err = db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(buildID)). + Where("build_job_id=?", jobID). + Find(&logs) + return +} diff --git a/models/bots/task.go b/models/bots/task.go deleted file mode 100644 index 73a9da867c996..0000000000000 --- a/models/bots/task.go +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "context" - "errors" - "fmt" - - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - - "github.com/google/uuid" - "xorm.io/builder" -) - -func init() { - db.RegisterModel(new(Task)) - db.RegisterModel(new(BuildIndex)) -} - -// TaskStatus represents a task status -type TaskStatus int - -// enumerate all the statuses of bot task -const ( - TaskPending TaskStatus = iota // wait for assign - TaskAssigned // assigned to a runner - TaskRunning // running - TaskFailed - TaskFinished - TaskCanceled - TaskTimeout -) - -// Task represnets bot tasks -type Task struct { - ID int64 - Title string - UUID string `xorm:"CHAR(36)"` - Index int64 `xorm:"index unique(repo_index)"` - RepoID int64 `xorm:"index unique(repo_index)"` - TriggerUserID int64 - TriggerUser *user_model.User `xorm:"-"` - Ref string - CommitSHA string - Event webhook.HookEventType - Token string // token for this task - Grant string // permissions for this task - EventPayload string `xorm:"LONGTEXT"` - RunnerID int64 `xorm:"index"` - Status TaskStatus `xorm:"index"` - WorkflowsStatuses map[string]map[string]TaskStatus `xorm:"LONGTEXT"` - Created timeutil.TimeStamp `xorm:"created"` - StartTime timeutil.TimeStamp - EndTime timeutil.TimeStamp - Updated timeutil.TimeStamp `xorm:"updated"` -} - -func (t *Task) IsPending() bool { - return t.Status == TaskPending || t.Status == TaskAssigned -} - -func (t *Task) IsRunning() bool { - return t.Status == TaskRunning -} - -func (t *Task) IsFailed() bool { - return t.Status == TaskFailed || t.Status == TaskCanceled || t.Status == TaskTimeout -} - -func (t *Task) IsSuccess() bool { - return t.Status == TaskFinished -} - -// TableName represents a bot task -func (Task) TableName() string { - return "bots_task" -} - -func (t *Task) HTMLURL() string { - return fmt.Sprintf("") -} - -func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) error { - _, err := db.GetEngine(ctx).ID(repo.ID). - SetExpr("num_builds", - builder.Select("count(*)").From("bots_task"). - Where(builder.Eq{"repo_id": repo.ID}), - ). - SetExpr("num_closed_builds", - builder.Select("count(*)").From("bots_task"). - Where(builder.Eq{ - "repo_id": repo.ID, - }.And( - builder.In("status", TaskFailed, TaskCanceled, TaskTimeout, TaskFinished), - ), - ), - ). - Update(repo) - return err -} - -// InsertTask inserts a bot task -func InsertTask(t *Task) error { - if t.UUID == "" { - t.UUID = uuid.New().String() - } - index, err := db.GetNextResourceIndex("build_index", t.RepoID) - if err != nil { - return err - } - t.Index = index - - ctx, commiter, err := db.TxContext() - if err != nil { - return err - } - defer commiter.Close() - - if err := db.Insert(ctx, t); err != nil { - return err - } - - if err := updateRepoBuildsNumbers(ctx, &repo_model.Repository{ID: t.RepoID}); err != nil { - return err - } - - return commiter.Commit() -} - -// UpdateTask updates bot task -func UpdateTask(t *Task, cols ...string) error { - _, err := db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) - return err -} - -// ErrTaskNotExist represents an error for bot task not exist -type ErrTaskNotExist struct { - RepoID int64 - Index int64 - UUID string -} - -func (err ErrTaskNotExist) Error() string { - return fmt.Sprintf("Bot task [%s] is not exist", err.UUID) -} - -// GetTaskByUUID gets bot task by uuid -func GetTaskByUUID(taskUUID string) (*Task, error) { - var task Task - has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", taskUUID).Get(&task) - if err != nil { - return nil, err - } else if !has { - return nil, ErrTaskNotExist{ - UUID: taskUUID, - } - } - return &task, nil -} - -// GetCurTaskByID return the task for the bot -func GetCurTaskByID(runnerID int64) (*Task, error) { - var tasks []Task - // FIXME: for test, just return all tasks - err := db.GetEngine(db.DefaultContext).Where("status=?", TaskPending).Find(&tasks) - // err := x.Where("runner_id = ?", botID). - // And("status=?", BotTaskPending). - // Find(&tasks) - if err != nil { - return nil, err - } - if len(tasks) == 0 { - return nil, nil - } - return &tasks[0], err -} - -// GetCurTaskByUUID return the task for the bot -func GetCurTaskByUUID(runnerUUID string) (*Task, error) { - runner, err := GetRunnerByUUID(runnerUUID) - if err != nil { - return nil, err - } - return GetCurTaskByID(runner.ID) -} - -func GetTaskByRepoAndIndex(repoID, index int64) (*Task, error) { - var task Task - has, err := db.GetEngine(db.DefaultContext).Where("repo_id=?", repoID). - And("`index` = ?", index). - Get(&task) - if err != nil { - return nil, err - } else if !has { - return nil, ErrTaskNotExist{ - RepoID: repoID, - Index: index, - } - } - return &task, nil -} - -// AssignTaskToRunner assign a task to a runner -func AssignTaskToRunner(taskID int64, runnerID int64) error { - cnt, err := db.GetEngine(db.DefaultContext). - Where("runner_id=0"). - And("id=?", taskID). - Cols("runner_id"). - Update(&Task{ - RunnerID: runnerID, - }) - if err != nil { - return err - } - if cnt != 1 { - return errors.New("assign faild") - } - return nil -} - -type FindTaskOptions struct { - db.ListOptions - RepoID int64 - IsClosed util.OptionalBool -} - -func (opts FindTaskOptions) toConds() builder.Cond { - cond := builder.NewCond() - if opts.RepoID > 0 { - cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) - } - if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", TaskCanceled, TaskFailed, TaskTimeout, TaskFinished)) - } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", TaskPending, TaskAssigned, TaskRunning)) - } - return cond -} - -func FindTasks(opts FindTaskOptions) (TaskList, error) { - sess := db.GetEngine(db.DefaultContext).Where(opts.toConds()) - if opts.ListOptions.PageSize > 0 { - skip, take := opts.GetSkipTake() - sess.Limit(take, skip) - } - var tasks []*Task - return tasks, sess.Find(&tasks) -} - -func CountTasks(opts FindTaskOptions) (int64, error) { - return db.GetEngine(db.DefaultContext).Table("bots_task").Where(opts.toConds()).Count() -} - -type TaskStage struct{} - -type StageStep struct{} - -type BuildIndex db.ResourceIndex diff --git a/models/migrations/v216.go b/models/migrations/v216.go index fd0d700574482..a8e1110d3f2e2 100644 --- a/models/migrations/v216.go +++ b/models/migrations/v216.go @@ -5,9 +5,6 @@ package migrations import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "xorm.io/xorm" ) @@ -29,7 +26,7 @@ func addBotTables(x *xorm.Engine) error { Created timeutil.TimeStamp `xorm:"created"` } - type BotsTask struct { + type BotsBuild struct { ID int64 Title string UUID string `xorm:"CHAR(36)"` @@ -55,7 +52,7 @@ func addBotTables(x *xorm.Engine) error { NumClosedBuilds int `xorm:"NOT NULL DEFAULT 0"` } - type BuildIndex db.ResourceIndex + type BotsBuildIndex db.ResourceIndex - return x.Sync2(new(BotsRunner), new(BotsTask), new(Repository), new(BuildIndex)) + return x.Sync2(new(BotsRunner), new(BotsBuild), new(Repository), new(BotsBuildIndex)) } diff --git a/modules/actions/gitea/action.go b/modules/actions/gitea/action.go deleted file mode 100644 index ef4a4a41dda36..0000000000000 --- a/modules/actions/gitea/action.go +++ /dev/null @@ -1,79 +0,0 @@ -package gitea - -import ( - "fmt" - "io" - "strings" - - "gopkg.in/yaml.v3" -) - -// ActionRunsUsing is the type of runner for the action -type ActionRunsUsing string - -func (a *ActionRunsUsing) UnmarshalYAML(unmarshal func(interface{}) error) error { - var using string - if err := unmarshal(&using); err != nil { - return err - } - - // Force input to lowercase for case insensitive comparison - format := ActionRunsUsing(strings.ToLower(using)) - switch format { - case ActionRunsUsingNode12, ActionRunsUsingDocker: - *a = format - default: - return fmt.Errorf(fmt.Sprintf("The runs.using key in action.yml must be one of: %v, got %s", []string{ - ActionRunsUsingDocker, - ActionRunsUsingNode12, - }, format)) - } - return nil -} - -const ( - // ActionRunsUsingNode12 for running with node12 - ActionRunsUsingNode12 = "node12" - // ActionRunsUsingDocker for running with docker - ActionRunsUsingDocker = "docker" -) - -// Action describes a metadata file for GitHub actions. The metadata filename must be either action.yml or action.yaml. The data in the metadata file defines the inputs, outputs and main entrypoint for your action. -type Action struct { - Name string `yaml:"name"` - Author string `yaml:"author"` - Description string `yaml:"description"` - Inputs map[string]Input `yaml:"inputs"` - Outputs map[string]Output `yaml:"outputs"` - Runs struct { - Using ActionRunsUsing `yaml:"using"` - Env map[string]string `yaml:"env"` - Main string `yaml:"main"` - Image string `yaml:"image"` - Entrypoint []string `yaml:"entrypoint"` - Args []string `yaml:"args"` - } `yaml:"runs"` - Branding struct { - Color string `yaml:"color"` - Icon string `yaml:"icon"` - } `yaml:"branding"` -} - -// Input parameters allow you to specify data that the action expects to use during runtime. GitHub stores input parameters as environment variables. Input ids with uppercase letters are converted to lowercase during runtime. We recommended using lowercase input ids. -type Input struct { - Description string `yaml:"description"` - Required bool `yaml:"required"` - Default string `yaml:"default"` -} - -// Output parameters allow you to declare data that an action sets. Actions that run later in a workflow can use the output data set in previously run actions. For example, if you had an action that performed the addition of two inputs (x + y = z), the action could output the sum (z) for other actions to use as an input. -type Output struct { - Description string `yaml:"description"` -} - -// ReadAction reads an action from a reader -func ReadAction(in io.Reader) (*Action, error) { - a := new(Action) - err := yaml.NewDecoder(in).Decode(a) - return a, err -} diff --git a/modules/actions/gitea/gitea.go b/modules/actions/gitea/gitea.go deleted file mode 100644 index 8f7c0835e5dec..0000000000000 --- a/modules/actions/gitea/gitea.go +++ /dev/null @@ -1,60 +0,0 @@ -package gitea - -import ( - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/bot/runner" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/json" -) - -func init() { - runner.RegisterRunnerType(new(GiteaRunner)) -} - -type GiteaRunner struct { -} - -func (gw *GiteaRunner) Name() string { - return "gitea" -} - -func (gw *GiteaRunner) Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) { - tree, err := commit.SubTree(".gitea/workflow") - if err != nil { - return false, "", err - } - entries, err := tree.ListEntries() - if err != nil { - return false, "", err - } - - var wfs []*Workflow - for _, entry := range entries { - blob := entry.Blob() - rd, err := blob.DataAsync() - if err != nil { - return false, "", err - } - defer rd.Close() - wf, err := ReadWorkflow(rd) - if err != nil { - log.Error("ReadWorkflow file %s failed: %v", entry.Name(), err) - continue - } - - // FIXME: we have to convert the event type to github known name - if !util.IsStringInSlice(string(event), wf.On()) { - continue - } - - wfs = append(wfs, wf) - } - - wfBs, err := json.Marshal(wfs) - if err != nil { - return false, "", err - } - return true, string(wfBs), nil -} diff --git a/modules/actions/gitea/planner.go b/modules/actions/gitea/planner.go deleted file mode 100644 index 6d80e79d49c5b..0000000000000 --- a/modules/actions/gitea/planner.go +++ /dev/null @@ -1,265 +0,0 @@ -package gitea - -import ( - "io" - "io/ioutil" - "math" - "os" - "path/filepath" - "sort" - - "github.com/pkg/errors" - log "github.com/sirupsen/logrus" -) - -// WorkflowPlanner contains methods for creating plans -type WorkflowPlanner interface { - PlanEvent(eventName string) *Plan - PlanJob(jobName string) *Plan - GetEvents() []string -} - -// Plan contains a list of stages to run in series -type Plan struct { - Stages []*Stage -} - -// Stage contains a list of runs to execute in parallel -type Stage struct { - Runs []*Run -} - -// Run represents a job from a workflow that needs to be run -type Run struct { - Workflow *Workflow - JobID string -} - -func (r *Run) String() string { - jobName := r.Job().Name - if jobName == "" { - jobName = r.JobID - } - return jobName -} - -// Job returns the job for this Run -func (r *Run) Job() *Job { - return r.Workflow.GetJob(r.JobID) -} - -// NewWorkflowPlanner will load a specific workflow or all workflows from a directory -func NewWorkflowPlanner(path string) (WorkflowPlanner, error) { - fi, err := os.Stat(path) - if err != nil { - return nil, err - } - - var files []os.FileInfo - var dirname string - - if fi.IsDir() { - log.Debugf("Loading workflows from '%s'", path) - dirname = path - files, err = ioutil.ReadDir(path) - } else { - log.Debugf("Loading workflow '%s'", path) - dirname, err = filepath.Abs(filepath.Dir(path)) - files = []os.FileInfo{fi} - } - if err != nil { - return nil, err - } - - wp := new(workflowPlanner) - for _, file := range files { - ext := filepath.Ext(file.Name()) - if ext == ".yml" || ext == ".yaml" { - f, err := os.Open(filepath.Join(dirname, file.Name())) - if err != nil { - return nil, err - } - - log.Debugf("Reading workflow '%s'", f.Name()) - workflow, err := ReadWorkflow(f) - if err != nil { - f.Close() - if err == io.EOF { - return nil, errors.WithMessagef(err, "unable to read workflow, %s file is empty", file.Name()) - } - return nil, err - } - if workflow.Name == "" { - workflow.Name = file.Name() - } - wp.workflows = append(wp.workflows, workflow) - f.Close() - } - } - - return wp, nil -} - -type workflowPlanner struct { - workflows []*Workflow -} - -// PlanEvent builds a new list of runs to execute in parallel for an event name -func (wp *workflowPlanner) PlanEvent(eventName string) *Plan { - plan := new(Plan) - if len(wp.workflows) == 0 { - log.Debugf("no events found for workflow: %s", eventName) - } - - for _, w := range wp.workflows { - for _, e := range w.When().Events { - if e.Type == eventName { - plan.mergeStages(createStages(w, w.GetJobIDs()...)) - } - } - } - return plan -} - -// PlanJob builds a new run to execute in parallel for a job name -func (wp *workflowPlanner) PlanJob(jobName string) *Plan { - plan := new(Plan) - if len(wp.workflows) == 0 { - log.Debugf("no jobs found for workflow: %s", jobName) - } - - for _, w := range wp.workflows { - plan.mergeStages(createStages(w, jobName)) - } - return plan -} - -// GetEvents gets all the events in the workflows file -func (wp *workflowPlanner) GetEvents() []string { - events := make([]string, 0) - for _, w := range wp.workflows { - found := false - for _, e := range events { - for _, we := range w.When().Events { - if e == we.Type { - found = true - break - } - } - if found { - break - } - } - - if !found { - for _, evt := range w.When().Events { - events = append(events, evt.Type) - } - } - } - - // sort the list based on depth of dependencies - sort.Slice(events, func(i, j int) bool { - return events[i] < events[j] - }) - - return events -} - -// MaxRunNameLen determines the max name length of all jobs -func (p *Plan) MaxRunNameLen() int { - maxRunNameLen := 0 - for _, stage := range p.Stages { - for _, run := range stage.Runs { - runNameLen := len(run.String()) - if runNameLen > maxRunNameLen { - maxRunNameLen = runNameLen - } - } - } - return maxRunNameLen -} - -// GetJobIDs will get all the job names in the stage -func (s *Stage) GetJobIDs() []string { - names := make([]string, 0) - for _, r := range s.Runs { - names = append(names, r.JobID) - } - return names -} - -// Merge stages with existing stages in plan -func (p *Plan) mergeStages(stages []*Stage) { - newStages := make([]*Stage, int(math.Max(float64(len(p.Stages)), float64(len(stages))))) - for i := 0; i < len(newStages); i++ { - newStages[i] = new(Stage) - if i >= len(p.Stages) { - newStages[i].Runs = append(newStages[i].Runs, stages[i].Runs...) - } else if i >= len(stages) { - newStages[i].Runs = append(newStages[i].Runs, p.Stages[i].Runs...) - } else { - newStages[i].Runs = append(newStages[i].Runs, p.Stages[i].Runs...) - newStages[i].Runs = append(newStages[i].Runs, stages[i].Runs...) - } - } - p.Stages = newStages -} - -func createStages(w *Workflow, jobIDs ...string) []*Stage { - // first, build a list of all the necessary jobs to run, and their dependencies - jobDependencies := make(map[string][]string) - for len(jobIDs) > 0 { - newJobIDs := make([]string, 0) - for _, jID := range jobIDs { - // make sure we haven't visited this job yet - if _, ok := jobDependencies[jID]; !ok { - if job := w.GetJob(jID); job != nil { - jobDependencies[jID] = job.Needs() - newJobIDs = append(newJobIDs, job.Needs()...) - } - } - } - jobIDs = newJobIDs - } - - // next, build an execution graph - stages := make([]*Stage, 0) - for len(jobDependencies) > 0 { - stage := new(Stage) - for jID, jDeps := range jobDependencies { - // make sure all deps are in the graph already - if listInStages(jDeps, stages...) { - stage.Runs = append(stage.Runs, &Run{ - Workflow: w, - JobID: jID, - }) - delete(jobDependencies, jID) - } - } - if len(stage.Runs) == 0 { - log.Fatalf("Unable to build dependency graph!") - } - stages = append(stages, stage) - } - - return stages -} - -// return true iff all strings in srcList exist in at least one of the stages -func listInStages(srcList []string, stages ...*Stage) bool { - for _, src := range srcList { - found := false - for _, stage := range stages { - for _, search := range stage.GetJobIDs() { - if src == search { - found = true - } - } - } - if !found { - return false - } - } - return true -} diff --git a/modules/actions/gitea/workflow.go b/modules/actions/gitea/workflow.go deleted file mode 100644 index 2a8a5d04f037b..0000000000000 --- a/modules/actions/gitea/workflow.go +++ /dev/null @@ -1,377 +0,0 @@ -package gitea - -import ( - "fmt" - "io" - "reflect" - "regexp" - "strings" - - log "github.com/sirupsen/logrus" - "gopkg.in/yaml.v3" -) - -// Workflow is the structure of the files in .github/workflows -type Workflow struct { - Name string `yaml:"name"` - RawWhen yaml.Node `yaml:"when"` - Env map[string]string `yaml:"env"` - Jobs map[string]*Job `yaml:"jobs"` - Defaults Defaults `yaml:"defaults"` -} - -type Event struct { - Type string - Ref string -} - -type When struct { - Events []Event -} - -func (w *When) Match(tp string) bool { - for _, evt := range w.Events { - if strings.EqualFold(tp, evt.Type) { - return true - } - } - return false -} - -// When events for the workflow -func (w *Workflow) When() *When { - switch w.RawWhen.Kind { - case yaml.ScalarNode: - var val string - err := w.RawWhen.Decode(&val) - if err != nil { - log.Fatal(err) - } - return &When{ - Events: []Event{ - { - Type: val, - }, - }, - } - case yaml.SequenceNode: - var vals []string - err := w.RawWhen.Decode(&vals) - if err != nil { - log.Fatal(err) - } - var when When - for _, val := range vals { - when.Events = append(when.Events, Event{ - Type: val, - }) - } - return &when - case yaml.MappingNode: - var val map[string]interface{} - err := w.RawWhen.Decode(&val) - if err != nil { - log.Fatal(err) - } - var keys []string - for k := range val { - keys = append(keys, k) - } - var when When - for _, val := range keys { - when.Events = append(when.Events, Event{ - Type: val, - }) - } - return &when - } - return nil -} - -// Job is the structure of one job in a workflow -type Job struct { - Name string `yaml:"name"` - RawNeeds yaml.Node `yaml:"needs"` - RawRunsOn yaml.Node `yaml:"runs-on"` - Env map[string]string `yaml:"env"` - If string `yaml:"if"` - Steps []*Step `yaml:"steps"` - TimeoutMinutes int64 `yaml:"timeout-minutes"` - Services map[string]*ContainerSpec `yaml:"services"` - Strategy *Strategy `yaml:"strategy"` - RawContainer yaml.Node `yaml:"container"` - Defaults Defaults `yaml:"defaults"` -} - -// Strategy for the job -type Strategy struct { - FailFast bool `yaml:"fail-fast"` - MaxParallel int `yaml:"max-parallel"` - Matrix map[string][]interface{} `yaml:"matrix"` -} - -// Default settings that will apply to all steps in the job or workflow -type Defaults struct { - Run RunDefaults `yaml:"run"` -} - -// Defaults for all run steps in the job or workflow -type RunDefaults struct { - Shell string `yaml:"shell"` - WorkingDirectory string `yaml:"working-directory"` -} - -// Container details for the job -func (j *Job) Container() *ContainerSpec { - var val *ContainerSpec - switch j.RawContainer.Kind { - case yaml.ScalarNode: - val = new(ContainerSpec) - err := j.RawContainer.Decode(&val.Image) - if err != nil { - log.Fatal(err) - } - case yaml.MappingNode: - val = new(ContainerSpec) - err := j.RawContainer.Decode(val) - if err != nil { - log.Fatal(err) - } - } - return val -} - -// Needs list for Job -func (j *Job) Needs() []string { - - switch j.RawNeeds.Kind { - case yaml.ScalarNode: - var val string - err := j.RawNeeds.Decode(&val) - if err != nil { - log.Fatal(err) - } - return []string{val} - case yaml.SequenceNode: - var val []string - err := j.RawNeeds.Decode(&val) - if err != nil { - log.Fatal(err) - } - return val - } - return nil -} - -// RunsOn list for Job -func (j *Job) RunsOn() []string { - - switch j.RawRunsOn.Kind { - case yaml.ScalarNode: - var val string - err := j.RawRunsOn.Decode(&val) - if err != nil { - log.Fatal(err) - } - return []string{val} - case yaml.SequenceNode: - var val []string - err := j.RawRunsOn.Decode(&val) - if err != nil { - log.Fatal(err) - } - return val - } - return nil -} - -// GetMatrixes returns the matrix cross product -func (j *Job) GetMatrixes() []map[string]interface{} { - matrixes := make([]map[string]interface{}, 0) - /*if j.Strategy != nil { - includes := make([]map[string]interface{}, 0) - for _, v := range j.Strategy.Matrix["include"] { - includes = append(includes, v.(map[string]interface{})) - } - delete(j.Strategy.Matrix, "include") - - excludes := make([]map[string]interface{}, 0) - for _, v := range j.Strategy.Matrix["exclude"] { - excludes = append(excludes, v.(map[string]interface{})) - } - delete(j.Strategy.Matrix, "exclude") - - matrixProduct := common.CartesianProduct(j.Strategy.Matrix) - - MATRIX: - for _, matrix := range matrixProduct { - for _, exclude := range excludes { - if commonKeysMatch(matrix, exclude) { - log.Debugf("Skipping matrix '%v' due to exclude '%v'", matrix, exclude) - continue MATRIX - } - } - matrixes = append(matrixes, matrix) - } - for _, include := range includes { - log.Debugf("Adding include '%v'", include) - matrixes = append(matrixes, include) - } - - } else { - matrixes = append(matrixes, make(map[string]interface{})) - }*/ - return matrixes -} - -func commonKeysMatch(a map[string]interface{}, b map[string]interface{}) bool { - for aKey, aVal := range a { - if bVal, ok := b[aKey]; ok && !reflect.DeepEqual(aVal, bVal) { - return false - } - } - return true -} - -// ContainerSpec is the specification of the container to use for the job -type ContainerSpec struct { - Image string `yaml:"image"` - Env map[string]string `yaml:"env"` - Ports []string `yaml:"ports"` - Volumes []string `yaml:"volumes"` - Options string `yaml:"options"` - Entrypoint string - Args string - Name string - Reuse bool -} - -// Step is the structure of one step in a job -type Step struct { - ID string `yaml:"id"` - If string `yaml:"if"` - Name string `yaml:"name"` - Uses string `yaml:"uses"` - Run string `yaml:"run"` - WorkingDirectory string `yaml:"working-directory"` - Shell string `yaml:"shell"` - Env map[string]string `yaml:"env"` - With map[string]string `yaml:"with"` - ContinueOnError bool `yaml:"continue-on-error"` - TimeoutMinutes int64 `yaml:"timeout-minutes"` -} - -// String gets the name of step -func (s *Step) String() string { - if s.Name != "" { - return s.Name - } else if s.Uses != "" { - return s.Uses - } else if s.Run != "" { - return s.Run - } - return s.ID -} - -// GetEnv gets the env for a step -func (s *Step) GetEnv() map[string]string { - rtnEnv := make(map[string]string) - for k, v := range s.Env { - rtnEnv[k] = v - } - for k, v := range s.With { - envKey := regexp.MustCompile("[^A-Z0-9-]").ReplaceAllString(strings.ToUpper(k), "_") - envKey = fmt.Sprintf("INPUT_%s", strings.ToUpper(envKey)) - rtnEnv[envKey] = v - } - return rtnEnv -} - -// ShellCommand returns the command for the shell -func (s *Step) ShellCommand() string { - shellCommand := "" - - switch s.Shell { - case "", "bash": - shellCommand = "bash --noprofile --norc -eo pipefail {0}" - case "pwsh": - shellCommand = "pwsh -command \"& '{0}'\"" - case "python": - shellCommand = "python {0}" - case "sh": - shellCommand = "sh -e -c {0}" - case "cmd": - shellCommand = "%ComSpec% /D /E:ON /V:OFF /S /C \"CALL \"{0}\"\"" - case "powershell": - shellCommand = "powershell -command \"& '{0}'\"" - default: - shellCommand = s.Shell - } - return shellCommand -} - -// StepType describes what type of step we are about to run -type StepType int - -const ( - // StepTypeRun is all steps that have a `run` attribute - StepTypeRun StepType = iota - - //StepTypeUsesDockerURL is all steps that have a `uses` that is of the form `docker://...` - StepTypeUsesDockerURL - - //StepTypeUsesActionLocal is all steps that have a `uses` that is a local action in a subdirectory - StepTypeUsesActionLocal - - //StepTypeUsesActionRemote is all steps that have a `uses` that is a reference to a github repo - StepTypeUsesActionRemote -) - -// Type returns the type of the step -func (s *Step) Type() StepType { - if s.Run != "" { - return StepTypeRun - } else if strings.HasPrefix(s.Uses, "docker://") { - return StepTypeUsesDockerURL - } else if strings.HasPrefix(s.Uses, "./") { - return StepTypeUsesActionLocal - } - return StepTypeUsesActionRemote -} - -// ReadWorkflow returns a list of jobs for a given workflow file reader -func ReadWorkflow(in io.Reader) (*Workflow, error) { - w := new(Workflow) - err := yaml.NewDecoder(in).Decode(w) - return w, err -} - -// GetJob will get a job by name in the workflow -func (w *Workflow) GetJob(jobID string) *Job { - for id, j := range w.Jobs { - if jobID == id { - if j.Name == "" { - j.Name = id - } - return j - } - } - return nil -} - -// GetJobIDs will get all the job names in the workflow -func (w *Workflow) GetJobIDs() []string { - ids := make([]string, 0) - for id := range w.Jobs { - ids = append(ids, id) - } - return ids -} - -func (w *Workflow) On() []string { - var evts []string - for _, job := range w.Jobs { - evts = append(evts, job.RunsOn()...) - } - return evts -} \ No newline at end of file diff --git a/modules/actions/gitea/workflow_test.go b/modules/actions/gitea/workflow_test.go deleted file mode 100644 index 6df4a15e75d93..0000000000000 --- a/modules/actions/gitea/workflow_test.go +++ /dev/null @@ -1,100 +0,0 @@ -package gitea - -import ( - "strings" - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestReadWorkflow_StringEvent(t *testing.T) { - yaml := ` -name: local-action-docker-url -on: push - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: ./actions/docker-url -` - - workflow, err := ReadWorkflow(strings.NewReader(yaml)) - assert.NoError(t, err, "read workflow should succeed") - - assert.Len(t, workflow.On(), 1) - assert.Contains(t, workflow.On(), "push") -} - -func TestReadWorkflow_ListEvent(t *testing.T) { - yaml := ` -name: local-action-docker-url -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: ./actions/docker-url -` - - workflow, err := ReadWorkflow(strings.NewReader(yaml)) - assert.NoError(t, err, "read workflow should succeed") - - assert.Len(t, workflow.On(), 2) - assert.Contains(t, workflow.On(), "push") - assert.Contains(t, workflow.On(), "pull_request") -} - -func TestReadWorkflow_MapEvent(t *testing.T) { - yaml := ` -name: local-action-docker-url -on: - push: - branches: - - master - pull_request: - branches: - - master - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: ./actions/docker-url -` - - workflow, err := ReadWorkflow(strings.NewReader(yaml)) - assert.NoError(t, err, "read workflow should succeed") - assert.Len(t, workflow.On(), 2) - assert.Contains(t, workflow.On(), "push") - assert.Contains(t, workflow.On(), "pull_request") -} - -func TestReadWorkflow_StringContainer(t *testing.T) { - yaml := ` -name: local-action-docker-url - -jobs: - test: - container: nginx:latest - runs-on: ubuntu-latest - steps: - - uses: ./actions/docker-url - test2: - container: - image: nginx:latest - env: - foo: bar - runs-on: ubuntu-latest - steps: - - uses: ./actions/docker-url -` - - workflow, err := ReadWorkflow(strings.NewReader(yaml)) - assert.NoError(t, err, "read workflow should succeed") - assert.Len(t, workflow.Jobs, 2) - assert.Contains(t, workflow.Jobs["test"].Container().Image, "nginx:latest") - assert.Contains(t, workflow.Jobs["test2"].Container().Image, "nginx:latest") - assert.Contains(t, workflow.Jobs["test2"].Container().Env["foo"], "bar") -} diff --git a/modules/actions/github/github.go b/modules/actions/github/github.go deleted file mode 100644 index b39539fa0da19..0000000000000 --- a/modules/actions/github/github.go +++ /dev/null @@ -1,165 +0,0 @@ -package github - -import ( - "context" - "encoding/json" - "fmt" - "io" - "os" - "path/filepath" - - bot_model "code.gitea.io/gitea/models/bot" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/bot/runner" - "code.gitea.io/gitea/modules/git" - - //"code.gitea.io/gitea/modules/log" - //"code.gitea.io/gitea/modules/util" - - "github.com/nektos/act/pkg/model" - act_runner "github.com/nektos/act/pkg/runner" -) - -func init() { - runner.RegisterRunnerType(new(GithubRunner)) -} - -type GithubRunner struct { -} - -func (gw *GithubRunner) Name() string { - return "github" -} - -func (gw *GithubRunner) Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) { - tree, err := commit.SubTree(".github/workflow") - if err != nil { - return false, "", err - } - entries, err := tree.ListEntries() - if err != nil { - return false, "", err - } - - var content = make(map[string]string) - for _, entry := range entries { - blob := entry.Blob() - rd, err := blob.DataAsync() - if err != nil { - return false, "", err - } - - bs, err := io.ReadAll(rd) - rd.Close() - if err != nil { - return false, "", err - } - content[entry.Name()] = string(bs) - } - - res, err := json.Marshal(content) - if err != nil { - return false, "", err - } - return true, string(res), nil -} - -func (gw *GithubRunner) Run(task *bot_model.Task) error { - tmpDir, err := os.MkdirTemp("", fmt.Sprintf("%d", task.ID)) - if err != nil { - return err - } - - var files = make(map[string]string) - if err := json.Unmarshal([]byte(task.Content), &files); err != nil { - return err - } - for name, content := range files { - f, err := os.Create(filepath.Join(tmpDir, name)) - if err != nil { - return err - } - if _, err := f.WriteString(content); err != nil { - f.Close() - return err - } - f.Close() - } - - repo, err := repo_model.GetRepositoryByID(task.RepoID) - if err != nil { - return err - } - - evtFilePath := filepath.Join(tmpDir, "event.json") - evtFile, err := os.Create(evtFilePath) - if err != nil { - return err - } - - if _, err := evtFile.WriteString(task.EventPayload); err != nil { - evtFile.Close() - return err - } - evtFile.Close() - - planner, err := model.NewWorkflowPlanner(tmpDir, false) - if err != nil { - return err - } - plan := planner.PlanEvent(task.Event) - - actor, err := user_model.GetUserByID(task.TriggerUserID) - if err != nil { - return err - } - - // run the plan - config := &act_runner.Config{ - Actor: actor.LoginName, - EventName: task.Event, - EventPath: evtFilePath, - DefaultBranch: repo.DefaultBranch, - /*ForcePull: input.forcePull, - ForceRebuild: input.forceRebuild, - ReuseContainers: input.reuseContainers, - Workdir: input.Workdir(), - BindWorkdir: input.bindWorkdir, - LogOutput: !input.noOutput,*/ - //Env: envs, - Secrets: map[string]string{ - "token": "614e597274a527b6fcf6ddfe45def79430126f08", - }, - //InsecureSecrets: input.insecureSecrets,*/ - Platforms: map[string]string{ - "ubuntu-latest": "node:12-buster-slim", - "ubuntu-20.04": "node:12-buster-slim", - "ubuntu-18.04": "node:12-buster-slim", - }, - /*Privileged: input.privileged, - UsernsMode: input.usernsMode, - ContainerArchitecture: input.containerArchitecture, - ContainerDaemonSocket: input.containerDaemonSocket, - UseGitIgnore: input.useGitIgnore,*/ - GitHubInstance: "gitea.com", - /*ContainerCapAdd: input.containerCapAdd, - ContainerCapDrop: input.containerCapDrop, - AutoRemove: input.autoRemove, - ArtifactServerPath: input.artifactServerPath, - ArtifactServerPort: input.artifactServerPort,*/ - } - r, err := act_runner.New(config) - if err != nil { - return err - } - - //ctx, cancel := context.WithTimeout(context.Background(), ) - - executor := r.NewPlanExecutor(plan).Finally(func(ctx context.Context) error { - //cancel() - return nil - }) - return executor(context.Background()) -} diff --git a/modules/actions/runner/runner.go b/modules/actions/runner/runner.go deleted file mode 100644 index 2a9540ad769c2..0000000000000 --- a/modules/actions/runner/runner.go +++ /dev/null @@ -1,27 +0,0 @@ -package runner - -import ( - bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" -) - -var runnerTypes = make(map[string]RunnerType) - -type RunnerType interface { - Name() string - Detect(commit *git.Commit, event webhook.HookEventType, ref string) (bool, string, error) - Run(task *bots_model.Task) error -} - -func RegisterRunnerType(runnerType RunnerType) { - runnerTypes[runnerType.Name()] = runnerType -} - -func GetRunnerType(name string) RunnerType { - return runnerTypes[name] -} - -func GetRunnerTypes() map[string]RunnerType { - return runnerTypes -} diff --git a/modules/bots/bots.go b/modules/bots/bots.go new file mode 100644 index 0000000000000..a83732e06e396 --- /dev/null +++ b/modules/bots/bots.go @@ -0,0 +1,61 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "strings" + + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/git" + + "github.com/nektos/act/pkg/model" +) + +func DetectWorkflows(commit *git.Commit, event webhook.HookEventType) (git.Entries, []map[string]*model.Job, error) { + tree, err := commit.SubTree(".github/workflows") + if _, ok := err.(git.ErrNotExist); ok { + tree, err = commit.SubTree(".gitea/workflows") + } + if _, ok := err.(git.ErrNotExist); ok { + return nil, nil, nil + } + if err != nil { + return nil, nil, err + } + + entries, err := tree.ListEntriesRecursive() + if err != nil { + return nil, nil, err + } + + matchedEntries := make(git.Entries, 0, len(entries)) + jobs := make([]map[string]*model.Job, 0, len(entries)) + + for _, entry := range entries { + if !strings.HasSuffix(entry.Name(), ".yml") && !strings.HasSuffix(entry.Name(), ".yaml") { + continue + } + f, err := entry.Blob().DataAsync() + if err != nil { + return nil, nil, err + } + workflow, err := model.ReadWorkflow(f) + if err != nil { + f.Close() + return nil, nil, err + } + + for _, e := range workflow.On() { + if e == event.Event() { + matchedEntries = append(matchedEntries, entry) + jobs = append(jobs, workflow.Jobs) + break + } + } + f.Close() + } + + return matchedEntries, jobs, nil +} diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index a6dec9f449940..f013e795f1f78 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -16,6 +16,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" + bots_module "code.gitea.io/gitea/modules/bots" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" @@ -39,28 +40,6 @@ func NewNotifier() base.Notifier { return &botsNotifier{} } -func detectWorkflows(commit *git.Commit, event webhook.HookEventType, ref string) (bool, error) { - tree, err := commit.SubTree(".github/workflows") - if _, ok := err.(git.ErrNotExist); ok { - tree, err = commit.SubTree(".gitea/workflows") - } - if _, ok := err.(git.ErrNotExist); ok { - return false, nil - } - if err != nil { - return false, err - } - - entries, err := tree.ListEntries() - if err != nil { - return false, err - } - - log.Trace("detected %s has %d entries", commit.ID, len(entries)) - - return len(entries) > 0, nil -} - func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEventType, payload string) { err := issue.LoadRepo(db.DefaultContext) if err != nil { @@ -75,8 +54,11 @@ func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEve if ref == "" { ref = issue.Repo.DefaultBranch } + notify(issue.Repo, doer, payload, ref, evt) +} - gitRepo, err := git.OpenRepository(context.Background(), issue.Repo.RepoPath()) +func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref string, evt webhook.HookEventType) { + gitRepo, err := git.OpenRepository(context.Background(), repo.RepoPath()) if err != nil { log.Error("issue.LoadRepo: %v", err) return @@ -90,31 +72,41 @@ func notifyIssue(issue *models.Issue, doer *user_model.User, evt webhook.HookEve return } - hasWorkflows, err := detectWorkflows(commit, evt, ref) + matchedEntries, jobs, err := bots_module.DetectWorkflows(commit, evt) if err != nil { log.Error("detectWorkflows: %v", err) return } - if !hasWorkflows { - log.Trace("repo %s with commit %s couldn't find workflows", issue.Repo.RepoPath(), commit.ID) + log.Trace("detected %s has %d entries", commit.ID, len(matchedEntries)) + if len(matchedEntries) == 0 { + log.Trace("repo %s with commit %s couldn't find workflows", repo.RepoPath(), commit.ID) return } - task := bots_model.Task{ - Title: commit.CommitMessage, - RepoID: issue.RepoID, + workflowsStatuses := make(map[string]map[string]bots_model.BuildStatus) + for i, entry := range matchedEntries { + taskStatuses := make(map[string]bots_model.BuildStatus) + for k := range jobs[i] { + taskStatuses[k] = bots_model.BuildPending + } + workflowsStatuses[entry.Name()] = taskStatuses + } + + build := bots_model.Build{ + Title: commit.Message(), + RepoID: repo.ID, TriggerUserID: doer.ID, Event: evt, EventPayload: payload, - Status: bots_model.TaskPending, + Status: bots_model.BuildPending, Ref: ref, CommitSHA: commit.ID.String(), } - if err := bots_model.InsertTask(&task); err != nil { + if err := bots_model.InsertBuild(&build, workflowsStatuses); err != nil { log.Error("InsertBotTask: %v", err) } else { - bots_service.PushToQueue(&task) + bots_service.PushToQueue(&build) } } @@ -190,29 +182,6 @@ func (a *botsNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_mod return } - gitRepo, err := git.OpenRepository(ctx, repo.RepoPath()) - if err != nil { - log.Error("commits.ToAPIPayloadCommits failed: %v", err) - return - } - defer gitRepo.Close() - - commit, err := gitRepo.GetCommit(commits.HeadCommit.Sha1) - if err != nil { - log.Error("commits.ToAPIPayloadCommits failed: %v", err) - return - } - - hasWorkflows, err := detectWorkflows(commit, webhook.HookEventPush, opts.RefFullName) - if err != nil { - log.Error("detectWorkflows: %v", err) - return - } - if !hasWorkflows { - log.Trace("repo %s with commit %s couldn't find workflows", repo.RepoPath(), commit.ID) - return - } - payload := &api.PushPayload{ Ref: opts.RefFullName, Before: opts.OldCommitID, @@ -231,20 +200,7 @@ func (a *botsNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_mod return } - task := bots_model.Task{ - Title: commit.Message(), - RepoID: repo.ID, - TriggerUserID: pusher.ID, - Event: webhook.HookEventPush, - EventPayload: string(bs), - Status: bots_model.TaskPending, - } - - if err := bots_model.InsertTask(&task); err != nil { - log.Error("InsertBotTask: %v", err) - } else { - bots_service.PushToQueue(&task) - } + notify(repo, pusher, string(bs), opts.RefFullName, webhook.HookEventPush) } func (a *botsNotifier) NotifyCreateRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName, refID string) { diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 32fdc75673f34..5513caa801176 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -147,7 +147,7 @@ MESSAGE_BUMP: } // TODO: find new task and send to client - task, err := bots_model.GetCurTaskByUUID(msg.RunnerUUID) + task, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) if err != nil { log.Error("websocket[%s] get task failed: %v", r.RemoteAddr, err) break diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index f7d8be4a58173..7194347b25169 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -5,6 +5,7 @@ package builds import ( + "fmt" "net/http" bots_model "code.gitea.io/gitea/models/bots" @@ -45,7 +46,7 @@ func List(ctx *context.Context) { page = 1 } - opts := bots_model.FindTaskOptions{ + opts := bots_model.FindBuildOptions{ ListOptions: db.ListOptions{ Page: page, PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), @@ -57,24 +58,24 @@ func List(ctx *context.Context) { } else { opts.IsClosed = util.OptionalBoolFalse } - tasks, err := bots_model.FindTasks(opts) + builds, err := bots_model.FindBuilds(opts) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - if err := tasks.LoadTriggerUser(); err != nil { + if err := builds.LoadTriggerUser(); err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - total, err := bots_model.CountTasks(opts) + total, err := bots_model.CountBuilds(opts) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - ctx.Data["Tasks"] = tasks + ctx.Data["Builds"] = builds pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) @@ -85,15 +86,64 @@ func List(ctx *context.Context) { func ViewBuild(ctx *context.Context) { index := ctx.ParamsInt64("index") - task, err := bots_model.GetTaskByRepoAndIndex(ctx.Repo.Repository.ID, index) + build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - ctx.Data["Title"] = task.Title + " - " + ctx.Tr("repo.builds") + ctx.Data["Title"] = build.Title + " - " + ctx.Tr("repo.builds") ctx.Data["PageIsBuildList"] = true - ctx.Data["Build"] = task + ctx.Data["Build"] = build + statuses, err := bots_model.GetBuildWorkflows(build.ID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["WorkflowsStatuses"] = statuses ctx.HTML(http.StatusOK, tplViewBuild) } + +func GetBuildJobLogs(ctx *context.Context) { + index := ctx.ParamsInt64("index") + build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + workflows, err := bots_model.GetBuildWorkflows(build.ID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + var buildJob *bots_model.BuildJob + wf := ctx.Params("workflow") + jobname := ctx.Params("jobname") +LOOP_WORKFLOWS: + for workflow, jobs := range workflows { + if workflow == wf { + for _, job := range jobs { + if jobname == job.Jobname { + buildJob = job + break LOOP_WORKFLOWS + } + } + } + } + if buildJob == nil { + ctx.Error(http.StatusNotFound, fmt.Sprintf("workflow %s job %s not exist", wf, jobname)) + return + } + + // TODO: if buildJob.LogToFile is true, read the logs from the file + + logs, err := bots_model.GetBuildLogs(build.ID, buildJob.ID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.JSON(http.StatusOK, logs) +} diff --git a/routers/web/web.go b/routers/web/web.go index 2dff1d3544eb2..09b2c3f812272 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1175,6 +1175,7 @@ func RegisterRoutes(m *web.Route) { m.Get("", builds.List) m.Group("/{index}", func() { m.Get("", builds.ViewBuild) + m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) }) }, reqRepoBuildsReader, builds.MustEnableBuilds) diff --git a/services/bots/bots.go b/services/bots/bots.go index 39701105658bb..98b94765355a8 100644 --- a/services/bots/bots.go +++ b/services/bots/bots.go @@ -14,16 +14,16 @@ import ( //"code.gitea.io/gitea/modules/json" ) -// taskQueue is a global queue of tasks -var taskQueue queue.Queue +// buildQueue is a global queue of bot build +var buildQueue queue.Queue // PushToQueue -func PushToQueue(task *bots_model.Task) { - taskQueue.Push(task) +func PushToQueue(task *bots_model.Build) { + buildQueue.Push(task) } // Dispatch assign a task to a runner -func Dispatch(task *bots_model.Task) (*bots_model.Runner, error) { +func Dispatch(task *bots_model.Build) (*bots_model.Runner, error) { runner, err := bots_model.GetUsableRunner(bots_model.GetRunnerOptions{ RepoID: task.RepoID, }) @@ -31,17 +31,17 @@ func Dispatch(task *bots_model.Task) (*bots_model.Runner, error) { return nil, err } - return runner, bots_model.AssignTaskToRunner(task.ID, runner.ID) + return runner, bots_model.AssignBuildToRunner(task.ID, runner.ID) } // Init will start the service to get all unfinished tasks and run them func Init() error { - taskQueue = queue.CreateQueue("actions_task", handle, &bots_model.Task{}) - if taskQueue == nil { + buildQueue = queue.CreateQueue("actions_task", handle, &bots_model.Build{}) + if buildQueue == nil { return fmt.Errorf("Unable to create Task Queue") } - go graceful.GetManager().RunWithShutdownFns(taskQueue.Run) + go graceful.GetManager().RunWithShutdownFns(buildQueue.Run) return nil } @@ -49,13 +49,13 @@ func Init() error { func handle(data ...queue.Data) []queue.Data { var unhandled []queue.Data for _, datum := range data { - task := datum.(*bots_model.Task) - runner, err := Dispatch(task) + build := datum.(*bots_model.Build) + runner, err := Dispatch(build) if err != nil { - log.Error("Run task failed: %v", err) - unhandled = append(unhandled, task) + log.Error("Run build failed: %v", err) + unhandled = append(unhandled, build) } else { - log.Trace("task %v assigned to %s", task.UUID, runner.UUID) + log.Trace("build %v assigned to %s", build.UUID, runner.UUID) } } return unhandled diff --git a/templates/repo/builds/build_list.tmpl b/templates/repo/builds/build_list.tmpl index 55d177cbcbb6d..84d3a785e6f9e 100644 --- a/templates/repo/builds/build_list.tmpl +++ b/templates/repo/builds/build_list.tmpl @@ -1,5 +1,5 @@
    - {{range .Tasks}} + {{range .Builds}}
  • {{if $.CanWriteIssuesOrPulls}} @@ -8,20 +8,7 @@
    {{end}} -
    - {{if .IsPending}} - - {{end}} - {{if .IsRunning}} - - {{end}} - {{if .IsSuccess}} - - {{end}} - {{if .IsFailed}} - - {{end}} -
    + {{template "repo/builds/status" .Status}}
    • diff --git a/templates/repo/builds/status.tmpl b/templates/repo/builds/status.tmpl new file mode 100644 index 0000000000000..a48a895dd686f --- /dev/null +++ b/templates/repo/builds/status.tmpl @@ -0,0 +1,14 @@ +
    + {{if .IsPending}} + + {{end}} + {{if .IsRunning}} + + {{end}} + {{if .IsSuccess}} + + {{end}} + {{if .IsFailed}} + + {{end}} +
    diff --git a/templates/repo/builds/view.tmpl b/templates/repo/builds/view.tmpl index 8b01e586dc1e0..512b03e2955fd 100644 --- a/templates/repo/builds/view.tmpl +++ b/templates/repo/builds/view.tmpl @@ -10,6 +10,7 @@
    + {{template "repo/builds/view_left" .}} {{template "repo/builds/view_content" .}}
    diff --git a/templates/repo/builds/view_content.tmpl b/templates/repo/builds/view_content.tmpl index 7dc3ca9ac8c03..c7015dbcff406 100644 --- a/templates/repo/builds/view_content.tmpl +++ b/templates/repo/builds/view_content.tmpl @@ -1,8 +1,19 @@ -
    - {{if .Flash}} -
    - {{template "base/alert" .}} -
    - {{end}} - +
    +
    +
    +
    +
    +

    Console Logs

    +
    +
    + 
    
+						
    1Initialized empty Git repository in /drone/src/.git/
+0s
    2+ git fetch origin +refs/heads/main:
+0s
    3From https://github.com/go-gitea/gitea
+20s
    4 * branch                main       -> FETCH_HEAD
+20s
    5 * [new branch]          main       -> origin/main
+20s
    6+ git checkout c8ec2261a99590f15699e9147a28e4b61c1c2ea5 -b main
+20s
    7Switched to a new branch 'main'
+20s
    Exit Code 0
    diff --git a/templates/repo/builds/view_left.tmpl b/templates/repo/builds/view_left.tmpl new file mode 100644 index 0000000000000..4dfee9ec37378 --- /dev/null +++ b/templates/repo/builds/view_left.tmpl @@ -0,0 +1,18 @@ +
    +
    +

    Menu

    +
    + {{range $file, $jobs := .WorkflowsStatuses}} +
    + {{ $file }} +
    + {{range $jobname, $job := $jobs}} + {{template "repo/builds/status" $job.Status}} + {{ $jobname }} + {{end}} +
    +
    + {{end}} +
    +
    +
    From a1bd3a8932069f6e3b171b77dfe6868d387eddc8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 May 2022 17:47:20 +0800 Subject: [PATCH 004/408] Fix build --- models/migrations/v216.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/migrations/v216.go b/models/migrations/v216.go index a8e1110d3f2e2..23695cf5e412c 100644 --- a/models/migrations/v216.go +++ b/models/migrations/v216.go @@ -5,6 +5,9 @@ package migrations import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" + "xorm.io/xorm" ) From 2ea693cdd23a9d9892513d7e7fcf9c9bc6743de9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 May 2022 22:00:03 +0800 Subject: [PATCH 005/408] update template --- templates/repo/builds/view.tmpl | 2 +- templates/repo/builds/view_content.tmpl | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/repo/builds/view.tmpl b/templates/repo/builds/view.tmpl index 512b03e2955fd..da279aa97de93 100644 --- a/templates/repo/builds/view.tmpl +++ b/templates/repo/builds/view.tmpl @@ -5,7 +5,7 @@

    - {{RenderIssueTitle $.Context .Build.Title $.RepoLink $.Repository.ComposeMetas}} + {{template "repo/builds/status" .Build.Status}}{{RenderIssueTitle $.Context .Build.Title $.RepoLink $.Repository.ComposeMetas}} #{{.Build.Index}}

    diff --git a/templates/repo/builds/view_content.tmpl b/templates/repo/builds/view_content.tmpl index c7015dbcff406..095525bf608fd 100644 --- a/templates/repo/builds/view_content.tmpl +++ b/templates/repo/builds/view_content.tmpl @@ -8,12 +8,15 @@ 
    
-						
    1Initialized empty Git repository in /drone/src/.git/
+						
    
+						1
+						Initialized empty Git repository in /drone/src/.git/
 0s
    2+ git fetch origin +refs/heads/main:
 0s
    3From https://github.com/go-gitea/gitea
 20s
    4 * branch                main       -> FETCH_HEAD
 20s
    5 * [new branch]          main       -> origin/main
 20s
    6+ git checkout c8ec2261a99590f15699e9147a28e4b61c1c2ea5 -b main
 20s
    7Switched to a new branch 'main'
-20s
    Exit Code 0
    +20s
    +
    Exit Code 0
    From 931d8c2c2112c8e7c5a3df5673e3e2cdc19ee4ba Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 20 Jun 2022 16:31:54 +0800 Subject: [PATCH 006/408] add runners management ui --- models/bots/runner.go | 58 ++++++-- models/bots/runner_list.go | 84 +++++++++++ routers/api/bots/bots.go | 209 +++++++++++++++------------ routers/web/admin/runners.go | 129 +++++++++++++++++ routers/web/web.go | 7 + services/bots/bots.go | 2 +- services/forms/admin.go | 24 +++ templates/admin/navbar.tmpl | 3 + templates/admin/runner/edit.tmpl | 209 +++++++++++++++++++++++++++ templates/admin/runner/list.tmpl | 53 +++++++ templates/admin/runner/new.tmpl | 94 ++++++++++++ templates/repo/builds/status.tmpl | 26 ++-- templates/repo/builds/view_left.tmpl | 4 +- 13 files changed, 779 insertions(+), 123 deletions(-) create mode 100644 models/bots/runner_list.go create mode 100644 routers/web/admin/runners.go create mode 100644 templates/admin/runner/edit.tmpl create mode 100644 templates/admin/runner/list.tmpl create mode 100644 templates/admin/runner/new.tmpl diff --git a/models/bots/runner.go b/models/bots/runner.go index dd97b92866c63..24ac953492d46 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -8,6 +8,8 @@ import ( "fmt" "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/timeutil" "xorm.io/builder" @@ -25,16 +27,18 @@ func (err ErrRunnerNotExist) Error() string { // Runner represents runner machines type Runner struct { ID int64 - UUID string `xorm:"CHAR(36) UNIQUE"` - Name string `xorm:"VARCHAR(32) UNIQUE"` - OS string `xorm:"VARCHAR(16) index"` // the runner running os - Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture - Type string `xorm:"VARCHAR(16)"` - OwnerID int64 `xorm:"index"` // org level runner, 0 means system - RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global - Description string `xorm:"TEXT"` - Base int // 0 native 1 docker 2 virtual machine - RepoRange string // glob match which repositories could use this runner + UUID string `xorm:"CHAR(36) UNIQUE"` + Name string `xorm:"VARCHAR(32) UNIQUE"` + OS string `xorm:"VARCHAR(16) index"` // the runner running os + Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture + Type string `xorm:"VARCHAR(16)"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + Owner *user_model.User `xorm:"-"` + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Repo *repo_model.Repository `xorm:"-"` + Description string `xorm:"TEXT"` + Base int // 0 native 1 docker 2 virtual machine + RepoRange string // glob match which repositories could use this runner Token string LastOnline timeutil.TimeStamp `xorm:"index"` Created timeutil.TimeStamp `xorm:"created"` @@ -44,16 +48,28 @@ func (Runner) TableName() string { return "bots_runner" } +func (r *Runner) OwnType() string { + if r.OwnerID == 0 { + return "Global Type" + } + if r.RepoID == 0 { + return r.Owner.Name + } + + return r.Repo.FullName() +} + func init() { db.RegisterModel(&Runner{}) } -type GetRunnerOptions struct { +type FindRunnerOptions struct { + db.ListOptions RepoID int64 OwnerID int64 } -func (opts GetRunnerOptions) toCond() builder.Cond { +func (opts FindRunnerOptions) toCond() builder.Cond { cond := builder.NewCond() if opts.RepoID > 0 { cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) @@ -65,8 +81,24 @@ func (opts GetRunnerOptions) toCond() builder.Cond { return cond } +func CountRunners(opts FindRunnerOptions) (int64, error) { + return db.GetEngine(db.DefaultContext). + Table("bots_runner"). + Where(opts.toCond()). + Count() +} + +func FindRunners(opts FindRunnerOptions) (runners RunnerList, err error) { + sess := db.GetEngine(db.DefaultContext). + Where(opts.toCond()) + if opts.Page > 0 { + sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) + } + return runners, sess.Find(&runners) +} + // GetUsableRunner returns the usable runner -func GetUsableRunner(opts GetRunnerOptions) (*Runner, error) { +func GetUsableRunner(opts FindRunnerOptions) (*Runner, error) { var runner Runner has, err := db.GetEngine(db.DefaultContext). Where(opts.toCond()). diff --git a/models/bots/runner_list.go b/models/bots/runner_list.go new file mode 100644 index 0000000000000..197865d8e2085 --- /dev/null +++ b/models/bots/runner_list.go @@ -0,0 +1,84 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/container" +) + +type RunnerList []*Runner + +// GetUserIDs returns a slice of user's id +func (runners RunnerList) GetUserIDs() []int64 { + userIDsMap := make(map[int64]struct{}) + for _, runner := range runners { + if runner.OwnerID == 0 { + continue + } + userIDsMap[runner.OwnerID] = struct{}{} + } + userIDs := make([]int64, 0, len(userIDsMap)) + for userID := range userIDsMap { + userIDs = append(userIDs, userID) + } + return userIDs +} + +func (runners RunnerList) LoadOwners(ctx context.Context) error { + userIDs := runners.GetUserIDs() + users := make(map[int64]*user_model.User, len(userIDs)) + if err := db.GetEngine(ctx).In("id", userIDs).Find(&users); err != nil { + return err + } + for _, runner := range runners { + if runner.OwnerID > 0 && runner.Owner == nil { + runner.Owner = users[runner.OwnerID] + } + } + return nil +} + +func (runners RunnerList) getRepoIDs() []int64 { + repoIDs := make(map[int64]struct{}, len(runners)) + for _, runner := range runners { + if runner.RepoID == 0 { + continue + } + if _, ok := repoIDs[runner.RepoID]; !ok { + repoIDs[runner.RepoID] = struct{}{} + } + } + return container.KeysInt64(repoIDs) +} + +func (runners RunnerList) LoadRepos(ctx context.Context) error { + repoIDs := runners.getRepoIDs() + repos := make(map[int64]*repo_model.Repository, len(repoIDs)) + if err := db.GetEngine(ctx).In("id", repoIDs).Find(&repos); err != nil { + return err + } + + for _, runner := range runners { + if runner.RepoID > 0 && runner.Repo == nil { + runner.Repo = repos[runner.RepoID] + } + } + return nil +} + +func (runners RunnerList) LoadAttributes(ctx context.Context) error { + if err := runners.LoadOwners(ctx); err != nil { + return err + } + if err := runners.LoadRepos(ctx); err != nil { + return err + } + return nil +} diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 5513caa801176..89d445c6f1d0c 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -14,6 +14,7 @@ import ( bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" "github.com/gorilla/websocket" @@ -40,10 +41,113 @@ type Message struct { Version int // Type int // message type, 1 register 2 error 3 task 4 no task RunnerUUID string // runner uuid + BuildUUID string // build uuid ErrCode int // error code ErrContent string // errors message EventName string EventPayload string + JobID string // only run the special job, empty means run all the jobs +} + +const ( + version1 = 1 +) + +const ( + MsgTypeRegister = iota + 1 // register + MsgTypeError // error + MsgTypeRequestBuild // request build task + MsgTypeIdle // no task + MsgTypeBuildResult // build result + MsgTypeBuildJobResult // build job result +) + +func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error { + switch msg.Type { + case MsgTypeRegister: + log.Info("websocket[%s] registered", r.RemoteAddr) + runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) + if err != nil { + if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { + return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) + } + err = c.WriteMessage(mt, message) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } else { + fmt.Printf("-----%v\n", runner) + // TODO: handle read message + err = c.WriteMessage(mt, message) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + case MsgTypeRequestBuild: + // TODO: find new task and send to client + build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) + if err != nil { + return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) + } + var returnMsg *Message + if build == nil { + time.Sleep(3 * time.Second) + returnMsg = &Message{ + Version: version1, + Type: MsgTypeIdle, + RunnerUUID: msg.RunnerUUID, + } + } else { + returnMsg = &Message{ + Version: version1, + Type: MsgTypeRequestBuild, + RunnerUUID: msg.RunnerUUID, + BuildUUID: build.UUID, + EventName: build.Event.Event(), + EventPayload: build.EventPayload, + } + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + } + err = c.WriteMessage(mt, bs) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + case MsgTypeBuildResult: + log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg) + build, err := bots_model.GetBuildByUUID(msg.BuildUUID) + if err != nil { + return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err) + } + cols := []string{"status", "end_time"} + if msg.ErrCode == 0 { + build.Status = bots_model.BuildFinished + } else { + build.Status = bots_model.BuildFailed + } + build.EndTime = timeutil.TimeStampNow() + if err := bots_model.UpdateBuild(build, cols...); err != nil { + log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err) + } + default: + returnMsg := Message{ + Version: version1, + Type: MsgTypeError, + ErrCode: 1, + ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + } + err = c.WriteMessage(mt, bs) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + return nil } func Serve(w http.ResponseWriter, r *http.Request) { @@ -59,24 +163,21 @@ func Serve(w http.ResponseWriter, r *http.Request) { c.SetReadDeadline(time.Now().Add(pongWait)) c.SetPongHandler(func(string) error { c.SetReadDeadline(time.Now().Add(pongWait)); return nil }) -MESSAGE_BUMP: for { - // read log from client + // read message from client mt, message, err := c.ReadMessage() if err != nil { if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) || websocket.IsCloseError(err, websocket.CloseNormalClosure) { c.Close() - break - } - if !strings.Contains(err.Error(), "i/o timeout") { + } else if !strings.Contains(err.Error(), "i/o timeout") { log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err) } break - } else { - log.Trace("websocket[%s] received message: %s", r.RemoteAddr, message) } + log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message)) + // read message first var msg Message if err = json.Unmarshal(message, &msg); err != nil { @@ -86,103 +187,25 @@ MESSAGE_BUMP: switch msg.Version { case 1: - switch msg.Type { - case 1: - log.Info("websocket[%s] registered", r.RemoteAddr) - runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) - if err != nil { - if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { - log.Error("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) - break - } - err = c.WriteMessage(mt, message) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - break - } - } else { - fmt.Printf("-----%v\n", runner) - // TODO: handle read message - err = c.WriteMessage(mt, message) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - break - } - } - default: - returnMsg := Message{ - Version: 1, - Type: 2, - ErrCode: 1, - ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - break MESSAGE_BUMP - } - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - break MESSAGE_BUMP + if err := handleVersion1(r, c, mt, message, &msg); err != nil { + log.Error("%v", err) } default: returnMsg := Message{ Version: 1, - Type: 2, + Type: MsgTypeError, ErrCode: 1, ErrContent: "version is not supported", } bs, err := json.Marshal(&returnMsg) if err != nil { log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - break MESSAGE_BUMP - } - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - break MESSAGE_BUMP - } - - // TODO: find new task and send to client - task, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) - if err != nil { - log.Error("websocket[%s] get task failed: %v", r.RemoteAddr, err) - break - } - if task == nil { - returnMsg := Message{ - Version: 1, - Type: 4, - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - break MESSAGE_BUMP - } - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } else { - returnMsg := Message{ - Version: 1, - Type: 3, - EventName: task.Event.Event(), - EventPayload: task.EventPayload, - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - break - } - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } else { + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } } } - } } diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go new file mode 100644 index 0000000000000..952c71466b09c --- /dev/null +++ b/routers/web/admin/runners.go @@ -0,0 +1,129 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Copyright 2020 The Gitea Authors. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package admin + +import ( + "net/http" + "net/url" + + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" +) + +const ( + tplRunners base.TplName = "admin/runner/list" + tplRunnerNew base.TplName = "admin/runner/new" + tplRunnerEdit base.TplName = "admin/runner/edit" +) + +// Runners show all the runners +func Runners(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.runners") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + + opts := bots_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + } + + count, err := bots_model.CountRunners(opts) + if err != nil { + ctx.ServerError("SearchUsers", err) + return + } + + runners, err := bots_model.FindRunners(opts) + if err != nil { + ctx.ServerError("SearchUsers", err) + return + } + if err := runners.LoadAttributes(ctx); err != nil { + ctx.ServerError("LoadAttributes", err) + return + } + + ctx.Data["Runners"] = runners + ctx.Data["Total"] = count + + pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) + ctx.Data["Page"] = pager + + ctx.HTML(http.StatusOK, tplRunners) +} + +// NewRunner render adding a new runner page +func NewRunner(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.runners.new") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + ctx.HTML(http.StatusOK, tplRunnerNew) +} + +// NewRunnerPost response for adding a new runner +func NewRunnerPost(ctx *context.Context) { + // form := web.GetForm(ctx).(*forms.AdminCreateRunnerForm) + ctx.Data["Title"] = ctx.Tr("admin.runners.new") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + if ctx.HasError() { + ctx.HTML(http.StatusOK, tplRunnerNew) + return + } + + // ctx.Flash.Success(ctx.Tr("admin.runners.new_success", u.Name)) + // ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10)) +} + +// EditRunner show editing runner page +func EditRunner(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.runners.edit") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + prepareUserInfo(ctx) + if ctx.Written() { + return + } + + ctx.HTML(http.StatusOK, tplUserEdit) +} + +// EditRunnerPost response for editing runner +func EditRunnerPost(ctx *context.Context) { + // form := web.GetForm(ctx).(*forms.AdminEditRunnerForm) + ctx.Data["Title"] = ctx.Tr("admin.runners.edit") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + if ctx.HasError() { + ctx.HTML(http.StatusOK, tplUserEdit) + return + } + + ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success")) + ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid"))) +} + +// DeleteRunner response for deleting a runner +func DeleteRunner(ctx *context.Context) { + ctx.Flash.Success(ctx.Tr("admin.runners.deletion_success")) + ctx.JSON(http.StatusOK, map[string]interface{}{ + "redirect": setting.AppSubURL + "/admin/runners", + }) +} diff --git a/routers/web/web.go b/routers/web/web.go index 09b2c3f812272..a1f601b9c44e4 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -624,6 +624,13 @@ func RegisterRoutes(m *web.Route) { return } }) + + m.Group("/runners", func() { + m.Get("", admin.Runners) + m.Combo("/new").Get(admin.NewRunner).Post(bindIgnErr(forms.AdminCreateRunnerForm{}), admin.NewRunnerPost) + m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost) + m.Post("/{runnerid}/delete", admin.DeleteRunner) + }) }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable ctx.Data["EnablePackages"] = setting.Packages.Enabled diff --git a/services/bots/bots.go b/services/bots/bots.go index 98b94765355a8..f894a678ea18c 100644 --- a/services/bots/bots.go +++ b/services/bots/bots.go @@ -24,7 +24,7 @@ func PushToQueue(task *bots_model.Build) { // Dispatch assign a task to a runner func Dispatch(task *bots_model.Build) (*bots_model.Runner, error) { - runner, err := bots_model.GetUsableRunner(bots_model.GetRunnerOptions{ + runner, err := bots_model.GetUsableRunner(bots_model.FindRunnerOptions{ RepoID: task.RepoID, }) if err != nil { diff --git a/services/forms/admin.go b/services/forms/admin.go index 537b9f982cfe1..8c1ba0589ea13 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -71,3 +71,27 @@ func (f *AdminDashboardForm) Validate(req *http.Request, errs binding.Errors) bi ctx := context.GetContext(req) return middleware.Validate(errs, ctx.Data, f, ctx.Locale) } + +// AdminCreateRunnerForm form for admin to create runner +type AdminCreateRunnerForm struct { + Name string `binding:"Required"` + Type string +} + +// Validate validates form fields +func (f *AdminCreateRunnerForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { + ctx := context.GetContext(req) + return middleware.Validate(errs, ctx.Data, f, ctx.Locale) +} + +// AdminEditRunnerForm form for admin to create runner +type AdminEditRunnerForm struct { + Name string `binding:"Required"` + Type string +} + +// Validate validates form fields +func (f *AdminEditRunnerForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { + ctx := context.GetContext(req) + return middleware.Validate(errs, ctx.Data, f, ctx.Locale) +} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 1c8b12fc2fafc..d40814978a7fd 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -33,6 +33,9 @@ {{.locale.Tr "settings.applications"}} {{end}} + + {{.locale.Tr "admin.runners"}} + {{.locale.Tr "admin.config"}} diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl new file mode 100644 index 0000000000000..1ee46f3077a3b --- /dev/null +++ b/templates/admin/runner/edit.tmpl @@ -0,0 +1,209 @@ +{{template "base/head" .}} +
    + {{template "admin/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "admin.users.edit_account"}} +

    +
    +
    + {{template "base/disable_form_autofill"}} + {{.CsrfTokenHtml}} +
    + + +
    + +
    + +
    + +
    {{.i18n.Tr "admin.users.local"}}
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    +
    {{.i18n.Tr "admin.users.local"}}
    + {{range .Sources}} +
    {{.Name}}
    + {{end}} +
    +
    +
    + +
    + +
    + {{if .User.Visibility.IsPublic}}{{end}} + {{if .User.Visibility.IsLimited}}{{end}} + {{if .User.Visibility.IsPrivate}}{{end}} +
    + {{if .User.Visibility.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}} + {{if .User.Visibility.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}} + {{if .User.Visibility.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}} +
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    + {{range $mode := .AllowedUserVisibilityModes}} + {{if $mode.IsPublic}} +
    {{$.i18n.Tr "settings.visibility.public"}}
    + {{else if $mode.IsLimited}} +
    {{$.i18n.Tr "settings.visibility.limited"}}
    + {{else if $mode.IsPrivate}} +
    {{$.i18n.Tr "settings.visibility.private"}}
    + {{end}} + {{end}} +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +

    {{.i18n.Tr "admin.users.password_helper"}}

    +
    +
    + + +
    +
    + + +
    + +
    + +
    + + +

    {{.i18n.Tr "admin.users.max_repo_creation_desc"}}

    +
    + +
    + +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    + {{if not .DisableRegularOrgCreation}} +
    +
    + + +
    +
    + {{end}} + + {{if .TwoFactorEnabled}} +
    +
    +
    + + +
    +
    + {{end}} + +
    + +
    + +
    {{.i18n.Tr "admin.users.delete_account"}}
    +
    +
    +
    + +

    + {{.i18n.Tr "settings.avatar"}} +

    +
    +
    + {{.CsrfTokenHtml}} + {{if not DisableGravatar}} +
    +
    + + +
    +
    +
    + + +
    + {{end}} + +
    +
    + + +
    +
    + +
    + + +
    + +
    + + {{$.i18n.Tr "settings.delete_current_avatar"}} +
    +
    +
    +
    +
    + +
    +
    + {{svg "octicon-trash"}} + {{.i18n.Tr "settings.delete_account_title"}} +
    +
    +

    {{.i18n.Tr "settings.delete_account_desc"}}

    +
    + {{template "base/delete_modal_actions" .}} +
    +{{template "base/footer" .}} diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl new file mode 100644 index 0000000000000..04160a08e3c73 --- /dev/null +++ b/templates/admin/runner/list.tmpl @@ -0,0 +1,53 @@ +{{template "base/head" .}} +
    + {{template "admin/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "admin.runners.runner_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +
    + {{.i18n.Tr "admin.runners.new"}} +
    +

    +
    +
    + +
    + + +
    +
    +
    +
    + + + + + + + + + + + + + {{range .Runners}} + + + + + + + + + {{end}} + +
    ID + {{.i18n.Tr "admin.runners.name"}} + {{.i18n.Tr "admin.runners.own_type"}}{{.i18n.Tr "admin.runners.uuid"}}{{.i18n.Tr "admin.runners.created"}}{{.i18n.Tr "admin.runners.edit"}}
    {{.ID}}{{.Name}}{{.OwnType}}{{.UUID}}{{.Created}}{{svg "octicon-pencil"}}
    +
    + + {{template "base/paginate" .}} +
    +
    +{{template "base/footer" .}} diff --git a/templates/admin/runner/new.tmpl b/templates/admin/runner/new.tmpl new file mode 100644 index 0000000000000..6e3861fa50269 --- /dev/null +++ b/templates/admin/runner/new.tmpl @@ -0,0 +1,94 @@ +{{template "base/head" .}} +
    + {{template "admin/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "admin.users.new_account"}} +

    +
    +
    + {{template "base/disable_form_autofill"}} + {{.CsrfTokenHtml}} + +
    + +
    + +
    {{.i18n.Tr "admin.users.local"}}
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    +
    {{.i18n.Tr "admin.users.local"}}
    + {{range .Sources}} +
    {{.Name}}
    + {{end}} +
    +
    +
    + +
    + +
    + +
    + {{if .DefaultUserVisibilityMode.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}} + {{if .DefaultUserVisibilityMode.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}} + {{if .DefaultUserVisibilityMode.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}} +
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    + {{range $mode := .AllowedUserVisibilityModes}} + {{if $mode.IsPublic}} +
    {{$.i18n.Tr "settings.visibility.public"}}
    + {{else if $mode.IsLimited}} +
    {{$.i18n.Tr "settings.visibility.limited"}}
    + {{else if $mode.IsPrivate}} +
    {{$.i18n.Tr "settings.visibility.private"}}
    + {{end}} + {{end}} +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    +
    + + +
    +
    + + + {{if .CanSendEmail}} +
    +
    + + +
    +
    + {{end}} + +
    + +
    +
    +
    +
    +
    +{{template "base/footer" .}} diff --git a/templates/repo/builds/status.tmpl b/templates/repo/builds/status.tmpl index a48a895dd686f..454c951eb131b 100644 --- a/templates/repo/builds/status.tmpl +++ b/templates/repo/builds/status.tmpl @@ -1,14 +1,12 @@ -
    - {{if .IsPending}} - - {{end}} - {{if .IsRunning}} - - {{end}} - {{if .IsSuccess}} - - {{end}} - {{if .IsFailed}} - - {{end}} -
    +{{if .IsPending}} + +{{end}} +{{if .IsRunning}} + +{{end}} +{{if .IsSuccess}} + +{{end}} +{{if .IsFailed}} + +{{end}} diff --git a/templates/repo/builds/view_left.tmpl b/templates/repo/builds/view_left.tmpl index 4dfee9ec37378..6e0b60fc9ed4c 100644 --- a/templates/repo/builds/view_left.tmpl +++ b/templates/repo/builds/view_left.tmpl @@ -4,8 +4,8 @@
    {{range $file, $jobs := .WorkflowsStatuses}}
    - {{ $file }} -
    + {{ $file }} +
    {{range $jobname, $job := $jobs}} {{template "repo/builds/status" $job.Status}} {{ $jobname }} From 92d15afd188c12cffb7b697bf16dcefb354434d6 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 7 Aug 2022 21:26:31 +0800 Subject: [PATCH 007/408] database-filesystem, demo log tailing in term --- models/dbfs/dbfile.go | 362 ++++++++++++++++++++++++++++++++++++ models/dbfs/dbfs.go | 74 ++++++++ models/dbfs/dbfs_test.go | 154 +++++++++++++++ models/dbfs/main_test.go | 28 +++ modules/bots/bots.go | 2 +- routers/web/dev/termdemo.go | 51 +++++ routers/web/web.go | 5 + templates/dev/termdemo.tmpl | 27 +++ 8 files changed, 702 insertions(+), 1 deletion(-) create mode 100644 models/dbfs/dbfile.go create mode 100644 models/dbfs/dbfs.go create mode 100644 models/dbfs/dbfs_test.go create mode 100644 models/dbfs/main_test.go create mode 100644 routers/web/dev/termdemo.go create mode 100644 templates/dev/termdemo.tmpl diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go new file mode 100644 index 0000000000000..ebaa4db80c985 --- /dev/null +++ b/models/dbfs/dbfile.go @@ -0,0 +1,362 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbfs + +import ( + "context" + "errors" + "io" + "os" + "path/filepath" + "strconv" + "strings" + "time" + + "code.gitea.io/gitea/models/db" +) + +var defaultFileBlockSize int64 = 32 * 1024 + +type File interface { + io.ReadWriteCloser + io.Seeker +} + +type file struct { + ctx context.Context + metaID int64 + fullPath string + blockSize int64 + + allowRead bool + allowWrite bool + offset int64 +} + +var _ File = (*file)(nil) + +func (f *file) readAt(fileMeta *FileMeta, offset int64, p []byte) (n int, err error) { + if f.offset >= fileMeta.FileSize { + return 0, io.EOF + } + + blobPos := int(offset % f.blockSize) + blobOffset := offset - int64(blobPos) + blobRemaining := int(f.blockSize) - blobPos + needRead := len(p) + if needRead > blobRemaining { + needRead = blobRemaining + } + if blobOffset+int64(blobPos)+int64(needRead) > fileMeta.FileSize { + needRead = int(fileMeta.FileSize - blobOffset - int64(blobPos)) + } + if needRead <= 0 { + return 0, io.EOF + } + var fileData FileData + ok, err := db.GetEngine(f.ctx).Where("meta_id = ? AND blob_offset = ?", f.metaID, blobOffset).Get(&fileData) + if err != nil { + return 0, err + } + blobData := fileData.BlobData + if !ok { + blobData = nil + } + + canCopy := len(blobData) - blobPos + if canCopy <= 0 { + canCopy = 0 + } + realRead := needRead + if realRead > canCopy { + realRead = canCopy + } + if realRead > 0 { + copy(p[:realRead], fileData.BlobData[blobPos:blobPos+realRead]) + } + for i := realRead; i < needRead; i++ { + p[i] = 0 + } + return needRead, nil +} + +func (f *file) Read(p []byte) (n int, err error) { + if f.metaID == 0 || !f.allowRead { + return 0, os.ErrInvalid + } + + fileMeta, err := findFileMetaById(f.ctx, f.metaID) + if err != nil { + return 0, err + } + n, err = f.readAt(fileMeta, f.offset, p) + f.offset += int64(n) + return n, err +} + +func (f *file) Write(p []byte) (n int, err error) { + if f.metaID == 0 || !f.allowWrite { + return 0, os.ErrInvalid + } + + fileMeta, err := findFileMetaById(f.ctx, f.metaID) + if err != nil { + return 0, err + } + + needUpdateSize := false + written := 0 + for len(p) > 0 { + blobPos := int(f.offset % f.blockSize) + blobOffset := f.offset - int64(blobPos) + blobRemaining := int(f.blockSize) - blobPos + needWrite := len(p) + if needWrite > blobRemaining { + needWrite = blobRemaining + } + buf := make([]byte, f.blockSize) + readBytes, err := f.readAt(fileMeta, blobOffset, buf) + if err != nil && !errors.Is(err, io.EOF) { + return written, err + } + copy(buf[blobPos:blobPos+needWrite], p[:needWrite]) + if blobPos+needWrite > readBytes { + buf = buf[:blobPos+needWrite] + } else { + buf = buf[:readBytes] + } + + fileData := FileData{ + MetaID: fileMeta.ID, + BlobOffset: blobOffset, + BlobData: buf, + } + if res, err := db.GetEngine(f.ctx).Exec("UPDATE file_data SET revision=revision+1, blob_data=? WHERE meta_id=? AND blob_offset=?", buf, fileMeta.ID, blobOffset); err != nil { + return written, err + } else if updated, err := res.RowsAffected(); err != nil { + return written, err + } else if updated == 0 { + if _, err = db.GetEngine(f.ctx).Insert(&fileData); err != nil { + return written, err + } + } + written += needWrite + f.offset += int64(needWrite) + if f.offset > fileMeta.FileSize { + fileMeta.FileSize = f.offset + needUpdateSize = true + } + p = p[needWrite:] + } + + fileMetaUpdate := FileMeta{ + ModifyTimestamp: timeToFileTimestamp(time.Now()), + } + if needUpdateSize { + fileMetaUpdate.FileSize = f.offset + } + if _, err := db.GetEngine(f.ctx).ID(fileMeta.ID).Update(fileMetaUpdate); err != nil { + return written, err + } + return written, nil +} + +func (f *file) Seek(n int64, whence int) (int64, error) { + if f.metaID == 0 { + return 0, os.ErrInvalid + } + + newOffset := f.offset + switch whence { + case io.SeekStart: + newOffset = n + case io.SeekCurrent: + newOffset += n + case io.SeekEnd: + size, err := f.size() + if err != nil { + return f.offset, err + } + newOffset = size + n + default: + return f.offset, os.ErrInvalid + } + if newOffset < 0 { + return f.offset, os.ErrInvalid + } + f.offset = newOffset + return newOffset, nil +} + +func (f *file) Close() error { + return nil +} + +func timeToFileTimestamp(t time.Time) int64 { + return t.UnixMicro() +} + +func fileTimestampToTime(t int64) time.Time { + return time.UnixMicro(t) +} + +func (f *file) loadMetaByPath() (*FileMeta, error) { + var fileMeta FileMeta + if ok, err := db.GetEngine(f.ctx).Where("full_path = ?", f.fullPath).Get(&fileMeta); err != nil { + return nil, err + } else if ok { + f.metaID = fileMeta.ID + f.blockSize = fileMeta.BlockSize + return &fileMeta, nil + } + return nil, nil +} + +func (f *file) open(flag int) (err error) { + // see os.OpenFile for flag values + if flag&os.O_WRONLY != 0 { + f.allowWrite = true + } else if flag&os.O_RDWR != 0 { + f.allowRead = true + f.allowWrite = true + } else /* O_RDONLY */ { + f.allowRead = true + } + + if f.allowWrite { + if flag&os.O_CREATE != 0 { + if flag&os.O_EXCL != 0 { + // file must not exist. + if f.metaID != 0 { + return os.ErrExist + } + } else { + // create a new file if none exists. + if f.metaID == 0 { + if err = f.createEmpty(); err != nil { + return err + } + } + } + } + if flag&os.O_TRUNC != 0 { + if err = f.truncate(); err != nil { + return err + } + } + if flag&os.O_APPEND != 0 { + if _, err = f.Seek(0, io.SeekEnd); err != nil { + return err + } + } + return nil + } + + // read only mode + if f.metaID == 0 { + return os.ErrNotExist + } + return nil +} + +func (f *file) createEmpty() error { + if f.metaID != 0 { + return os.ErrExist + } + now := time.Now() + _, err := db.GetEngine(f.ctx).Insert(&FileMeta{ + FullPath: f.fullPath, + BlockSize: f.blockSize, + CreateTimestamp: timeToFileTimestamp(now), + ModifyTimestamp: timeToFileTimestamp(now), + }) + if err != nil { + return err + } + if _, err = f.loadMetaByPath(); err != nil { + return err + } + return nil +} + +func (f *file) truncate() error { + if f.metaID == 0 { + return os.ErrNotExist + } + return db.WithTx(func(ctx context.Context) error { + if _, err := db.GetEngine(ctx).Exec("UPDATE file_meta SET file_size = 0 WHERE id = ?", f.metaID); err != nil { + return err + } + if _, err := db.GetEngine(ctx).Delete(&FileData{MetaID: f.metaID}); err != nil { + return err + } + return nil + }, f.ctx) +} + +func (f *file) renameTo(newPath string) error { + if f.metaID == 0 { + return os.ErrNotExist + } + newPath = buildPath(newPath) + return db.WithTx(func(ctx context.Context) error { + if _, err := db.GetEngine(ctx).Exec("UPDATE file_meta SET full_path = ? WHERE id = ?", newPath, f.metaID); err != nil { + return err + } + return nil + }, f.ctx) +} + +func (f *file) delete() error { + if f.metaID == 0 { + return os.ErrNotExist + } + return db.WithTx(func(ctx context.Context) error { + if _, err := db.GetEngine(ctx).Delete(&FileMeta{ID: f.metaID}); err != nil { + return err + } + if _, err := db.GetEngine(ctx).Delete(&FileData{MetaID: f.metaID}); err != nil { + return err + } + return nil + }, f.ctx) +} + +func (f *file) size() (int64, error) { + if f.metaID == 0 { + return 0, os.ErrNotExist + } + fileMeta, err := findFileMetaById(f.ctx, f.metaID) + if err != nil { + return 0, err + } + return fileMeta.FileSize, nil +} + +func findFileMetaById(ctx context.Context, metaID int64) (*FileMeta, error) { + var fileMeta FileMeta + if ok, err := db.GetEngine(ctx).Where("id = ?", metaID).Get(&fileMeta); err != nil { + return nil, err + } else if ok { + return &fileMeta, nil + } + return nil, nil +} + +func buildPath(path string) string { + path = filepath.Clean(path) + path = strings.ReplaceAll(path, "\\", "/") + path = strings.TrimPrefix(path, "/") + return strconv.Itoa(strings.Count(path, "/")) + ":" + path +} + +func newDbFile(ctx context.Context, path string) (*file, error) { + path = buildPath(path) + f := &file{ctx: ctx, fullPath: path, blockSize: defaultFileBlockSize} + if _, err := f.loadMetaByPath(); err != nil { + return nil, err + } + return f, nil +} diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go new file mode 100644 index 0000000000000..9f231a7e15a3f --- /dev/null +++ b/models/dbfs/dbfs.go @@ -0,0 +1,74 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbfs + +import ( + "context" + "os" + + "code.gitea.io/gitea/models/db" +) + +type FileMeta struct { + ID int64 `xorm:"pk autoincr"` + FullPath string `xorm:"VARCHAR(500) UNIQUE NOT NULL"` + BlockSize int64 `xorm:"BIGINT NOT NULL"` + FileSize int64 `xorm:"BIGINT NOT NULL"` + CreateTimestamp int64 `xorm:"BIGINT NOT NULL"` + ModifyTimestamp int64 `xorm:"BIGINT NOT NULL"` +} + +type FileData struct { + ID int64 `xorm:"pk autoincr"` + Revision int64 `xorm:"BIGINT NOT NULL"` + MetaID int64 `xorm:"BIGINT index(meta_offset) NOT NULL"` + BlobOffset int64 `xorm:"BIGINT index(meta_offset) NOT NULL"` + BlobSize int64 `xorm:"BIGINT NOT NULL"` + BlobData []byte `xorm:"BLOB NOT NULL"` +} + +func init() { + db.RegisterModel(new(FileMeta)) + db.RegisterModel(new(FileData)) +} + +func OpenFile(ctx context.Context, name string, flag int) (File, error) { + f, err := newDbFile(ctx, name) + if err != nil { + return nil, err + } + err = f.open(flag) + if err != nil { + _ = f.Close() + return nil, err + } + return f, nil +} + +func Open(ctx context.Context, name string) (File, error) { + return OpenFile(ctx, name, os.O_RDONLY) +} + +func Create(ctx context.Context, name string) (File, error) { + return OpenFile(ctx, name, os.O_RDWR|os.O_CREATE|os.O_TRUNC) +} + +func Rename(ctx context.Context, oldPath, newPath string) error { + f, err := newDbFile(ctx, oldPath) + if err != nil { + return err + } + defer f.Close() + return f.renameTo(newPath) +} + +func Remove(ctx context.Context, name string) error { + f, err := newDbFile(ctx, name) + if err != nil { + return err + } + defer f.Close() + return f.delete() +} diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go new file mode 100644 index 0000000000000..2c3e0f8c645f6 --- /dev/null +++ b/models/dbfs/dbfs_test.go @@ -0,0 +1,154 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbfs + +import ( + "bufio" + "io" + "os" + "testing" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" + + "github.com/stretchr/testify/assert" + + _ "github.com/mattn/go-sqlite3" +) + +func changeDefaultFileBlockSize(n int64) (restore func()) { + old := defaultFileBlockSize + defaultFileBlockSize = n + return func() { + defaultFileBlockSize = old + } +} + +func TestDbfsBasic(t *testing.T) { + defer changeDefaultFileBlockSize(4)() + + assert.NoError(t, unittest.PrepareTestDatabase()) + + // test basic write/read + f, err := OpenFile(db.DefaultContext, "test.txt", os.O_RDWR|os.O_CREATE) + assert.NoError(t, err) + + n, err := f.Write([]byte("0123456789")) // blocks: 0123 4567 89 + assert.NoError(t, err) + assert.EqualValues(t, 10, n) + + _, err = f.Seek(0, io.SeekStart) + assert.NoError(t, err) + + buf, err := io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, 10, n) + assert.EqualValues(t, "0123456789", string(buf)) + + // write some new data + _, err = f.Seek(1, io.SeekStart) + assert.NoError(t, err) + _, err = f.Write([]byte("bcdefghi")) // blocks: 0bcd efgh i9 + assert.NoError(t, err) + + // read from offset + buf, err = io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, "9", string(buf)) + + // read all + _, err = f.Seek(0, io.SeekStart) + assert.NoError(t, err) + buf, err = io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, "0bcdefghi9", string(buf)) + + // write to new size + _, err = f.Seek(-1, io.SeekEnd) + assert.NoError(t, err) + _, err = f.Write([]byte("JKLMNOP")) // blocks: 0bcd efgh iJKL MNOP + assert.NoError(t, err) + _, err = f.Seek(0, io.SeekStart) + assert.NoError(t, err) + buf, err = io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, "0bcdefghiJKLMNOP", string(buf)) + + // write beyond EOF and fill with zero + _, err = f.Seek(5, io.SeekCurrent) + assert.NoError(t, err) + _, err = f.Write([]byte("xyzu")) // blocks: 0bcd efgh iJKL MNOP 0000 0xyz u + assert.NoError(t, err) + _, err = f.Seek(0, io.SeekStart) + assert.NoError(t, err) + buf, err = io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, "0bcdefghiJKLMNOP\x00\x00\x00\x00\x00xyzu", string(buf)) + + // write to the block with zeros + _, err = f.Seek(-6, io.SeekCurrent) + assert.NoError(t, err) + _, err = f.Write([]byte("ABCD")) // blocks: 0bcd efgh iJKL MNOP 000A BCDz u + assert.NoError(t, err) + _, err = f.Seek(0, io.SeekStart) + assert.NoError(t, err) + buf, err = io.ReadAll(f) + assert.NoError(t, err) + assert.EqualValues(t, "0bcdefghiJKLMNOP\x00\x00\x00ABCDzu", string(buf)) + + assert.NoError(t, f.Close()) + + // test rename + err = Rename(db.DefaultContext, "test.txt", "test2.txt") + assert.NoError(t, err) + + _, err = OpenFile(db.DefaultContext, "test.txt", os.O_RDONLY) + assert.Error(t, err) + + f, err = OpenFile(db.DefaultContext, "test2.txt", os.O_RDONLY) + assert.NoError(t, err) + assert.NoError(t, f.Close()) + + // test remove + err = Remove(db.DefaultContext, "test2.txt") + assert.NoError(t, err) + + _, err = OpenFile(db.DefaultContext, "test2.txt", os.O_RDONLY) + assert.Error(t, err) +} + +func TestDbfsReadWrite(t *testing.T) { + defer changeDefaultFileBlockSize(4)() + + assert.NoError(t, unittest.PrepareTestDatabase()) + + f1, err := OpenFile(db.DefaultContext, "test.log", os.O_RDWR|os.O_CREATE) + assert.NoError(t, err) + defer f1.Close() + + f2, err := OpenFile(db.DefaultContext, "test.log", os.O_RDONLY) + assert.NoError(t, err) + defer f2.Close() + + _, err = f1.Write([]byte("line 1\n")) + assert.NoError(t, err) + + f2r := bufio.NewReader(f2) + + line, err := f2r.ReadString('\n') + assert.NoError(t, err) + assert.EqualValues(t, "line 1\n", line) + _, err = f2r.ReadString('\n') + assert.ErrorIs(t, err, io.EOF) + + _, err = f1.Write([]byte("line 2\n")) + assert.NoError(t, err) + + line, err = f2r.ReadString('\n') + assert.NoError(t, err) + assert.EqualValues(t, "line 2\n", line) + _, err = f2r.ReadString('\n') + assert.ErrorIs(t, err, io.EOF) +} diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go new file mode 100644 index 0000000000000..9d63807f8ef01 --- /dev/null +++ b/models/dbfs/main_test.go @@ -0,0 +1,28 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbfs + +import ( + "path/filepath" + "testing" + + "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/setting" + + _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/repo" + _ "code.gitea.io/gitea/models/user" +) + +func init() { + setting.SetCustomPathAndConf("", "", "") + setting.LoadForTest() +} + +func TestMain(m *testing.M) { + unittest.MainTest(m, &unittest.TestOptions{ + GiteaRootPath: filepath.Join("..", ".."), + }) +} diff --git a/modules/bots/bots.go b/modules/bots/bots.go index a83732e06e396..6880a6e73d804 100644 --- a/modules/bots/bots.go +++ b/modules/bots/bots.go @@ -25,7 +25,7 @@ func DetectWorkflows(commit *git.Commit, event webhook.HookEventType) (git.Entri return nil, nil, err } - entries, err := tree.ListEntriesRecursive() + entries, err := tree.ListEntriesRecursiveFast() if err != nil { return nil, nil, err } diff --git a/routers/web/dev/termdemo.go b/routers/web/dev/termdemo.go new file mode 100644 index 0000000000000..d2408725e4ef4 --- /dev/null +++ b/routers/web/dev/termdemo.go @@ -0,0 +1,51 @@ +package dev + +import ( + "fmt" + "io" + "net/http" + "os" + "sync" + "time" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/dbfs" + "code.gitea.io/gitea/modules/context" +) + +var demoLogWriterOnce sync.Once + +func TermDemo(ctx *context.Context) { + demoLogWriterOnce.Do(func() { + go func() { + f, _ := dbfs.OpenFile(db.DefaultContext, "termdemo.log", os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_APPEND) + count := 0 + for { + count++ + s := fmt.Sprintf("\x1B[1;3;31mDemo Log\x1B[0m, count=%d\r\n", count) + _, _ = f.Write([]byte(s)) + time.Sleep(time.Second) + } + }() + }) + + cmd := ctx.FormString("cmd") + if cmd == "tail" { + offset := ctx.FormInt64("offset") + f, _ := dbfs.OpenFile(db.DefaultContext, "termdemo.log", os.O_RDONLY) + if offset == -1 { + _, _ = f.Seek(0, io.SeekEnd) + } else { + _, _ = f.Seek(offset, io.SeekStart) + } + buf, _ := io.ReadAll(f) + offset, _ = f.Seek(0, io.SeekCurrent) + ctx.JSON(http.StatusOK, map[string]interface{}{ + "offset": offset, + "content": string(buf), + }) + return + } + + ctx.HTML(http.StatusOK, "dev/termdemo") +} diff --git a/routers/web/web.go b/routers/web/web.go index a1f601b9c44e4..1b2b53e5e22f6 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -28,6 +28,7 @@ import ( "code.gitea.io/gitea/modules/web/routing" "code.gitea.io/gitea/routers/web/admin" "code.gitea.io/gitea/routers/web/auth" + "code.gitea.io/gitea/routers/web/dev" "code.gitea.io/gitea/routers/web/events" "code.gitea.io/gitea/routers/web/explore" "code.gitea.io/gitea/routers/web/feed" @@ -659,6 +660,10 @@ func RegisterRoutes(m *web.Route) { m.Post("/{username}", reqSignIn, context_service.UserAssignmentWeb(), user.Action) + if !setting.IsProd { + m.Any("/dev/termdemo", dev.TermDemo) + } + reqRepoAdmin := context.RequireRepoAdmin() reqRepoCodeWriter := context.RequireRepoWriter(unit.TypeCode) canEnableEditor := context.CanEnableEditor() diff --git a/templates/dev/termdemo.tmpl b/templates/dev/termdemo.tmpl new file mode 100644 index 0000000000000..60b314b4ed5a6 --- /dev/null +++ b/templates/dev/termdemo.tmpl @@ -0,0 +1,27 @@ + + + + + + + + +
    + + + + + From 0e79fc556ac3b2931eccb7cfc8cd6a249e134dce Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 13 Aug 2022 11:48:14 +0800 Subject: [PATCH 008/408] chore(router): Add grpc and grep-web api Using connect-go package https://github.com/bufbuild/connect-go Signed-off-by: Bo-Yi Wu --- go.mod | 6 +- modules/graceful/server_http.go | 5 +- routers/api/bots/bots.go | 239 ++++++-------------------------- routers/api/bots/process.go | 48 +++++++ routers/api/bots/socket.go | 206 +++++++++++++++++++++++++++ routers/init.go | 2 +- 6 files changed, 303 insertions(+), 203 deletions(-) create mode 100644 routers/api/bots/process.go create mode 100644 routers/api/bots/socket.go diff --git a/go.mod b/go.mod index 5e6529e0e4416..2e6d50f7d286c 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,8 @@ go 1.18 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 + gitea.com/gitea/proto v0.0.0-20220802024851-7ee5947f928a + gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 gitea.com/go-chi/cache v0.2.0 @@ -54,6 +56,7 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/feeds v1.1.1 github.com/gorilla/sessions v1.2.1 + github.com/gorilla/websocket v1.4.2 github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/golang-lru v0.5.4 github.com/huandu/xstrings v1.3.2 @@ -71,6 +74,7 @@ require ( github.com/microcosm-cc/bluemonday v1.0.20 github.com/minio/minio-go/v7 v7.0.39 github.com/msteinert/pam v1.1.0 + github.com/nektos/act v0.2.24 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/niklasfasching/go-org v1.6.5 github.com/oliamb/cutter v0.2.2 @@ -198,7 +202,6 @@ require ( github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/securecookie v1.1.1 // indirect - github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect @@ -233,7 +236,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect github.com/mschoch/smat v0.2.0 // indirect - github.com/nektos/act v0.2.26 // indirect github.com/nwaples/rardecode v1.1.3 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect diff --git a/modules/graceful/server_http.go b/modules/graceful/server_http.go index 8ab2bdf41ff9a..c1b9cf0b63f1a 100644 --- a/modules/graceful/server_http.go +++ b/modules/graceful/server_http.go @@ -9,6 +9,9 @@ import ( "crypto/tls" "net" "net/http" + + "golang.org/x/net/http2" + "golang.org/x/net/http2/h2c" ) func newHTTPServer(network, address, name string, handler http.Handler) (*Server, ServeFunction) { @@ -17,7 +20,7 @@ func newHTTPServer(network, address, name string, handler http.Handler) (*Server ReadTimeout: DefaultReadTimeOut, WriteTimeout: DefaultWriteTimeOut, MaxHeaderBytes: DefaultMaxHeaderBytes, - Handler: handler, + Handler: h2c.NewHandler(handler, &http2.Server{}), BaseContext: func(net.Listener) context.Context { return GetManager().HammerContext() }, } server.OnShutdown = func() { diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 89d445c6f1d0c..205749a4a247c 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -5,207 +5,48 @@ package bots import ( - "encoding/json" - "errors" - "fmt" - "net/http" - "strings" - "time" - - bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" + "gitea.com/gitea/proto/gen/proto/v1/v1connect" - "github.com/gorilla/websocket" -) - -func Routes() *web.Route { - r := web.NewRoute() - r.Get("/", Serve) - return r -} - -var upgrader = websocket.Upgrader{ - ReadBufferSize: 4096, - WriteBufferSize: 4096, - EnableCompression: true, - CheckOrigin: func(r *http.Request) bool { - return true - }, -} - -var pongWait = 60 * time.Second - -type Message struct { - Version int // - Type int // message type, 1 register 2 error 3 task 4 no task - RunnerUUID string // runner uuid - BuildUUID string // build uuid - ErrCode int // error code - ErrContent string // errors message - EventName string - EventPayload string - JobID string // only run the special job, empty means run all the jobs -} - -const ( - version1 = 1 + "github.com/bufbuild/connect-go" + grpchealth "github.com/bufbuild/connect-grpchealth-go" + grpcreflect "github.com/bufbuild/connect-grpcreflect-go" ) -const ( - MsgTypeRegister = iota + 1 // register - MsgTypeError // error - MsgTypeRequestBuild // request build task - MsgTypeIdle // no task - MsgTypeBuildResult // build result - MsgTypeBuildJobResult // build job result -) - -func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error { - switch msg.Type { - case MsgTypeRegister: - log.Info("websocket[%s] registered", r.RemoteAddr) - runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) - if err != nil { - if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { - return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) - } - err = c.WriteMessage(mt, message) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } else { - fmt.Printf("-----%v\n", runner) - // TODO: handle read message - err = c.WriteMessage(mt, message) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - case MsgTypeRequestBuild: - // TODO: find new task and send to client - build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) - if err != nil { - return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) - } - var returnMsg *Message - if build == nil { - time.Sleep(3 * time.Second) - returnMsg = &Message{ - Version: version1, - Type: MsgTypeIdle, - RunnerUUID: msg.RunnerUUID, - } - } else { - returnMsg = &Message{ - Version: version1, - Type: MsgTypeRequestBuild, - RunnerUUID: msg.RunnerUUID, - BuildUUID: build.UUID, - EventName: build.Event.Event(), - EventPayload: build.EventPayload, - } - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } - err = c.WriteMessage(mt, bs) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - case MsgTypeBuildResult: - log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg) - build, err := bots_model.GetBuildByUUID(msg.BuildUUID) - if err != nil { - return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err) - } - cols := []string{"status", "end_time"} - if msg.ErrCode == 0 { - build.Status = bots_model.BuildFinished - } else { - build.Status = bots_model.BuildFailed - } - build.EndTime = timeutil.TimeStampNow() - if err := bots_model.UpdateBuild(build, cols...); err != nil { - log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err) - } - default: - returnMsg := Message{ - Version: version1, - Type: MsgTypeError, - ErrCode: 1, - ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } - err = c.WriteMessage(mt, bs) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - return nil -} - -func Serve(w http.ResponseWriter, r *http.Request) { - log.Trace("websocket init request begin from %s", r.RemoteAddr) - c, err := upgrader.Upgrade(w, r, nil) - if err != nil { - log.Error("websocket upgrade failed: %v", err) - return - } - defer c.Close() - log.Trace("websocket upgrade from %s successfully", r.RemoteAddr) - - c.SetReadDeadline(time.Now().Add(pongWait)) - c.SetPongHandler(func(string) error { c.SetReadDeadline(time.Now().Add(pongWait)); return nil }) - - for { - // read message from client - mt, message, err := c.ReadMessage() - if err != nil { - if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) || - websocket.IsCloseError(err, websocket.CloseNormalClosure) { - c.Close() - } else if !strings.Contains(err.Error(), "i/o timeout") { - log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err) - } - break - } - - log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message)) - - // read message first - var msg Message - if err = json.Unmarshal(message, &msg); err != nil { - log.Error("websocket[%s] unmarshal failed: %#v", r.RemoteAddr, err) - break - } - - switch msg.Version { - case 1: - if err := handleVersion1(r, c, mt, message, &msg); err != nil { - log.Error("%v", err) - } - default: - returnMsg := Message{ - Version: 1, - Type: MsgTypeError, - ErrCode: 1, - ErrContent: "version is not supported", - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } else { - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - } - } +func Routes(r *web.Route) { + compress1KB := connect.WithCompressMinBytes(1024) + + service := &RunnerService{} + path, handler := v1connect.NewBuildServiceHandler( + service, + compress1KB, + ) + + // grpcV1 + grpcPath, gHandler := grpcreflect.NewHandlerV1( + grpcreflect.NewStaticReflector(v1connect.BuildServiceName), + compress1KB, + ) + + // grpcV1Alpha + grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( + grpcreflect.NewStaticReflector(v1connect.BuildServiceName), + compress1KB, + ) + + // grpcHealthCheck + grpcHealthPath, gHealthHandler := grpchealth.NewHandler( + grpchealth.NewStaticChecker(v1connect.BuildServiceName), + compress1KB, + ) + + // socket connection + r.Get("/socket", socketServe) + // restful connection + r.Post(path+"{name}", giteaHandler(handler)) + // grpc connection + r.Post(grpcPath+"{name}", giteaHandler(gHandler)) + r.Post(grpcAlphaPath+"{name}", giteaHandler(gAlphaHandler)) + // healthy check connection + r.Post(grpcHealthPath+"{name}", giteaHandler(gHealthHandler)) } diff --git a/routers/api/bots/process.go b/routers/api/bots/process.go new file mode 100644 index 0000000000000..6abb1f439942b --- /dev/null +++ b/routers/api/bots/process.go @@ -0,0 +1,48 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + "net/http" + + "code.gitea.io/gitea/modules/log" + v1 "gitea.com/gitea/proto/gen/proto/v1" + + "github.com/bufbuild/connect-go" +) + +type RunnerService struct{} + +func (s *RunnerService) Connect( + ctx context.Context, + req *connect.Request[v1.ConnectRequest], +) (*connect.Response[v1.ConnectResponse], error) { + log.Info("Request headers: %v", req.Header()) + res := connect.NewResponse(&v1.ConnectResponse{ + JobId: 100, + }) + res.Header().Set("Gitea-Version", "v1") + return res, nil +} + +func (s *RunnerService) Accept( + ctx context.Context, + req *connect.Request[v1.AcceptRequest], +) (*connect.Response[v1.AcceptResponse], error) { + log.Info("Request headers: %v", req.Header()) + res := connect.NewResponse(&v1.AcceptResponse{ + JobId: 100, + }) + res.Header().Set("Gitea-Version", "v1") + return res, nil +} + +func giteaHandler(h http.Handler) http.HandlerFunc { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + log.Info("Got connection: %v", r.Proto) + h.ServeHTTP(w, r) + }) +} diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go new file mode 100644 index 0000000000000..7d508192d2bce --- /dev/null +++ b/routers/api/bots/socket.go @@ -0,0 +1,206 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "errors" + "fmt" + "net/http" + "strings" + "time" + + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" + + "github.com/gorilla/websocket" +) + +var upgrader = websocket.Upgrader{ + ReadBufferSize: 4096, + WriteBufferSize: 4096, + EnableCompression: true, + CheckOrigin: func(r *http.Request) bool { + return true + }, +} + +var pongWait = 60 * time.Second + +type Message struct { + Version int // + Type int // message type, 1 register 2 error 3 task 4 no task + RunnerUUID string // runner uuid + BuildUUID string // build uuid + ErrCode int // error code + ErrContent string // errors message + EventName string + EventPayload string + JobID string // only run the special job, empty means run all the jobs +} + +const ( + version1 = 1 +) + +const ( + MsgTypeRegister = iota + 1 // register + MsgTypeError // error + MsgTypeRequestBuild // request build task + MsgTypeIdle // no task + MsgTypeBuildResult // build result + MsgTypeBuildJobResult // build job result +) + +func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error { + switch msg.Type { + case MsgTypeRegister: + log.Info("websocket[%s] registered", r.RemoteAddr) + runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) + if err != nil { + if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { + return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) + } + err = c.WriteMessage(mt, message) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } else { + fmt.Printf("-----%v\n", runner) + // TODO: handle read message + err = c.WriteMessage(mt, message) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + case MsgTypeRequestBuild: + // TODO: find new task and send to client + build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) + if err != nil { + return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) + } + var returnMsg *Message + if build == nil { + time.Sleep(3 * time.Second) + returnMsg = &Message{ + Version: version1, + Type: MsgTypeIdle, + RunnerUUID: msg.RunnerUUID, + } + } else { + returnMsg = &Message{ + Version: version1, + Type: MsgTypeRequestBuild, + RunnerUUID: msg.RunnerUUID, + BuildUUID: build.UUID, + EventName: build.Event.Event(), + EventPayload: build.EventPayload, + } + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + } + err = c.WriteMessage(mt, bs) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + case MsgTypeBuildResult: + log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg) + build, err := bots_model.GetBuildByUUID(msg.BuildUUID) + if err != nil { + return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err) + } + cols := []string{"status", "end_time"} + if msg.ErrCode == 0 { + build.Status = bots_model.BuildFinished + } else { + build.Status = bots_model.BuildFailed + } + build.EndTime = timeutil.TimeStampNow() + if err := bots_model.UpdateBuild(build, cols...); err != nil { + log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err) + } + default: + returnMsg := Message{ + Version: version1, + Type: MsgTypeError, + ErrCode: 1, + ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + } + err = c.WriteMessage(mt, bs) + if err != nil { + return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + return nil +} + +func socketServe(w http.ResponseWriter, r *http.Request) { + log.Trace("websocket init request begin from %s", r.RemoteAddr) + c, err := upgrader.Upgrade(w, r, nil) + if err != nil { + log.Error("websocket upgrade failed: %v", err) + return + } + defer c.Close() + log.Trace("websocket upgrade from %s successfully", r.RemoteAddr) + + _ = c.SetReadDeadline(time.Now().Add(pongWait)) + c.SetPongHandler(func(string) error { + return c.SetReadDeadline(time.Now().Add(pongWait)) + }) + + for { + // read message from client + mt, message, err := c.ReadMessage() + if err != nil { + if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) || + websocket.IsCloseError(err, websocket.CloseNormalClosure) { + c.Close() + } else if !strings.Contains(err.Error(), "i/o timeout") { + log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err) + } + break + } + + log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message)) + + // read message first + var msg Message + if err = json.Unmarshal(message, &msg); err != nil { + log.Error("websocket[%s] unmarshal failed: %#v", r.RemoteAddr, err) + break + } + + switch msg.Version { + case 1: + if err := handleVersion1(r, c, mt, message, &msg); err != nil { + log.Error("%v", err) + } + default: + returnMsg := Message{ + Version: 1, + Type: MsgTypeError, + ErrCode: 1, + ErrContent: "version is not supported", + } + bs, err := json.Marshal(&returnMsg) + if err != nil { + log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) + } else { + err = c.WriteMessage(mt, bs) + if err != nil { + log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) + } + } + } + } +} diff --git a/routers/init.go b/routers/init.go index 80c44bf61b7f8..aef71792f5af3 100644 --- a/routers/init.go +++ b/routers/init.go @@ -198,6 +198,6 @@ func NormalRoutes(ctx context.Context) *web.Route { // This implements the OCI API (Note this is not preceded by /api but is instead /v2) r.Mount("/v2", packages_router.ContainerRoutes(ctx)) } - r.Mount("/api/actions", bots_router.Routes()) + bots_router.Routes(r) return r } From ef3a74a1ba8b6c6991014636c2ba33d331d810e8 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 13 Aug 2022 21:41:31 +0800 Subject: [PATCH 009/408] chore(proto): Add ping service Signed-off-by: Bo-Yi Wu --- go.mod | 2 +- routers/api/bots/bots.go | 42 ++------------------ routers/api/bots/ping.go | 67 ++++++++++++++++++++++++++++++++ routers/api/bots/process.go | 32 +-------------- routers/api/bots/runner.go | 77 +++++++++++++++++++++++++++++++++++++ 5 files changed, 150 insertions(+), 70 deletions(-) create mode 100644 routers/api/bots/ping.go create mode 100644 routers/api/bots/runner.go diff --git a/go.mod b/go.mod index 2e6d50f7d286c..33d7858bf763b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 - gitea.com/gitea/proto v0.0.0-20220802024851-7ee5947f928a + gitea.com/gitea/proto v0.0.0-20220813120843-ce4b5dd68c1f gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 205749a4a247c..0584cb86bd018 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -6,47 +6,13 @@ package bots import ( "code.gitea.io/gitea/modules/web" - "gitea.com/gitea/proto/gen/proto/v1/v1connect" - - "github.com/bufbuild/connect-go" - grpchealth "github.com/bufbuild/connect-grpchealth-go" - grpcreflect "github.com/bufbuild/connect-grpcreflect-go" ) func Routes(r *web.Route) { - compress1KB := connect.WithCompressMinBytes(1024) - - service := &RunnerService{} - path, handler := v1connect.NewBuildServiceHandler( - service, - compress1KB, - ) - - // grpcV1 - grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(v1connect.BuildServiceName), - compress1KB, - ) - - // grpcV1Alpha - grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(v1connect.BuildServiceName), - compress1KB, - ) - - // grpcHealthCheck - grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker(v1connect.BuildServiceName), - compress1KB, - ) - // socket connection r.Get("/socket", socketServe) - // restful connection - r.Post(path+"{name}", giteaHandler(handler)) - // grpc connection - r.Post(grpcPath+"{name}", giteaHandler(gHandler)) - r.Post(grpcAlphaPath+"{name}", giteaHandler(gAlphaHandler)) - // healthy check connection - r.Post(grpcHealthPath+"{name}", giteaHandler(gHealthHandler)) + // runner service + runnerServiceRoute(r) + // ping service + pingServiceRoute(r) } diff --git a/routers/api/bots/ping.go b/routers/api/bots/ping.go new file mode 100644 index 0000000000000..b162630eb568b --- /dev/null +++ b/routers/api/bots/ping.go @@ -0,0 +1,67 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + "fmt" + "log" + + "code.gitea.io/gitea/modules/web" + v1 "gitea.com/gitea/proto/gen/proto/v1" + "gitea.com/gitea/proto/gen/proto/v1/v1connect" + + "github.com/bufbuild/connect-go" + grpchealth "github.com/bufbuild/connect-grpchealth-go" + grpcreflect "github.com/bufbuild/connect-grpcreflect-go" +) + +type PingService struct{} + +func (s *PingService) Ping( + ctx context.Context, + req *connect.Request[v1.PingRequest], +) (*connect.Response[v1.PingResponse], error) { + log.Println("Content-Type: ", req.Header().Get("Content-Type")) + log.Println("User-Agent: ", req.Header().Get("User-Agent")) + res := connect.NewResponse(&v1.PingResponse{ + Data: fmt.Sprintf("Hello, %s!", req.Msg.Data), + }) + res.Header().Set("Gitea-Version", "v1") + return res, nil +} + +func pingServiceRoute(r *web.Route) { + compress1KB := connect.WithCompressMinBytes(1024) + + pingService := &PingService{} + connectPath, connecthandler := v1connect.NewPingServiceHandler( + pingService, + compress1KB, + ) + + // grpcV1 + grpcPath, gHandler := grpcreflect.NewHandlerV1( + grpcreflect.NewStaticReflector(v1connect.PingServiceName), + compress1KB, + ) + + // grpcV1Alpha + grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( + grpcreflect.NewStaticReflector(v1connect.PingServiceName), + compress1KB, + ) + + // grpcHealthCheck + grpcHealthPath, gHealthHandler := grpchealth.NewHandler( + grpchealth.NewStaticChecker(v1connect.PingServiceName), + compress1KB, + ) + + r.Post(connectPath+"{name}", grpcHandler(connecthandler)) + r.Post(grpcPath+"{name}", grpcHandler(gHandler)) + r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) + r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) +} diff --git a/routers/api/bots/process.go b/routers/api/bots/process.go index 6abb1f439942b..53016e5f3433f 100644 --- a/routers/api/bots/process.go +++ b/routers/api/bots/process.go @@ -5,42 +5,12 @@ package bots import ( - "context" "net/http" "code.gitea.io/gitea/modules/log" - v1 "gitea.com/gitea/proto/gen/proto/v1" - - "github.com/bufbuild/connect-go" ) -type RunnerService struct{} - -func (s *RunnerService) Connect( - ctx context.Context, - req *connect.Request[v1.ConnectRequest], -) (*connect.Response[v1.ConnectResponse], error) { - log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&v1.ConnectResponse{ - JobId: 100, - }) - res.Header().Set("Gitea-Version", "v1") - return res, nil -} - -func (s *RunnerService) Accept( - ctx context.Context, - req *connect.Request[v1.AcceptRequest], -) (*connect.Response[v1.AcceptResponse], error) { - log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&v1.AcceptResponse{ - JobId: 100, - }) - res.Header().Set("Gitea-Version", "v1") - return res, nil -} - -func giteaHandler(h http.Handler) http.HandlerFunc { +func grpcHandler(h http.Handler) http.HandlerFunc { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { log.Info("Got connection: %v", r.Proto) h.ServeHTTP(w, r) diff --git a/routers/api/bots/runner.go b/routers/api/bots/runner.go new file mode 100644 index 0000000000000..4b0a7a6c9bdbe --- /dev/null +++ b/routers/api/bots/runner.go @@ -0,0 +1,77 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "context" + + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/web" + v1 "gitea.com/gitea/proto/gen/proto/v1" + "gitea.com/gitea/proto/gen/proto/v1/v1connect" + + "github.com/bufbuild/connect-go" + grpchealth "github.com/bufbuild/connect-grpchealth-go" + grpcreflect "github.com/bufbuild/connect-grpcreflect-go" +) + +type RunnerService struct{} + +func (s *RunnerService) Connect( + ctx context.Context, + req *connect.Request[v1.ConnectRequest], +) (*connect.Response[v1.ConnectResponse], error) { + log.Info("Request headers: %v", req.Header()) + res := connect.NewResponse(&v1.ConnectResponse{ + JobId: 100, + }) + res.Header().Set("Gitea-Version", "v1") + return res, nil +} + +func (s *RunnerService) Accept( + ctx context.Context, + req *connect.Request[v1.AcceptRequest], +) (*connect.Response[v1.AcceptResponse], error) { + log.Info("Request headers: %v", req.Header()) + res := connect.NewResponse(&v1.AcceptResponse{ + JobId: 100, + }) + res.Header().Set("Gitea-Version", "v1") + return res, nil +} + +func runnerServiceRoute(r *web.Route) { + compress1KB := connect.WithCompressMinBytes(1024) + + runnerService := &RunnerService{} + connectPath, connecthandler := v1connect.NewRunnerServiceHandler( + runnerService, + compress1KB, + ) + + // grpcV1 + grpcPath, gHandler := grpcreflect.NewHandlerV1( + grpcreflect.NewStaticReflector(v1connect.RunnerServiceName), + compress1KB, + ) + + // grpcV1Alpha + grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( + grpcreflect.NewStaticReflector(v1connect.RunnerServiceName), + compress1KB, + ) + + // grpcHealthCheck + grpcHealthPath, gHealthHandler := grpchealth.NewHandler( + grpchealth.NewStaticChecker(v1connect.RunnerServiceName), + compress1KB, + ) + + r.Post(connectPath+"{name}", grpcHandler(connecthandler)) + r.Post(grpcPath+"{name}", grpcHandler(gHandler)) + r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) + r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) +} From b84aa84a0f5f03837639a81823f05da6cfd78fa3 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 14 Aug 2022 14:55:26 +0800 Subject: [PATCH 010/408] Fix template --- templates/admin/runner/edit.tmpl | 82 +++++++++++++-------------- templates/admin/runner/list.tmpl | 18 +++--- templates/admin/runner/new.tmpl | 36 ++++++------ templates/repo/builds/build_list.tmpl | 4 +- templates/repo/builds/list.tmpl | 4 +- templates/repo/builds/openclose.tmpl | 4 +- templates/repo/header.tmpl | 2 +- templates/repo/settings/options.tmpl | 6 +- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl index 1ee46f3077a3b..29dcaa127af28 100644 --- a/templates/admin/runner/edit.tmpl +++ b/templates/admin/runner/edit.tmpl @@ -4,25 +4,25 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "admin.users.edit_account"}} + {{.locale.Tr "admin.users.edit_account"}}

    {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}}
    - +
    - +
    -
    {{.i18n.Tr "admin.users.local"}}
    +
    {{.locale.Tr "admin.users.local"}}
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    -
    {{.i18n.Tr "admin.users.local"}}
    +
    {{.locale.Tr "admin.users.local"}}
    {{range .Sources}}
    {{.Name}}
    {{end}} @@ -31,25 +31,25 @@
    - +
    {{if .User.Visibility.IsPublic}}{{end}} {{if .User.Visibility.IsLimited}}{{end}} {{if .User.Visibility.IsPrivate}}{{end}}
    - {{if .User.Visibility.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}} - {{if .User.Visibility.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}} - {{if .User.Visibility.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}} + {{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} + {{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} + {{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    {{range $mode := .AllowedUserVisibilityModes}} {{if $mode.IsPublic}} -
    {{$.i18n.Tr "settings.visibility.public"}}
    +
    {{$.locale.Tr "settings.visibility.public"}}
    {{else if $mode.IsLimited}} -
    {{$.i18n.Tr "settings.visibility.limited"}}
    +
    {{$.locale.Tr "settings.visibility.limited"}}
    {{else if $mode.IsPrivate}} -
    {{$.i18n.Tr "settings.visibility.private"}}
    +
    {{$.locale.Tr "settings.visibility.private"}}
    {{end}} {{end}}
    @@ -57,81 +57,81 @@
    - +
    - +
    - +
    - + -

    {{.i18n.Tr "admin.users.password_helper"}}

    +

    {{.locale.Tr "admin.users.password_helper"}}

    - +
    - +
    - + -

    {{.i18n.Tr "admin.users.max_repo_creation_desc"}}

    +

    {{.locale.Tr "admin.users.max_repo_creation_desc"}}

    - +
    - +
    - +
    - +
    -
    - +
    +
    - +
    {{if not .DisableRegularOrgCreation}}
    - +
    @@ -141,7 +141,7 @@
    - +
    @@ -150,14 +150,14 @@
    - -
    {{.i18n.Tr "admin.users.delete_account"}}
    + +
    {{.locale.Tr "admin.users.delete_account"}}

    - {{.i18n.Tr "settings.avatar"}} + {{.locale.Tr "settings.avatar"}}

    @@ -166,11 +166,11 @@
    - +
    - +
    {{end}} @@ -178,18 +178,18 @@
    - +
    - +
    - - {{$.i18n.Tr "settings.delete_current_avatar"}} + + {{$.locale.Tr "settings.delete_current_avatar"}}
    @@ -199,10 +199,10 @@
    {{svg "octicon-trash"}} - {{.i18n.Tr "settings.delete_account_title"}} + {{.locale.Tr "settings.delete_account_title"}}
    -

    {{.i18n.Tr "settings.delete_account_desc"}}

    +

    {{.locale.Tr "settings.delete_account_desc"}}

    {{template "base/delete_modal_actions" .}}
    diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl index 04160a08e3c73..9500613aba90c 100644 --- a/templates/admin/runner/list.tmpl +++ b/templates/admin/runner/list.tmpl @@ -4,17 +4,17 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "admin.runners.runner_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) + {{.locale.Tr "admin.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
    - {{.i18n.Tr "admin.runners.new"}} + {{.locale.Tr "admin.runners.new"}}

    - - + +
    @@ -24,12 +24,12 @@ ID - {{.i18n.Tr "admin.runners.name"}} + {{.locale.Tr "admin.runners.name"}} - {{.i18n.Tr "admin.runners.own_type"}} - {{.i18n.Tr "admin.runners.uuid"}} - {{.i18n.Tr "admin.runners.created"}} - {{.i18n.Tr "admin.runners.edit"}} + {{.locale.Tr "admin.runners.own_type"}} + {{.locale.Tr "admin.runners.uuid"}} + {{.locale.Tr "admin.runners.created"}} + {{.locale.Tr "admin.runners.edit"}} diff --git a/templates/admin/runner/new.tmpl b/templates/admin/runner/new.tmpl index 6e3861fa50269..b8fd8c0ad1540 100644 --- a/templates/admin/runner/new.tmpl +++ b/templates/admin/runner/new.tmpl @@ -4,7 +4,7 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "admin.users.new_account"}} + {{.locale.Tr "admin.users.new_account"}}

    @@ -12,13 +12,13 @@ {{.CsrfTokenHtml}}
    - +
    -
    {{.i18n.Tr "admin.users.local"}}
    +
    {{.locale.Tr "admin.users.local"}}
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    -
    {{.i18n.Tr "admin.users.local"}}
    +
    {{.locale.Tr "admin.users.local"}}
    {{range .Sources}}
    {{.Name}}
    {{end}} @@ -27,23 +27,23 @@
    - +
    - {{if .DefaultUserVisibilityMode.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}} - {{if .DefaultUserVisibilityMode.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}} - {{if .DefaultUserVisibilityMode.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}} + {{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} + {{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} + {{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    {{range $mode := .AllowedUserVisibilityModes}} {{if $mode.IsPublic}} -
    {{$.i18n.Tr "settings.visibility.public"}}
    +
    {{$.locale.Tr "settings.visibility.public"}}
    {{else if $mode.IsLimited}} -
    {{$.i18n.Tr "settings.visibility.limited"}}
    +
    {{$.locale.Tr "settings.visibility.limited"}}
    {{else if $mode.IsPrivate}} -
    {{$.i18n.Tr "settings.visibility.private"}}
    +
    {{$.locale.Tr "settings.visibility.private"}}
    {{end}} {{end}}
    @@ -51,25 +51,25 @@
    - +
    - +
    - +
    - +
    - +
    @@ -78,14 +78,14 @@ {{if .CanSendEmail}}
    - +
    {{end}}
    - +
    diff --git a/templates/repo/builds/build_list.tmpl b/templates/repo/builds/build_list.tmpl index 84d3a785e6f9e..20c2c7561d06c 100644 --- a/templates/repo/builds/build_list.tmpl +++ b/templates/repo/builds/build_list.tmpl @@ -15,8 +15,8 @@ #{{.Index}} {{.Title}} - {{ $timeStr := TimeSinceUnix .Updated $.i18n.Lang }} - {{$.i18n.Tr "repo.builds.opened_by" $timeStr (.TriggerUser.GetDisplayName | Escape) | Safe}} + {{ $timeStr := TimeSinceUnix .Updated $.locale }} + {{$.locale.Tr "repo.builds.opened_by" $timeStr (.TriggerUser.GetDisplayName | Escape) | Safe}}
    diff --git a/templates/repo/builds/list.tmpl b/templates/repo/builds/list.tmpl index 7692536e7b2ea..04fa020e0029b 100644 --- a/templates/repo/builds/list.tmpl +++ b/templates/repo/builds/list.tmpl @@ -21,9 +21,9 @@ {{if not .Repository.IsArchived}} {{if .IsShowClosed}} -
    {{.i18n.Tr "repo.issues.action_open"}}
    +
    {{.locale.Tr "repo.issues.action_open"}}
    {{else}} -
    {{.i18n.Tr "repo.issues.action_close"}}
    +
    {{.locale.Tr "repo.issues.action_close"}}
    {{end}} {{end}}
    diff --git a/templates/repo/builds/openclose.tmpl b/templates/repo/builds/openclose.tmpl index aa8c621c01796..c22254232ebb9 100644 --- a/templates/repo/builds/openclose.tmpl +++ b/templates/repo/builds/openclose.tmpl @@ -1,10 +1,10 @@
    {{svg "octicon-issue-opened" 16 "mr-3"}} - {{.i18n.Tr "repo.issues.open_tab" .Repository.NumOpenBuilds}} + {{.locale.Tr "repo.issues.open_tab" .Repository.NumOpenBuilds}} {{svg "octicon-issue-closed" 16 "mr-3"}} - {{.i18n.Tr "repo.issues.close_tab" .Repository.NumClosedBuilds}} + {{.locale.Tr "repo.issues.close_tab" .Repository.NumClosedBuilds}}
    diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index e166acae1e528..16df2559521ce 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -185,7 +185,7 @@ {{ if and (not .UnitBuildsGlobalDisabled) (.Permission.CanRead $.UnitTypeBuilds)}} - {{svg "octicon-git-builds"}} {{.i18n.Tr "repo.builds"}} + {{svg "octicon-git-builds"}} {{.locale.Tr "repo.builds"}} {{if .Repository.NumOpenBuilds}} {{CountFmt .Repository.NumOpenBuilds}} {{end}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index d515f2414160d..eb15717df330e 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -422,14 +422,14 @@ {{$isBuildsEnabled := .Repository.UnitEnabled $.UnitTypeBuilds}}
    - + {{if .UnitTypeBuilds.UnitGlobalDisabled}} -
    +
    {{else}}
    {{end}} - +
    From 257ba77e8d1541f128e60ad4f08fd30deddd3dbf Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Wed, 17 Aug 2022 15:01:10 +0800 Subject: [PATCH 011/408] chore(proto): update import path Signed-off-by: GiteaBot --- go.mod | 7 +- go.sum | 592 ++++++++++++++++++++++++++++++++++++- routers/api/bots/ping.go | 25 +- routers/api/bots/runner.go | 33 ++- 4 files changed, 627 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 33d7858bf763b..77de9fd4eeaf1 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,8 @@ go 1.18 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 - gitea.com/gitea/proto v0.0.0-20220813120843-ce4b5dd68c1f - gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 + gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41 gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -19,6 +18,9 @@ require ( github.com/PuerkitoBio/goquery v1.8.0 github.com/alecthomas/chroma/v2 v2.3.0 github.com/blevesearch/bleve/v2 v2.3.4 + github.com/bufbuild/connect-go v1.0.0 + github.com/bufbuild/connect-grpchealth-go v1.0.0 + github.com/bufbuild/connect-grpcreflect-go v1.0.0 github.com/buildkite/terminal-to-html/v3 v3.7.0 github.com/caddyserver/certmagic v0.17.2 github.com/chi-middleware/proxy v1.1.1 @@ -175,6 +177,7 @@ require ( github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-ini/ini v1.62.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect github.com/go-openapi/inflect v0.19.0 // indirect diff --git a/go.sum b/go.sum index d6748eae34de6..680c382a32ff1 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,12 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= +cloud.google.com/go v0.25.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.31.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.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= @@ -11,6 +15,7 @@ cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= @@ -68,6 +73,7 @@ code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFj code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4HyUcuHFfDsk/QuwO+wf+Y99RYdxY0= code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= +code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 h1:TXbikPqa7YRtfU9vS6QJBg77pUvbEb6StRdZO8t1bEY= @@ -79,8 +85,12 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EU contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= +gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41 h1:FIGF6szYd3lBIwvbeedfU5Lc7uG1Xpzi7bkktS6Vdvg= +gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= @@ -101,23 +111,60 @@ github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 h1:r3qt8PCHnfjOv9PN3H github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121/go.mod h1:Ock8XgA7pvULhIaHGAk/cDnRfNrF9Jey81nPcc403iU= github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U= github.com/6543/go-version v1.3.1/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo= +github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod h1:0mMDvQFeLbbn1Wy8P2j3hwFhqBq+FKn8OZPno8WLmp8= +github.com/AlecAivazis/survey/v2 v2.2.7/go.mod h1:9DYvHgXtiXm6nCn+jXnOXLKbH+Yo9u8fAS/SduGdoPk= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= +github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v19.1.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= +github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= +github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= +github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= +github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU= github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= 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/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= +github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -133,27 +180,42 @@ github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= +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.15-0.20200908182639-5b44b70ab3ab/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/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.10/go.mod h1:g5uw8EV2mAlzqe94tfNBNdr89fnbD/n3HV0OhsddkmM= +github.com/Microsoft/hcsshim/test v0.0.0-20200826032352-301c83a30e7c/go.mod h1:30A5igQ91GEmhYJF8TaRP79pMBOYynRsyOByfVV0dU4= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad h1:QeeqI2zxxgZVe11UrYFXXx6gVxPVF40ygekjBzEg4XY= github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/RoaringBitmap/roaring v0.7.1/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I= github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= github.com/RoaringBitmap/roaring v1.2.1 h1:58/LJlg/81wfEHd5L9qsHduznOIhyv4qb1yWcSvVq9A= github.com/RoaringBitmap/roaring v1.2.1/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= @@ -171,6 +233,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy 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/andreaskoch/go-fswatch v1.0.0/go.mod h1:r5/iV+4jfwoY2sYqBkg8vpF04ehOvEl4qPptVGdxmqo= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -185,6 +248,7 @@ github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= +github.com/apex/log v1.3.0/go.mod h1:jd8Vpsr46WAe3EZSQ/IUMs2qQD/GOycT5rPWCO1yGcs= github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= @@ -199,31 +263,40 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:W github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.15.90/go.mod h1:es1KtYUFs7le0xQ3rOihkuoVD90z7D0fR2Qm4S00/gU= +github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= 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 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= 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 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.1.10/go.mod h1:w0XsmFg8qg6cmpTtJ0z3pKgjTDBMMnI/+I2syrE6XBE= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.3.3 h1:R1XWiopGiXf66xygsiLpzLo67xEYvMkHw3w+rCOSAwg= github.com/bits-and-blooms/bitset v1.3.3/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= +github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blevesearch/bleve/v2 v2.0.5/go.mod h1:ZjWibgnbRX33c+vBRgla9QhPb4QOjD6fdVJ+R1Bk8LM= github.com/blevesearch/bleve/v2 v2.3.4 h1:SSb7/cwGzo85LWX1jchIsXM8ZiNNMX3shT5lROM63ew= github.com/blevesearch/bleve/v2 v2.3.4/go.mod h1:Ot0zYum8XQRfPcwhae8bZmNyYubynsoMjVvl1jPqL30= @@ -271,12 +344,28 @@ github.com/blevesearch/zapx/v14 v14.3.5/go.mod h1:954A/eKFb+pg/ncIYWLWCKY+mIjReM github.com/blevesearch/zapx/v15 v15.2.0/go.mod h1:MmQceLpWfME4n1WrBFIwplhWmaQbQqLQARpaKUEOs/A= github.com/blevesearch/zapx/v15 v15.3.5 h1:NVD0qq8vRk66ImJn1KloXT5ckqPDUZT7VbVJs9jKlac= github.com/blevesearch/zapx/v15 v15.3.5/go.mod h1:QMUh2hXCaYIWFKPYGavq/Iga2zbHWZ9DZAa9uFbWyvg= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= +github.com/bombsimon/wsl/v2 v2.2.0/go.mod h1:Azh8c3XGEJl9LyX0/sFC+CKMc7Ssgua0g+6abzXN4Pg= +github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= +github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bufbuild/connect-go v1.0.0 h1:htSflKUT8y1jxhoPhPYTZMrsY3ipUXjjrbcZR5O2cVo= +github.com/bufbuild/connect-go v1.0.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= +github.com/bufbuild/connect-grpchealth-go v1.0.0 h1:33v883tL86jLomQT6R2ZYVYaI2cRkuUXvU30WfbQ/ko= +github.com/bufbuild/connect-grpchealth-go v1.0.0/go.mod h1:6OEb4J3rh5+Wdvt4/muOIfZo1lt9cPU8ggwpsjBaZ3Y= +github.com/bufbuild/connect-grpcreflect-go v1.0.0 h1:zWsLFYqrT1O2sNJFYfTXI5WxbAyiY2dvevvnJHPtV5A= +github.com/bufbuild/connect-grpcreflect-go v1.0.0/go.mod h1:825I20H8bfE9rLnBH/046JSpmm3uwpNYdG4duCARetc= +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/buildkite/terminal-to-html/v3 v3.7.0 h1:chdLUSpiOj/A4v3dzxyOqixXI6aw7IDA6Dk77FXsvNU= github.com/buildkite/terminal-to-html/v3 v3.7.0/go.mod h1:g0ME1XqbkBSgXR9YmlIHcJIjzaMyWW+HbsG0rPb5puo= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= @@ -299,11 +388,14 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/chi-middleware/proxy v1.1.1 h1:4HaXUp8o2+bhHr1OhVy+VjN0+L7/07JDcn6v7YrTjrQ= github.com/chi-middleware/proxy v1.1.1/go.mod h1:jQwMEJct2tz9VmtCELxvnXoMfa+SOdikvbVJVHv/M+0= 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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= @@ -334,21 +426,54 @@ github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcK github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +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/console v0.0.0-20180822173158-c12b1e7919c1/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.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= +github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +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.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/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-20200928162600-f2cc35102c2a/go.mod h1:W0qIOTD7mp2He++YVq+kgfXezRYqzP1uDuMVH1bITDY= +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/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/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/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116/go.mod h1:o59b3PCKVAf9jjiKtCc/9hLAd+5p/rfhBfm6aBcTEr4= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= 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/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +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 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/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 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= 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-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= github.com/couchbase/go-couchbase v0.0.0-20201026062457-7b3be89bbd89/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A= @@ -371,8 +496,10 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= +github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= +github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -382,7 +509,9 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go. github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= +github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +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-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= @@ -396,8 +525,32 @@ github.com/djherbis/nio/v3 v3.0.1/go.mod h1:Ng4h80pbZFMla1yKzm61cF0tqqilXZYrogmW github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.3+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.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v0.0.0-20200511152416-a93e9eb0e95c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v1.4.2-0.20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +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-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= +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/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= @@ -414,6 +567,10 @@ github.com/editorconfig/editorconfig-core-go/v2 v2.4.5 h1:kTcVMyCvFGQmTk0S5+R7GF github.com/editorconfig/editorconfig-core-go/v2 v2.4.5/go.mod h1:rDB5UUleQsOI1HLbojaBmDNR8oUUe31InmNDTVzcDHY= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +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/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= @@ -436,6 +593,8 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= github.com/ethantkoenig/rupture v1.0.1 h1:6aAXghmvtnngMgQzy7SMGdicMvkV86V4n9fT0meE5E4= github.com/ethantkoenig/rupture v1.0.1/go.mod h1:Sjqo/nbffZp1pVVXNGhpugIjsWmuS9KiIB4GtpEBur4= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +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 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= @@ -463,9 +622,12 @@ github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66 github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= +github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +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/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= @@ -485,6 +647,8 @@ github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/go-critic/go-critic v0.4.1/go.mod h1:7/14rZGnZbY6E38VEGk2kVhoq6itzc1E68facVDK23g= +github.com/go-critic/go-critic v0.4.3/go.mod h1:j4O3D4RoIwRqlZw5jJpx0BNfXWWbpcJoKu5cYSe4YmQ= github.com/go-enry/go-enry/v2 v2.8.3 h1:BwvNrN58JqBJhyyVdZSl5QD3xoxEEGYUrRyPh31FGhw= github.com/go-enry/go-enry/v2 v2.8.3/go.mod h1:GVzIiAytiS5uT/QiuakK7TF1u4xDab87Y8V5EJRpsIQ= github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo= @@ -493,16 +657,21 @@ github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5Hql github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ= github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= +github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf h1:tmTaR5nN6RJs6G9+tmd3MRBNXSk6YTI9+8nv1WrIKzI= github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf/go.mod h1:cGzI9Lmtnh5wmJ5NjO/Cr3d6Iljyy588mEFUKs5vMvw= 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-ini/ini v1.62.0 h1:7VJT/ZXjzqSrvtraFp4ONq80hTcRQth1c9ZnQ3uNQvU= +github.com/go-ini/ini v1.62.0/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/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -510,10 +679,14 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs= github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI= +github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= 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-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +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-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= @@ -524,9 +697,14 @@ github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2uj github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +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/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +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/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= @@ -535,6 +713,8 @@ github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8en github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw= github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo= github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI= @@ -544,6 +724,8 @@ github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrC github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +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-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= @@ -569,6 +751,21 @@ github.com/go-swagger/go-swagger v0.30.3/go.mod h1:neDPes8r8PCz2JPvHRDj8BTULLh4V github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l9rI6sNaZgNC0LnF3MiE+qTmyBA/tZAg1rtyrGbUMK0= github.com/go-testfixtures/testfixtures/v3 v3.8.1 h1:uonwvepqRvSgddcrReZQhojTlWlmOlHkYAb9ZaOMWgU= github.com/go-testfixtures/testfixtures/v3 v3.8.1/go.mod h1:Kdu7YeMC0KRXVHdaQ91Vmx3pcjoTF63h4f1qTJDdXLA= +github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= +github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= +github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= +github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= 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= @@ -600,13 +797,19 @@ github.com/goccy/go-json v0.9.5/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGF github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +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/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.7.3/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= +github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/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= @@ -636,6 +839,7 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= 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= @@ -646,6 +850,7 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/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= @@ -670,6 +875,26 @@ github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= +github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/golangci-lint v1.23.7/go.mod h1:g/38bxfhp4rI7zeWSxcdIeHTQGS58TCak8FYcyCmavQ= +github.com/golangci/golangci-lint v1.27.0/go.mod h1:+eZALfxIuthdrHPtfM7w/R3POJLjHDfJJw8XZl9xOng= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= +github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -678,6 +903,7 @@ github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod h1:6CKh9dscIRoqc2kC6YUFICHZMT9NrClyPrRVFrdw1QQ= github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 h1:806qveZBQtRNHroYHyg6yrsjqBJh9kIB4nfmB8uJnak= github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92/go.mod h1:kXWPsHVPSKVuxPPG69BRtumCbAW537FydV/GH89oBhM= +github.com/google/crfs v0.0.0-20191108021818-71d77da419c9/go.mod h1:etGhoOqfwPkooV6aqoX3eBGQOJblqdoc9XvWOeuxpPw= 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= @@ -691,8 +917,11 @@ 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod h1:KyKXa9ciM8+lgMXwOVsXi7UxGrsf9mM61Mzs+xKUrKE= +github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI= github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28= @@ -702,7 +931,10 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= 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/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -731,6 +963,7 @@ github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40 h1:ykKxL12NZd3JmWZnyq github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod h1:1dPv0CUjNQVFEDuAUFhZql16pw/VlPgaX8qj+g5pVzQ= github.com/google/trillian v1.3.14-0.20210428093031-b4ddea2e86b1/go.mod h1:FdIJX+NoDk/dIN2ZxTyz5nAJWgf+NSSSriPAMThChTY= @@ -742,7 +975,9 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= +github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= 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= @@ -751,24 +986,33 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= +github.com/goreleaser/goreleaser v0.136.0/go.mod h1:wiKrPUeSNh6Wu8nUHxZydSOVQ/OZvOaO7DTtFqie904= github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= +github.com/goreleaser/nfpm v1.3.0/go.mod h1:w0p7Kc9TAUgWMyrub63ex3M2Mgw88M4GZXoTq5UCb40= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= 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/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY= github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA= +github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/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.6.2/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.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -784,13 +1028,20 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= +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.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= 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 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -798,10 +1049,14 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= +github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= +github.com/hanwen/go-fuse/v2 v2.0.3/go.mod h1:0EQM6aH2ctVpvZ6a+onrQ/vaykxh2GH7hy3e13vzTUY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -810,8 +1065,10 @@ github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-immutable-radix v1.0.0/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-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -822,6 +1079,7 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b 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.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -830,6 +1088,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c/go.mod h1:fHzc09UnyJyqyW+bFuq864eh+wC7dj65aXmXLRe5to0= +github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= @@ -843,6 +1103,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +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.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -852,6 +1113,7 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= 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= @@ -909,22 +1171,31 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f 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/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea/go.mod h1:QMdK4dGB3YhEW2BmA1wgGpPYI3HZy/5gD705PXKUVSg= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg= github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= +github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= 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.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -935,6 +1206,8 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= 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.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -967,11 +1240,13 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkGnWpac= +github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -986,15 +1261,20 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.4/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/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ= @@ -1016,6 +1296,7 @@ github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis= github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ= github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af/go.mod h1:Cqz6pqow14VObJ7peltM+2n3PWOz7yTrfUuGbVFkzN0= github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 h1:F/3FfGmKdiKFa8kL3YrpZ7pe9H4l4AzA1pbaOUnRvPI= @@ -1027,17 +1308,22 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= 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.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0= github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA= github.com/markbates/goth v1.73.0 h1:X5QUUHLP5puJ4dhoPKkV3PhDIvvQEzsfVxsUmDNSJ28= github.com/markbates/goth v1.73.0/go.mod h1:X6xdNgpapSENS0O35iTBBcMHoJDQDfI9bJl+APCkYMc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= 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/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -1047,6 +1333,8 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +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= @@ -1064,6 +1352,7 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.11.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.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -1071,8 +1360,10 @@ github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mholt/acmez v1.0.4 h1:N3cE4Pek+dSolbsofIkAYz6H1d3pE+2G0os7QHslf80= github.com/mholt/acmez v1.0.4/go.mod h1:qFGLZ4u+ehWINeJZjzPlsnjJBCPAADWTcIqE/7DAYQY= @@ -1097,23 +1388,37 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= 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-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= 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/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= 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 v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/sys/mount v0.1.0/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= +github.com/moby/sys/mount v0.1.1/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= +github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= +github.com/moby/sys/mountinfo v0.1.0/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= +github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= +github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= 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 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -1121,19 +1426,27 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= +github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUllUJF9mWUESr9TWKS7iEKsQ/IipM= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= +github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/msteinert/pam v1.1.0 h1:VhLun/0n0kQYxiRBJJvVpC2jR6d21SWJFjpvUVj20Kc= github.com/msteinert/pam v1.1.0/go.mod h1:M4FPeAW8g2ITO68W8gACDz13NDJyOQM9IQsQhrR6TOI= +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/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/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -1141,6 +1454,10 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= +github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/nektos/act v0.2.24 h1:kKLOu2+Noubp6zlsBk60prC5XotHcCnOZT+aUg2rmjs= +github.com/nektos/act v0.2.24/go.mod h1:aLdBHPnAggcGI98HD4jppS4DbMP7tgnoMDSJT/ILsoI= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1165,26 +1482,52 @@ github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k= github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU= github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= +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.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.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/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +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.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +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/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/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE= +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/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/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/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= 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/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= @@ -1199,12 +1542,15 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= 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.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -1214,18 +1560,23 @@ github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= 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= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/otp v1.3.0 h1:oJV/SkzR33anKXwQU3Of42rL4wbrffP4uvUf1SvS5Xs= github.com/pquerna/otp v1.3.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= +github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.8.0/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-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -1239,6 +1590,7 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +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-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1246,6 +1598,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= 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-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1259,10 +1613,14 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/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-20190117184657-bf6a532e95b1/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.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= @@ -1273,10 +1631,13 @@ github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0ua github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= github.com/quasoft/websspi v1.1.2 h1:/mA4w0LxWlE3novvsoEL6BBA1WnjJATbjkh1kFrTidw= github.com/quasoft/websspi v1.1.2/go.mod h1:HmVdl939dQ0WIXZhyik+ARdI03M6bQzaSEKcgpFmewk= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= 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= @@ -1284,12 +1645,14 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= +github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= 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.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= @@ -1300,24 +1663,38 @@ github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= 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/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= +github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/santhosh-tekuri/jsonschema/v5 v5.0.1 h1:HNLA3HtUIROrQwG1cuu5EYuqk3UEoJ61Dr/9xkd6sok= github.com/santhosh-tekuri/jsonschema/v5 v5.0.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= +github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= 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/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= +github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989/go.mod h1:i9l/TNj+yDFh9SZXUTvspXTjbFXgZGP/UvhU1S65A4A= +github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= +github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= 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/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -1325,6 +1702,7 @@ github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBf github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d/go.mod h1:vq0tzqLRu6TS7Id0wMo2N5QzJoKedVeovOpHjnykSzY= github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg= github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA= +github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1341,6 +1719,7 @@ github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUr github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -1350,8 +1729,11 @@ github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= +github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= 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.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -1361,6 +1743,7 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cobra 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 v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -1371,12 +1754,15 @@ github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJ 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.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= @@ -1388,11 +1774,15 @@ github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.2.1/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= @@ -1406,10 +1796,19 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= +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/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= +github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= @@ -1421,10 +1820,16 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85/go.mod h1:a7cilN64dG941IOXfhJhlH0qB92hxJ9A1ewrdUmJ6xo= +github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= github.com/tstranex/u2f v1.0.0 h1:HhJkSzDDlVSVIVt7pDJwCHQj67k7A5EeBgPmeD+pVsQ= github.com/tstranex/u2f v1.0.0/go.mod h1:eahSLaqAS0zsIEv80+vXT7WanXs7MQQDg3j3wGBSayo= +github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= @@ -1433,31 +1838,46 @@ github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/unrolled/render v1.5.0 h1:uNTHMvVoI9pyyXfgoDHHycIqFONNY2p4eQR9ty+NsxM= github.com/unrolled/render v1.5.0/go.mod h1:eLTosBkQqEPEk7pRfkCRApXd++lm++nCsVlFOHpeedw= +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/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.10 h1:p8Fspmz3iTctJstry1PYS3HVdllxnEzTEsgIgtxTrCk= github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc= github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= +github.com/xanzy/go-gitlab v0.32.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/go-gitlab v0.73.1 h1:UMagqUZLJdjss1SovIC+kJCH4k2AZWXl58gJd38Y/hI= github.com/xanzy/go-gitlab v0.73.1/go.mod h1:d/a0vswScO7Agg1CZNz15Ic6SSvBG9vfw8egL99t4kA= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= github.com/xanzy/ssh-agent v0.3.2 h1:eKj4SX2Fe7mui28ZgnFW5fmTz1EIr7ugo5s6wDxdHBM= github.com/xanzy/ssh-agent v0.3.2/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= @@ -1466,6 +1886,9 @@ github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+ github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +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/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= @@ -1486,6 +1909,9 @@ github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87 h1:P github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= +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= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= @@ -1533,6 +1959,9 @@ go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAV go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4= go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= +go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1569,11 +1998,16 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= +golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= +golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/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= @@ -1581,19 +2015,24 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/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-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -1611,7 +2050,9 @@ golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891 h1:WhEPFM1Ck5gaKybeSWvzI7Y/cd8K9K5tJGRxXMACOBA= golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= 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-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= 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-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -1623,7 +2064,9 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/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= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -1649,10 +2092,14 @@ 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/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-20180911220305-26e67e76b6c3/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-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/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= @@ -1672,8 +2119,11 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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-20191002035440-2ec189313ef0/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-20191119073136-fc4aabc6c914/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= @@ -1723,8 +2173,11 @@ golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/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-20181017192945-9dcd33a902f4/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-20181203162652-d668ce993890/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-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1749,6 +2202,7 @@ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= 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= @@ -1763,16 +2217,20 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/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-20181029174526-d69651ed3497/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1783,28 +2241,42 @@ golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7w 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-20190530182044-ad28b68e88f1/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-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190730183949-1393eb018365/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-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-20191010194322-b09406accb47/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-20191119060738-e882bf8e40c2/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-20191220142924-d4481acd189f/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-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1818,12 +2290,20 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/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-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-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a/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= @@ -1883,6 +2363,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1898,19 +2379,29 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb 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-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/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-20180828015842-6cd1fcedba52/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-20181011042414-1f849cf54d09/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-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/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-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= 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-20190311215038-5c2858a9cfe5/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-20190322203728-c1a832b0ad89/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= @@ -1919,21 +2410,30 @@ golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3 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-20190521203540-521d6ed310dd/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-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= 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-20190910044552-dd2b5c81c578/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-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/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= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1941,21 +2441,28 @@ 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-20200102140908-9497f49d5709/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= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200331202046-9d5940d49312/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -1994,10 +2501,20 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= +google.golang.org/api v0.3.0/go.mod h1:IuvZyQh8jgscv8qWfQ4ABd8m7hEudgBFM/EdhA3BnXw= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= +google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= 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= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -2011,6 +2528,7 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= @@ -2050,9 +2568,13 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= 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= @@ -2068,6 +2590,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= @@ -2082,6 +2605,7 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2089,6 +2613,7 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200929141702-51c3e5b607fe/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-20201117123952-62d171c70ae1/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= @@ -2141,7 +2666,10 @@ google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 h1:4SPz2GL2CXJt28MTF8V6Ap/9ZiVbQlJeGSd9qtA7DLs= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2198,10 +2726,12 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +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/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= 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= @@ -2212,21 +2742,29 @@ gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/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/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.44.2/go.mod h1:M3Cogqpuv0QCi3ExAY5V4uOt4qb/R3xZubo9m8lK5wg= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/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/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -2235,6 +2773,7 @@ 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= @@ -2246,7 +2785,11 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= @@ -2254,9 +2797,43 @@ 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= +honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= +k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= +k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= +k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apiserver v0.17.4/go.mod h1:5ZDQ6Xr5MNBxyi3iUZXS84QOhZl+W7Oq2us/29c0j9I= +k8s.io/client-go v0.0.0-20180910083459-2cefa64ff137/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/client-go v0.17.4/go.mod h1:ouF6o5pz3is8qU0/qYL2RnoxOPqgfuidYLowytyLJmc= +k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU= +k8s.io/cloud-provider v0.17.4/go.mod h1:XEjKDzfD+b9MTLXQFlDGkk6Ho8SGMpaU8Uugx/KNK9U= +k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= +k8s.io/component-base v0.17.4/go.mod h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE= +k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= +k8s.io/csi-translation-lib v0.17.4/go.mod h1:CsxmjwxEI0tTNMzffIAcgR9lX4wOh6AKHdxQrT7L0oo= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/legacy-cloud-providers v0.17.4/go.mod h1:FikRNoD64ECjkxO36gkDgJeiQWwyZTuBkhu+yxOc1Js= +k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +modernc.org/cc v1.0.0 h1:nPibNuDEx6tvYrUAtvDTTw98rx5juGsa5zuDnKwEEQQ= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= @@ -2309,6 +2886,7 @@ modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6r modernc.org/ccgo/v3 v3.12.82 h1:wudcnJyjLj1aQQCXF3IM9Gz2X6UNjw+afIghzdtn0v8= modernc.org/ccgo/v3 v3.12.82/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +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/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= @@ -2346,6 +2924,7 @@ modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= modernc.org/libc v1.11.87 h1:PzIzOqtlzMDDcCzJ5cUP6h/Ku6Fa9iyflP2ccTY64aE= modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= +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/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -2358,22 +2937,33 @@ modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.14.2 h1:ohsW2+e+Qe2To1W6GNezzKGwjXwSax6R+CrhRxVaFbE= modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY= modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= +mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= mvdan.cc/xurls/v2 v2.4.0 h1:tzxjVAj+wSBmDcF6zBB7/myTy3gX9xvi8Tyr28AuQgc= mvdan.cc/xurls/v2 v2.4.0/go.mod h1:+GEjq9uNjqs8LQfM9nVnM8rff0OQ5Iash5rzX+N1CSg= pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= 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/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= +sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +sourcegraph.com/sqs/pbtypes v1.0.0/go.mod h1:3AciMUv4qUuRHRHhOG4TZOB+72GdPVz5k+c648qsFS4= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= diff --git a/routers/api/bots/ping.go b/routers/api/bots/ping.go index b162630eb568b..df23ba6cb9975 100644 --- a/routers/api/bots/ping.go +++ b/routers/api/bots/ping.go @@ -7,11 +7,11 @@ package bots import ( "context" "fmt" - "log" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/web" - v1 "gitea.com/gitea/proto/gen/proto/v1" - "gitea.com/gitea/proto/gen/proto/v1/v1connect" + pingv1 "gitea.com/gitea/proto-go/ping/v1" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" grpchealth "github.com/bufbuild/connect-grpchealth-go" @@ -22,11 +22,12 @@ type PingService struct{} func (s *PingService) Ping( ctx context.Context, - req *connect.Request[v1.PingRequest], -) (*connect.Response[v1.PingResponse], error) { - log.Println("Content-Type: ", req.Header().Get("Content-Type")) - log.Println("User-Agent: ", req.Header().Get("User-Agent")) - res := connect.NewResponse(&v1.PingResponse{ + req *connect.Request[pingv1.PingRequest], +) (*connect.Response[pingv1.PingResponse], error) { + log.Info("Content-Type: %s", req.Header().Get("Content-Type")) + log.Info("User-Agent: %s", req.Header().Get("User-Agent")) + log.Info("X-Gitea-Token: %s", req.Header().Get("X-Gitea-Token")) + res := connect.NewResponse(&pingv1.PingResponse{ Data: fmt.Sprintf("Hello, %s!", req.Msg.Data), }) res.Header().Set("Gitea-Version", "v1") @@ -37,26 +38,26 @@ func pingServiceRoute(r *web.Route) { compress1KB := connect.WithCompressMinBytes(1024) pingService := &PingService{} - connectPath, connecthandler := v1connect.NewPingServiceHandler( + connectPath, connecthandler := pingv1connect.NewPingServiceHandler( pingService, compress1KB, ) // grpcV1 grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(v1connect.PingServiceName), + grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), compress1KB, ) // grpcV1Alpha grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(v1connect.PingServiceName), + grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), compress1KB, ) // grpcHealthCheck grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker(v1connect.PingServiceName), + grpchealth.NewStaticChecker(pingv1connect.PingServiceName), compress1KB, ) diff --git a/routers/api/bots/runner.go b/routers/api/bots/runner.go index 4b0a7a6c9bdbe..17853c3ae01ed 100644 --- a/routers/api/bots/runner.go +++ b/routers/api/bots/runner.go @@ -9,8 +9,8 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/web" - v1 "gitea.com/gitea/proto/gen/proto/v1" - "gitea.com/gitea/proto/gen/proto/v1/v1connect" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" grpchealth "github.com/bufbuild/connect-grpchealth-go" @@ -21,25 +21,28 @@ type RunnerService struct{} func (s *RunnerService) Connect( ctx context.Context, - req *connect.Request[v1.ConnectRequest], -) (*connect.Response[v1.ConnectResponse], error) { + req *connect.Request[runnerv1.ConnectRequest], +) (*connect.Response[runnerv1.ConnectResponse], error) { log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&v1.ConnectResponse{ - JobId: 100, + res := connect.NewResponse(&runnerv1.ConnectResponse{ + Stage: &runnerv1.Stage{ + RunnerUuid: "foobar", + BuildUuid: "foobar", + }, }) - res.Header().Set("Gitea-Version", "v1") + res.Header().Set("Gitea-Version", "runnerv1") return res, nil } func (s *RunnerService) Accept( ctx context.Context, - req *connect.Request[v1.AcceptRequest], -) (*connect.Response[v1.AcceptResponse], error) { + req *connect.Request[runnerv1.AcceptRequest], +) (*connect.Response[runnerv1.AcceptResponse], error) { log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&v1.AcceptResponse{ + res := connect.NewResponse(&runnerv1.AcceptResponse{ JobId: 100, }) - res.Header().Set("Gitea-Version", "v1") + res.Header().Set("Gitea-Version", "runnerv1") return res, nil } @@ -47,26 +50,26 @@ func runnerServiceRoute(r *web.Route) { compress1KB := connect.WithCompressMinBytes(1024) runnerService := &RunnerService{} - connectPath, connecthandler := v1connect.NewRunnerServiceHandler( + connectPath, connecthandler := runnerv1connect.NewRunnerServiceHandler( runnerService, compress1KB, ) // grpcV1 grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(v1connect.RunnerServiceName), + grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName), compress1KB, ) // grpcV1Alpha grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(v1connect.RunnerServiceName), + grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName), compress1KB, ) // grpcHealthCheck grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker(v1connect.RunnerServiceName), + grpchealth.NewStaticChecker(runnerv1connect.RunnerServiceName), compress1KB, ) From 2cba8fafd851a47bdc9ea6d96b27db2b701c306e Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 20 Aug 2022 11:53:19 +0800 Subject: [PATCH 012/408] chore(grpc): add health check and grpc v1, alpha version Signed-off-by: Bo-Yi.Wu --- routers/api/bots/bots.go | 4 +++ routers/api/bots/grpc.go | 32 +++++++++++++++++++++ routers/api/bots/{process.go => handler.go} | 0 routers/api/bots/health.go | 29 +++++++++++++++++++ routers/api/bots/ping.go | 23 --------------- routers/api/bots/runner.go | 23 --------------- 6 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 routers/api/bots/grpc.go rename routers/api/bots/{process.go => handler.go} (100%) create mode 100644 routers/api/bots/health.go diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 0584cb86bd018..62991f07bc348 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -15,4 +15,8 @@ func Routes(r *web.Route) { runnerServiceRoute(r) // ping service pingServiceRoute(r) + // health service + healthServiceRoute(r) + // grpcv1 and v1alpha service + grpcServiceRoute(r) } diff --git a/routers/api/bots/grpc.go b/routers/api/bots/grpc.go new file mode 100644 index 0000000000000..282aaa2980434 --- /dev/null +++ b/routers/api/bots/grpc.go @@ -0,0 +1,32 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/modules/web" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" + + "github.com/bufbuild/connect-go" + grpcreflect "github.com/bufbuild/connect-grpcreflect-go" +) + +func grpcServiceRoute(r *web.Route) { + compress1KB := connect.WithCompressMinBytes(1024) + + // grpcV1 + grpcPath, gHandler := grpcreflect.NewHandlerV1( + grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), + compress1KB, + ) + + // grpcV1Alpha + grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( + grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), + compress1KB, + ) + + r.Post(grpcPath+"{name}", grpcHandler(gHandler)) + r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) +} diff --git a/routers/api/bots/process.go b/routers/api/bots/handler.go similarity index 100% rename from routers/api/bots/process.go rename to routers/api/bots/handler.go diff --git a/routers/api/bots/health.go b/routers/api/bots/health.go new file mode 100644 index 0000000000000..46eb5c7eeb0b9 --- /dev/null +++ b/routers/api/bots/health.go @@ -0,0 +1,29 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/modules/web" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" + + "github.com/bufbuild/connect-go" + grpchealth "github.com/bufbuild/connect-grpchealth-go" +) + +func healthServiceRoute(r *web.Route) { + compress1KB := connect.WithCompressMinBytes(1024) + + // grpcHealthCheck + grpcHealthPath, gHealthHandler := grpchealth.NewHandler( + grpchealth.NewStaticChecker( + runnerv1connect.RunnerServiceName, + pingv1connect.PingServiceName, + ), + compress1KB, + ) + + r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) +} diff --git a/routers/api/bots/ping.go b/routers/api/bots/ping.go index df23ba6cb9975..efbc416657f40 100644 --- a/routers/api/bots/ping.go +++ b/routers/api/bots/ping.go @@ -14,8 +14,6 @@ import ( "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" - grpchealth "github.com/bufbuild/connect-grpchealth-go" - grpcreflect "github.com/bufbuild/connect-grpcreflect-go" ) type PingService struct{} @@ -43,26 +41,5 @@ func pingServiceRoute(r *web.Route) { compress1KB, ) - // grpcV1 - grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), - compress1KB, - ) - - // grpcV1Alpha - grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), - compress1KB, - ) - - // grpcHealthCheck - grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker(pingv1connect.PingServiceName), - compress1KB, - ) - r.Post(connectPath+"{name}", grpcHandler(connecthandler)) - r.Post(grpcPath+"{name}", grpcHandler(gHandler)) - r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) - r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) } diff --git a/routers/api/bots/runner.go b/routers/api/bots/runner.go index 17853c3ae01ed..a6cc32fbdacea 100644 --- a/routers/api/bots/runner.go +++ b/routers/api/bots/runner.go @@ -13,8 +13,6 @@ import ( "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" - grpchealth "github.com/bufbuild/connect-grpchealth-go" - grpcreflect "github.com/bufbuild/connect-grpcreflect-go" ) type RunnerService struct{} @@ -55,26 +53,5 @@ func runnerServiceRoute(r *web.Route) { compress1KB, ) - // grpcV1 - grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName), - compress1KB, - ) - - // grpcV1Alpha - grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName), - compress1KB, - ) - - // grpcHealthCheck - grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker(runnerv1connect.RunnerServiceName), - compress1KB, - ) - r.Post(connectPath+"{name}", grpcHandler(connecthandler)) - r.Post(grpcPath+"{name}", grpcHandler(gHandler)) - r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) - r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) } From e4e41a806563f7189b707ba4ce09dff631a8c957 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 22 Aug 2022 21:12:39 +0800 Subject: [PATCH 013/408] chore(bots): re-structure grpc folder. Signed-off-by: Bo-Yi.Wu --- routers/api/bots/bots.go | 30 ++++++++++++----- routers/api/bots/grpc.go | 32 ------------------ routers/api/bots/grpc/grpc.go | 43 +++++++++++++++++++++++++ routers/api/bots/grpc/health.go | 19 +++++++++++ routers/api/bots/grpc/ping.go | 21 ++++++++++++ routers/api/bots/grpc/runner.go | 21 ++++++++++++ routers/api/bots/handler.go | 18 ----------- routers/api/bots/health.go | 29 ----------------- routers/api/bots/{ => ping}/ping.go | 20 ++---------- routers/api/bots/{ => runner}/runner.go | 22 +++---------- 10 files changed, 133 insertions(+), 122 deletions(-) delete mode 100644 routers/api/bots/grpc.go create mode 100644 routers/api/bots/grpc/grpc.go create mode 100644 routers/api/bots/grpc/health.go create mode 100644 routers/api/bots/grpc/ping.go create mode 100644 routers/api/bots/grpc/runner.go delete mode 100644 routers/api/bots/handler.go delete mode 100644 routers/api/bots/health.go rename routers/api/bots/{ => ping}/ping.go (64%) rename routers/api/bots/{ => runner}/runner.go (66%) diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 62991f07bc348..3c761eeffa54e 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -5,18 +5,32 @@ package bots import ( + "log" + "net/http" + "code.gitea.io/gitea/modules/web" + "code.gitea.io/gitea/routers/api/bots/grpc" ) +func grpcHandler(h http.Handler) http.HandlerFunc { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + log.Println("protocol version:", r.Proto) + h.ServeHTTP(w, r) + }) +} + +func gRPCRouter(r *web.Route, fn grpc.RouteFn) { + p, h := fn() + r.Post(p+"{name}", grpcHandler(h)) +} + func Routes(r *web.Route) { // socket connection r.Get("/socket", socketServe) - // runner service - runnerServiceRoute(r) - // ping service - pingServiceRoute(r) - // health service - healthServiceRoute(r) - // grpcv1 and v1alpha service - grpcServiceRoute(r) + + gRPCRouter(r, grpc.V1Route) + gRPCRouter(r, grpc.V1AlphaRoute) + gRPCRouter(r, grpc.HealthRoute) + gRPCRouter(r, grpc.PingRoute) + gRPCRouter(r, grpc.RunnerRoute) } diff --git a/routers/api/bots/grpc.go b/routers/api/bots/grpc.go deleted file mode 100644 index 282aaa2980434..0000000000000 --- a/routers/api/bots/grpc.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "code.gitea.io/gitea/modules/web" - "gitea.com/gitea/proto-go/ping/v1/pingv1connect" - - "github.com/bufbuild/connect-go" - grpcreflect "github.com/bufbuild/connect-grpcreflect-go" -) - -func grpcServiceRoute(r *web.Route) { - compress1KB := connect.WithCompressMinBytes(1024) - - // grpcV1 - grpcPath, gHandler := grpcreflect.NewHandlerV1( - grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), - compress1KB, - ) - - // grpcV1Alpha - grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha( - grpcreflect.NewStaticReflector(pingv1connect.PingServiceName), - compress1KB, - ) - - r.Post(grpcPath+"{name}", grpcHandler(gHandler)) - r.Post(grpcAlphaPath+"{name}", grpcHandler(gAlphaHandler)) -} diff --git a/routers/api/bots/grpc/grpc.go b/routers/api/bots/grpc/grpc.go new file mode 100644 index 0000000000000..a59672f4f5e7c --- /dev/null +++ b/routers/api/bots/grpc/grpc.go @@ -0,0 +1,43 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package grpc + +import ( + "net/http" + + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" + + "github.com/bufbuild/connect-go" + grpcreflect "github.com/bufbuild/connect-grpcreflect-go" + "google.golang.org/grpc/health/grpc_health_v1" +) + +// RouteFn gRPC route registration +type RouteFn func() (string, http.Handler) + +var compress1KB = connect.WithCompressMinBytes(1024) + +var allServices = []string{ + runnerv1connect.RunnerServiceName, + pingv1connect.PingServiceName, + grpc_health_v1.Health_ServiceDesc.ServiceName, +} + +func V1Route() (string, http.Handler) { + // grpcV1 + return grpcreflect.NewHandlerV1( + grpcreflect.NewStaticReflector(allServices...), + compress1KB, + ) +} + +func V1AlphaRoute() (string, http.Handler) { + // grpcV1Alpha + return grpcreflect.NewHandlerV1Alpha( + grpcreflect.NewStaticReflector(allServices...), + compress1KB, + ) +} diff --git a/routers/api/bots/grpc/health.go b/routers/api/bots/grpc/health.go new file mode 100644 index 0000000000000..ec0dfc9d69005 --- /dev/null +++ b/routers/api/bots/grpc/health.go @@ -0,0 +1,19 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package grpc + +import ( + "net/http" + + grpchealth "github.com/bufbuild/connect-grpchealth-go" +) + +func HealthRoute() (string, http.Handler) { + // grpcHealthCheck + return grpchealth.NewHandler( + grpchealth.NewStaticChecker(allServices...), + compress1KB, + ) +} diff --git a/routers/api/bots/grpc/ping.go b/routers/api/bots/grpc/ping.go new file mode 100644 index 0000000000000..6e7b8886d87a6 --- /dev/null +++ b/routers/api/bots/grpc/ping.go @@ -0,0 +1,21 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package grpc + +import ( + "net/http" + + "code.gitea.io/gitea/routers/api/bots/ping" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" +) + +func PingRoute() (string, http.Handler) { + pingService := &ping.Service{} + + return pingv1connect.NewPingServiceHandler( + pingService, + compress1KB, + ) +} diff --git a/routers/api/bots/grpc/runner.go b/routers/api/bots/grpc/runner.go new file mode 100644 index 0000000000000..496820f91a87e --- /dev/null +++ b/routers/api/bots/grpc/runner.go @@ -0,0 +1,21 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package grpc + +import ( + "net/http" + + "code.gitea.io/gitea/routers/api/bots/runner" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" +) + +func RunnerRoute() (string, http.Handler) { + runnerService := &runner.Service{} + + return runnerv1connect.NewRunnerServiceHandler( + runnerService, + compress1KB, + ) +} diff --git a/routers/api/bots/handler.go b/routers/api/bots/handler.go deleted file mode 100644 index 53016e5f3433f..0000000000000 --- a/routers/api/bots/handler.go +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "net/http" - - "code.gitea.io/gitea/modules/log" -) - -func grpcHandler(h http.Handler) http.HandlerFunc { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - log.Info("Got connection: %v", r.Proto) - h.ServeHTTP(w, r) - }) -} diff --git a/routers/api/bots/health.go b/routers/api/bots/health.go deleted file mode 100644 index 46eb5c7eeb0b9..0000000000000 --- a/routers/api/bots/health.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "code.gitea.io/gitea/modules/web" - "gitea.com/gitea/proto-go/ping/v1/pingv1connect" - "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" - - "github.com/bufbuild/connect-go" - grpchealth "github.com/bufbuild/connect-grpchealth-go" -) - -func healthServiceRoute(r *web.Route) { - compress1KB := connect.WithCompressMinBytes(1024) - - // grpcHealthCheck - grpcHealthPath, gHealthHandler := grpchealth.NewHandler( - grpchealth.NewStaticChecker( - runnerv1connect.RunnerServiceName, - pingv1connect.PingServiceName, - ), - compress1KB, - ) - - r.Post(grpcHealthPath+"{name}", grpcHandler(gHealthHandler)) -} diff --git a/routers/api/bots/ping.go b/routers/api/bots/ping/ping.go similarity index 64% rename from routers/api/bots/ping.go rename to routers/api/bots/ping/ping.go index efbc416657f40..d8abe1f39ab91 100644 --- a/routers/api/bots/ping.go +++ b/routers/api/bots/ping/ping.go @@ -2,23 +2,21 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package bots +package ping import ( "context" "fmt" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web" pingv1 "gitea.com/gitea/proto-go/ping/v1" - "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" ) -type PingService struct{} +type Service struct{} -func (s *PingService) Ping( +func (s *Service) Ping( ctx context.Context, req *connect.Request[pingv1.PingRequest], ) (*connect.Response[pingv1.PingResponse], error) { @@ -31,15 +29,3 @@ func (s *PingService) Ping( res.Header().Set("Gitea-Version", "v1") return res, nil } - -func pingServiceRoute(r *web.Route) { - compress1KB := connect.WithCompressMinBytes(1024) - - pingService := &PingService{} - connectPath, connecthandler := pingv1connect.NewPingServiceHandler( - pingService, - compress1KB, - ) - - r.Post(connectPath+"{name}", grpcHandler(connecthandler)) -} diff --git a/routers/api/bots/runner.go b/routers/api/bots/runner/runner.go similarity index 66% rename from routers/api/bots/runner.go rename to routers/api/bots/runner/runner.go index a6cc32fbdacea..e07b7ce67a866 100644 --- a/routers/api/bots/runner.go +++ b/routers/api/bots/runner/runner.go @@ -2,22 +2,20 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package bots +package runner import ( "context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web" runnerv1 "gitea.com/gitea/proto-go/runner/v1" - "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" ) -type RunnerService struct{} +type Service struct{} -func (s *RunnerService) Connect( +func (s *Service) Connect( ctx context.Context, req *connect.Request[runnerv1.ConnectRequest], ) (*connect.Response[runnerv1.ConnectResponse], error) { @@ -32,7 +30,7 @@ func (s *RunnerService) Connect( return res, nil } -func (s *RunnerService) Accept( +func (s *Service) Accept( ctx context.Context, req *connect.Request[runnerv1.AcceptRequest], ) (*connect.Response[runnerv1.AcceptResponse], error) { @@ -43,15 +41,3 @@ func (s *RunnerService) Accept( res.Header().Set("Gitea-Version", "runnerv1") return res, nil } - -func runnerServiceRoute(r *web.Route) { - compress1KB := connect.WithCompressMinBytes(1024) - - runnerService := &RunnerService{} - connectPath, connecthandler := runnerv1connect.NewRunnerServiceHandler( - runnerService, - compress1KB, - ) - - r.Post(connectPath+"{name}", grpcHandler(connecthandler)) -} From 9b4eb5f497a5245a444541d4ceb1659ae4dd5394 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 22 Aug 2022 21:14:17 +0800 Subject: [PATCH 014/408] chore(module): upgrade connect-go package Signed-off-by: Bo-Yi.Wu --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 77de9fd4eeaf1..4b8b13ca8e191 100644 --- a/go.mod +++ b/go.mod @@ -106,6 +106,7 @@ require ( golang.org/x/sys v0.2.0 golang.org/x/text v0.4.0 golang.org/x/tools v0.1.12 + google.golang.org/grpc v1.47.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 @@ -293,7 +294,6 @@ require ( golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect - google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect From c10414a018735335b43e901cf81a17d8784c9cbd Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 22 Aug 2022 21:35:56 +0800 Subject: [PATCH 015/408] test(ping): add testing for gRPC --- routers/api/bots/bots.go | 4 ++- routers/api/bots/bots_test.go | 16 +++++++++ routers/api/bots/ping/ping_test.go | 20 +++++++++++ routers/api/bots/ping/testping.go | 54 ++++++++++++++++++++++++++++++ routers/init.go | 2 +- 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 routers/api/bots/bots_test.go create mode 100644 routers/api/bots/ping/ping_test.go create mode 100644 routers/api/bots/ping/testping.go diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index 3c761eeffa54e..bddd4c92eb15f 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -24,7 +24,7 @@ func gRPCRouter(r *web.Route, fn grpc.RouteFn) { r.Post(p+"{name}", grpcHandler(h)) } -func Routes(r *web.Route) { +func Routes(r *web.Route) *web.Route { // socket connection r.Get("/socket", socketServe) @@ -33,4 +33,6 @@ func Routes(r *web.Route) { gRPCRouter(r, grpc.HealthRoute) gRPCRouter(r, grpc.PingRoute) gRPCRouter(r, grpc.RunnerRoute) + + return r } diff --git a/routers/api/bots/bots_test.go b/routers/api/bots/bots_test.go new file mode 100644 index 0000000000000..6ccb0ea3ec1a0 --- /dev/null +++ b/routers/api/bots/bots_test.go @@ -0,0 +1,16 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "testing" + + "code.gitea.io/gitea/modules/web" + "code.gitea.io/gitea/routers/api/bots/ping" +) + +func TestPingService(t *testing.T) { + ping.MainServiceTest(t, Routes(web.NewRoute())) +} diff --git a/routers/api/bots/ping/ping_test.go b/routers/api/bots/ping/ping_test.go new file mode 100644 index 0000000000000..30a9262bdc28a --- /dev/null +++ b/routers/api/bots/ping/ping_test.go @@ -0,0 +1,20 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package ping + +import ( + "net/http" + "testing" + + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" +) + +func TestService(t *testing.T) { + mux := http.NewServeMux() + mux.Handle(pingv1connect.NewPingServiceHandler( + &Service{}, + )) + MainServiceTest(t, mux) +} diff --git a/routers/api/bots/ping/testping.go b/routers/api/bots/ping/testping.go new file mode 100644 index 0000000000000..3398b30579bdf --- /dev/null +++ b/routers/api/bots/ping/testping.go @@ -0,0 +1,54 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package ping + +import ( + "context" + "net/http" + "net/http/httptest" + "testing" + + pingv1 "gitea.com/gitea/proto-go/ping/v1" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" + + "github.com/bufbuild/connect-go" + "github.com/stretchr/testify/assert" +) + +func MainServiceTest(t *testing.T, h http.Handler) { + t.Parallel() + server := httptest.NewUnstartedServer(h) + server.EnableHTTP2 = true + server.StartTLS() + defer server.Close() + + connectClient := pingv1connect.NewPingServiceClient( + server.Client(), + server.URL, + ) + + grpcClient := pingv1connect.NewPingServiceClient( + server.Client(), + server.URL, + connect.WithGRPC(), + ) + + grpcWebClient := pingv1connect.NewPingServiceClient( + server.Client(), + server.URL, + connect.WithGRPCWeb(), + ) + + clients := []pingv1connect.PingServiceClient{connectClient, grpcClient, grpcWebClient} + t.Run("ping request", func(t *testing.T) { + for _, client := range clients { + result, err := client.Ping(context.Background(), connect.NewRequest(&pingv1.PingRequest{ + Data: "foobar", + })) + assert.NoError(t, err) + assert.Equal(t, "Hello, foobar!", result.Msg.Data) + } + }) +} diff --git a/routers/init.go b/routers/init.go index aef71792f5af3..65bf7b55d8af2 100644 --- a/routers/init.go +++ b/routers/init.go @@ -198,6 +198,6 @@ func NormalRoutes(ctx context.Context) *web.Route { // This implements the OCI API (Note this is not preceded by /api but is instead /v2) r.Mount("/v2", packages_router.ContainerRoutes(ctx)) } - bots_router.Routes(r) + _ = bots_router.Routes(r) return r } From e05f224d1912b800290442b6ef0a1b20e4bdc442 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sun, 28 Aug 2022 13:30:30 +0800 Subject: [PATCH 016/408] chore(runner): support register Signed-off-by: Bo-Yi.Wu --- go.mod | 4 +-- go.sum | 8 +++--- models/bots/runner.go | 37 +++++++++++++++++++++++-- routers/api/bots/runner/runner.go | 46 +++++++++++++++++++++++++------ 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 4b8b13ca8e191..4a753a9ae3624 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41 - gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 + gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57 + gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 gitea.com/go-chi/session v0.0.0-20211218221615-e3605d8b28b8 diff --git a/go.sum b/go.sum index 680c382a32ff1..58da3fc581d70 100644 --- a/go.sum +++ b/go.sum @@ -89,10 +89,10 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41 h1:FIGF6szYd3lBIwvbeedfU5Lc7uG1Xpzi7bkktS6Vdvg= -gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= -gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4= -gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= +gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57 h1:eVM6m3h5KpmJM2+LEqroENFaMs2kAo8QNIPyMgho9jg= +gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= +gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= gitea.com/go-chi/cache v0.2.0 h1:E0npuTfDW6CT1yD8NMDVc1SK6IeRjfmRL2zlEsCEd7w= gitea.com/go-chi/cache v0.2.0/go.mod h1:iQlVK2aKTZ/rE9UcHyz9pQWGvdP9i1eI2spOpzgCrtE= diff --git a/models/bots/runner.go b/models/bots/runner.go index 24ac953492d46..ef7f5d37737d2 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -5,6 +5,7 @@ package bots import ( + "context" "fmt" "code.gitea.io/gitea/models/db" @@ -17,11 +18,16 @@ import ( // ErrRunnerNotExist represents an error for bot runner not exist type ErrRunnerNotExist struct { - UUID string + UUID string + Token string } func (err ErrRunnerNotExist) Error() string { - return fmt.Sprintf("Bot runner [%s] is not exist", err.UUID) + if err.UUID != "" { + return fmt.Sprintf("Bot runner ID [%s] is not exist", err.UUID) + } + + return fmt.Sprintf("Bot runner token [%s] is not exist", err.Token) } // Runner represents runner machines @@ -40,6 +46,7 @@ type Runner struct { Base int // 0 native 1 docker 2 virtual machine RepoRange string // glob match which repositories could use this runner Token string + Capacity int64 LastOnline timeutil.TimeStamp `xorm:"index"` Created timeutil.TimeStamp `xorm:"created"` } @@ -128,6 +135,32 @@ func GetRunnerByUUID(uuid string) (*Runner, error) { return &runner, nil } +// GetRunnerByToken returns a bot runner via token +func GetRunnerByToken(token string) (*Runner, error) { + var runner Runner + has, err := db.GetEngine(db.DefaultContext).Where("token=?", token).Get(&runner) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunnerNotExist{ + UUID: "", + } + } + return &runner, nil +} + +// UpdateRunner updates runner's information. +func UpdateRunner(ctx context.Context, r *Runner, cols ...string) (err error) { + e := db.GetEngine(ctx) + + if len(cols) == 0 { + _, err = e.ID(r.ID).AllCols().Update(r) + } else { + _, err = e.ID(r.ID).Cols(cols...).Update(r) + } + return err +} + // FindRunnersByRepoID returns all workers for the repository func FindRunnersByRepoID(repoID int64) ([]*Runner, error) { var runners []*Runner diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index e07b7ce67a866..1a84cb7c88a5a 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -6,27 +6,55 @@ package runner import ( "context" + "errors" + bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" runnerv1 "gitea.com/gitea/proto-go/runner/v1" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" ) -type Service struct{} +type Service struct { + runnerv1connect.UnimplementedRunnerServiceHandler +} -func (s *Service) Connect( +func (s *Service) Register( ctx context.Context, - req *connect.Request[runnerv1.ConnectRequest], -) (*connect.Response[runnerv1.ConnectResponse], error) { + req *connect.Request[runnerv1.RegisterRequest], +) (*connect.Response[runnerv1.RegisterResponse], error) { log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&runnerv1.ConnectResponse{ - Stage: &runnerv1.Stage{ - RunnerUuid: "foobar", - BuildUuid: "foobar", + + token := req.Header().Get("X-Runner-Token") + log.Info("token: %v", token) + + if token == "" { + return nil, errors.New("missing runner token") + } + + runner, err := bots_model.GetRunnerByToken(token) + if err != nil { + return nil, errors.New("runner not found") + } + + // update runner information + runner.Arch = req.Msg.Arch + runner.OS = req.Msg.Os + runner.Capacity = req.Msg.Capacity + if err := bots_model.UpdateRunner(ctx, runner, []string{"arch", "os", "capacity"}...); err != nil { + return nil, errors.New("can't update runner") + } + + res := connect.NewResponse(&runnerv1.RegisterResponse{ + Runner: &runnerv1.Runner{ + Uuid: runner.UUID, + Os: req.Msg.Os, + Arch: req.Msg.Arch, + Capacity: req.Msg.Capacity, }, }) - res.Header().Set("Gitea-Version", "runnerv1") + return res, nil } From e07d416366303169fb4a2e66ab59c6a455cfee20 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Thu, 1 Sep 2022 11:03:50 +0800 Subject: [PATCH 017/408] chore(model): create build, stage, step and logs table Signed-off-by: Bo-Yi.Wu --- models/bots/build.go | 10 +++---- models/bots/build_log.go | 11 ++++--- models/bots/{build_job.go => build_stage.go} | 27 ++++++++++------- models/bots/build_step.go | 31 ++++++++++++++++++++ models/bots/runner_list.go | 6 ++-- routers/api/bots/ping/ping.go | 8 +++-- routers/web/repo/builds/builds.go | 4 +-- 7 files changed, 66 insertions(+), 31 deletions(-) rename models/bots/{build_job.go => build_stage.go} (53%) create mode 100644 models/bots/build_step.go diff --git a/models/bots/build.go b/models/bots/build.go index cd24205370f31..bfb097b3aaf7c 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -85,7 +85,7 @@ func (Build) TableName() string { } func (t *Build) HTMLURL() string { - return fmt.Sprintf("") + return "" } func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) error { @@ -132,18 +132,18 @@ func InsertBuild(t *Build, workflowsStatuses map[string]map[string]BuildStatus) return err } - var buildJobs []BuildJob + var buildStages []BuildStage for filename, workflow := range workflowsStatuses { for job, status := range workflow { - buildJobs = append(buildJobs, BuildJob{ + buildStages = append(buildStages, BuildStage{ BuildID: t.ID, Filename: filename, - Jobname: job, + Name: job, Status: status, }) } } - if err := db.Insert(ctx, buildJobs); err != nil { + if err := db.Insert(ctx, buildStages); err != nil { return err } diff --git a/models/bots/build_log.go b/models/bots/build_log.go index 93d3b695e0381..7b1e22313fd4b 100644 --- a/models/bots/build_log.go +++ b/models/bots/build_log.go @@ -13,11 +13,10 @@ import ( // BuildLog represents a build's log, every build has a standalone table type BuildLog struct { - ID int64 - BuildJobID int64 `xorm:"index"` - LineNumber int - Content string `xorm:"LONGTEXT"` - Created timeutil.TimeStamp `xorm:"created"` + ID int64 + StepID int64 `xorm:"index"` + Content string `xorm:"BINARY"` + Created timeutil.TimeStamp `xorm:"created"` } func init() { @@ -37,7 +36,7 @@ func CreateBuildLog(buildID int64) error { func GetBuildLogs(buildID, jobID int64) (logs []BuildLog, err error) { err = db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(buildID)). - Where("build_job_id=?", jobID). + Where("build_step_id=?", jobID). Find(&logs) return } diff --git a/models/bots/build_job.go b/models/bots/build_stage.go similarity index 53% rename from models/bots/build_job.go rename to models/bots/build_stage.go index 62ec3b0fd0b11..52fc0f0492270 100644 --- a/models/bots/build_job.go +++ b/models/bots/build_stage.go @@ -9,33 +9,38 @@ import ( "code.gitea.io/gitea/modules/timeutil" ) -type BuildJob struct { +type BuildStage struct { ID int64 BuildID int64 `xorm:"index"` + Number int64 + Name string + Kind string + Type string Filename string - Jobname string Status BuildStatus + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp LogToFile bool // read log from database or from storage Created timeutil.TimeStamp `xorm:"created"` } -func (bj BuildJob) TableName() string { - return "bots_build_job" +func (bj BuildStage) TableName() string { + return "bots_build_stage" } func init() { - db.RegisterModel(new(BuildJob)) + db.RegisterModel(new(BuildStage)) } -func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildJob, error) { - jobs := make(map[string]map[string]*BuildJob) - err := db.GetEngine(db.DefaultContext).Iterate(new(BuildJob), func(idx int, bean interface{}) error { - job := bean.(*BuildJob) +func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildStage, error) { + jobs := make(map[string]map[string]*BuildStage) + err := db.GetEngine(db.DefaultContext).Iterate(new(BuildStage), func(idx int, bean interface{}) error { + job := bean.(*BuildStage) _, ok := jobs[job.Filename] if !ok { - jobs[job.Filename] = make(map[string]*BuildJob) + jobs[job.Filename] = make(map[string]*BuildStage) } - jobs[job.Filename][job.Jobname] = job + jobs[job.Filename][job.Name] = job return nil }) return jobs, err diff --git a/models/bots/build_step.go b/models/bots/build_step.go new file mode 100644 index 0000000000000..050ddb29ef20d --- /dev/null +++ b/models/bots/build_step.go @@ -0,0 +1,31 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +type BuildStep struct { + ID int64 + StageID int64 `xorm:"index"` + Number int64 + Name string + Kind string + Type string + Status BuildStatus + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` +} + +func (bj BuildStep) TableName() string { + return "bots_build_step" +} + +func init() { + db.RegisterModel(new(BuildStep)) +} diff --git a/models/bots/runner_list.go b/models/bots/runner_list.go index 197865d8e2085..daf52f2c996fb 100644 --- a/models/bots/runner_list.go +++ b/models/bots/runner_list.go @@ -77,8 +77,6 @@ func (runners RunnerList) LoadAttributes(ctx context.Context) error { if err := runners.LoadOwners(ctx); err != nil { return err } - if err := runners.LoadRepos(ctx); err != nil { - return err - } - return nil + + return runners.LoadRepos(ctx) } diff --git a/routers/api/bots/ping/ping.go b/routers/api/bots/ping/ping.go index d8abe1f39ab91..42251813cfeab 100644 --- a/routers/api/bots/ping/ping.go +++ b/routers/api/bots/ping/ping.go @@ -10,11 +10,14 @@ import ( "code.gitea.io/gitea/modules/log" pingv1 "gitea.com/gitea/proto-go/ping/v1" + "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" ) -type Service struct{} +type Service struct { + pingv1connect.UnimplementedPingServiceHandler +} func (s *Service) Ping( ctx context.Context, @@ -22,10 +25,9 @@ func (s *Service) Ping( ) (*connect.Response[pingv1.PingResponse], error) { log.Info("Content-Type: %s", req.Header().Get("Content-Type")) log.Info("User-Agent: %s", req.Header().Get("User-Agent")) - log.Info("X-Gitea-Token: %s", req.Header().Get("X-Gitea-Token")) + log.Info("X-Runner-Token: %s", req.Header().Get("X-Runner-Token")) res := connect.NewResponse(&pingv1.PingResponse{ Data: fmt.Sprintf("Hello, %s!", req.Msg.Data), }) - res.Header().Set("Gitea-Version", "v1") return res, nil } diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index 7194347b25169..47c5ef82c36b8 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -118,14 +118,14 @@ func GetBuildJobLogs(ctx *context.Context) { ctx.Error(http.StatusInternalServerError, err.Error()) return } - var buildJob *bots_model.BuildJob + var buildJob *bots_model.BuildStage wf := ctx.Params("workflow") jobname := ctx.Params("jobname") LOOP_WORKFLOWS: for workflow, jobs := range workflows { if workflow == wf { for _, job := range jobs { - if jobname == job.Jobname { + if jobname == job.Name { buildJob = job break LOOP_WORKFLOWS } From 68d416bd1bb0930d8bc425318a0c239255228ec5 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Thu, 1 Sep 2022 21:44:05 +0800 Subject: [PATCH 018/408] chore(gRPC): initial request method Signed-off-by: Bo-Yi.Wu --- go.mod | 2 +- go.sum | 4 ++-- models/bots/build.go | 35 +++++++++++++++++-------------- routers/api/bots/runner/runner.go | 12 +++++------ routers/api/bots/socket.go | 4 ++-- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 4a753a9ae3624..a2594e4037890 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57 + gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 58da3fc581d70..40f69b39f112a 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57 h1:eVM6m3h5KpmJM2+LEqroENFaMs2kAo8QNIPyMgho9jg= -gitea.com/gitea/proto-go v0.0.0-20220828031749-616e40329b57/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc h1:kTVjwKxXma2yAdgXz8T1tiJihtWFK8jGLqArX2NownM= +gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/bots/build.go b/models/bots/build.go index bfb097b3aaf7c..c6d818548797b 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -27,33 +27,36 @@ func init() { } // BuildStatus represents a build status -type BuildStatus int +type BuildStatus string // enumerate all the statuses of bot build const ( - BuildPending BuildStatus = iota // wait for assign - BuildAssigned // assigned to a runner - BuildRunning // running - BuildFailed - BuildFinished - BuildCanceled - BuildTimeout + StatusSkipped BuildStatus = "skipped" + StatusBlocked BuildStatus = "blocked" + StatusDeclined BuildStatus = "declined" + StatusWaiting BuildStatus = "waiting_on_dependencies" + StatusPending BuildStatus = "pending" + StatusRunning BuildStatus = "running" + StatusPassing BuildStatus = "success" + StatusFailing BuildStatus = "failure" + StatusKilled BuildStatus = "killed" + StatusError BuildStatus = "error" ) func (status BuildStatus) IsPending() bool { - return status == BuildPending || status == BuildAssigned + return status == StatusPending } func (status BuildStatus) IsRunning() bool { - return status == BuildRunning + return status == StatusRunning } func (status BuildStatus) IsFailed() bool { - return status == BuildFailed || status == BuildCanceled || status == BuildTimeout + return status == StatusFailing || status == StatusKilled || status == StatusError } func (status BuildStatus) IsSuccess() bool { - return status == BuildFinished + return status == StatusPassing } // Build represnets bot build task @@ -99,7 +102,7 @@ func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) e Where(builder.Eq{ "repo_id": repo.ID, }.And( - builder.In("status", BuildFailed, BuildCanceled, BuildTimeout, BuildFinished), + builder.In("status", StatusFailing, StatusKilled, StatusPassing), ), ), ). @@ -193,7 +196,7 @@ func GetCurBuildByID(runnerID int64) (*Build, error) { var builds []Build err := db.GetEngine(db.DefaultContext). Where("runner_id=?", runnerID). - And("status=?", BuildPending). + And("status=?", StatusPending). Asc("created"). Find(&builds) if err != nil { @@ -260,9 +263,9 @@ func (opts FindBuildOptions) toConds() builder.Cond { cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) } if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", BuildCanceled, BuildFailed, BuildTimeout, BuildFinished)) + cond = cond.And(builder.Expr("status IN (?,?,?,?)", StatusError, StatusFailing, StatusPassing)) } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", BuildPending, BuildAssigned, BuildRunning)) + cond = cond.And(builder.Expr("status IN (?,?,?)", StatusPending, StatusRunning)) } return cond } diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 1a84cb7c88a5a..2bdcb2593a95b 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -58,14 +58,12 @@ func (s *Service) Register( return res, nil } -func (s *Service) Accept( +func (s *Service) Request( ctx context.Context, - req *connect.Request[runnerv1.AcceptRequest], -) (*connect.Response[runnerv1.AcceptResponse], error) { - log.Info("Request headers: %v", req.Header()) - res := connect.NewResponse(&runnerv1.AcceptResponse{ - JobId: 100, + req *connect.Request[runnerv1.RequestRequest], +) (*connect.Response[runnerv1.RequestResponse], error) { + res := connect.NewResponse(&runnerv1.RequestResponse{ + Stage: &runnerv1.Stage{}, }) - res.Header().Set("Gitea-Version", "runnerv1") return res, nil } diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go index 7d508192d2bce..af1563b9a2066 100644 --- a/routers/api/bots/socket.go +++ b/routers/api/bots/socket.go @@ -116,9 +116,9 @@ func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, } cols := []string{"status", "end_time"} if msg.ErrCode == 0 { - build.Status = bots_model.BuildFinished + build.Status = bots_model.StatusPassing } else { - build.Status = bots_model.BuildFailed + build.Status = bots_model.StatusFailing } build.EndTime = timeutil.TimeStampNow() if err := bots_model.UpdateBuild(build, cols...); err != nil { From eac6425b2feb2c2e58b24cbd37784b6fc3050c77 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Thu, 1 Sep 2022 22:05:51 +0800 Subject: [PATCH 019/408] chore(gRPC): support update stage and step method. Signed-off-by: Bo-Yi.Wu --- go.mod | 2 +- go.sum | 4 ++-- modules/notification/bots/bots.go | 4 ++-- routers/api/bots/runner/runner.go | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a2594e4037890..c9fa1d3327776 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc + gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134 gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 40f69b39f112a..a5721c4dcd5b0 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc h1:kTVjwKxXma2yAdgXz8T1tiJihtWFK8jGLqArX2NownM= -gitea.com/gitea/proto-go v0.0.0-20220901061207-b88901a1b9bc/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134 h1:5ofH0FGEkIj/P9a6oFDgkdmGSWow1yD1uubiftMA2Kw= +gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index f013e795f1f78..044fadb1cc68d 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -87,7 +87,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str for i, entry := range matchedEntries { taskStatuses := make(map[string]bots_model.BuildStatus) for k := range jobs[i] { - taskStatuses[k] = bots_model.BuildPending + taskStatuses[k] = bots_model.StatusPending } workflowsStatuses[entry.Name()] = taskStatuses } @@ -98,7 +98,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str TriggerUserID: doer.ID, Event: evt, EventPayload: payload, - Status: bots_model.BuildPending, + Status: bots_model.StatusPending, Ref: ref, CommitSHA: commit.ID.String(), } diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 2bdcb2593a95b..5801211d7f423 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -20,6 +20,7 @@ type Service struct { runnerv1connect.UnimplementedRunnerServiceHandler } +// Register for new runner. func (s *Service) Register( ctx context.Context, req *connect.Request[runnerv1.RegisterRequest], @@ -58,6 +59,7 @@ func (s *Service) Register( return res, nil } +// Request requests the next available build stage for execution. func (s *Service) Request( ctx context.Context, req *connect.Request[runnerv1.RequestRequest], @@ -67,3 +69,21 @@ func (s *Service) Request( }) return res, nil } + +// Update updates the build stage. +func (s *Service) Update( + ctx context.Context, + req *connect.Request[runnerv1.UpdateRequest], +) (*connect.Response[runnerv1.UpdateResponse], error) { + res := connect.NewResponse(&runnerv1.UpdateResponse{}) + return res, nil +} + +// UpdateStep updates the build step. +func (s *Service) UpdateStep( + ctx context.Context, + req *connect.Request[runnerv1.UpdateStepRequest], +) (*connect.Response[runnerv1.UpdateStepResponse], error) { + res := connect.NewResponse(&runnerv1.UpdateStepResponse{}) + return res, nil +} From ea0cf8515e25b5c5854c96fbb8f5bfef6a367be7 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 3 Sep 2022 15:58:58 +0800 Subject: [PATCH 020/408] chore(gRPC): handle requesut for stage data Signed-off-by: Bo-Yi.Wu --- models/bots/build_stage.go | 36 ++++ models/bots/build_stage_list.go | 7 + routers/api/bots/core/scheduler.go | 24 +++ routers/api/bots/grpc/runner.go | 5 +- routers/api/bots/runner/runner.go | 22 ++- routers/api/bots/scheduler/queue/queue.go | 160 ++++++++++++++++++ routers/api/bots/scheduler/queue/scheduler.go | 37 ++++ 7 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 models/bots/build_stage_list.go create mode 100644 routers/api/bots/core/scheduler.go create mode 100644 routers/api/bots/scheduler/queue/queue.go create mode 100644 routers/api/bots/scheduler/queue/scheduler.go diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index 52fc0f0492270..1f2f15f9bbafb 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -5,8 +5,12 @@ package bots import ( + "context" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" + "xorm.io/builder" ) type BuildStage struct { @@ -16,6 +20,9 @@ type BuildStage struct { Name string Kind string Type string + Machine string + OS string + Arch string Filename string Status BuildStatus Started timeutil.TimeStamp @@ -32,6 +39,35 @@ func init() { db.RegisterModel(new(BuildStage)) } +type FindStageOptions struct { + db.ListOptions + BuildID int64 + IsClosed util.OptionalBool +} + +func (opts FindStageOptions) toConds() builder.Cond { + cond := builder.NewCond() + if opts.BuildID > 0 { + cond = cond.And(builder.Eq{"build_id": opts.BuildID}) + } + if opts.IsClosed.IsTrue() { + cond = cond.And(builder.Expr("status IN (?,?,?,?)", StatusError, StatusFailing, StatusPassing)) + } else if opts.IsClosed.IsFalse() { + cond = cond.And(builder.Expr("status IN (?,?,?)", StatusPending, StatusRunning)) + } + return cond +} + +func FindStages(ctx context.Context, opts FindStageOptions) (BuildStageList, error) { + sess := db.GetEngine(ctx).Where(opts.toConds()) + if opts.ListOptions.PageSize > 0 { + skip, take := opts.GetSkipTake() + sess.Limit(take, skip) + } + var rows []*BuildStage + return rows, sess.Find(&rows) +} + func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildStage, error) { jobs := make(map[string]map[string]*BuildStage) err := db.GetEngine(db.DefaultContext).Iterate(new(BuildStage), func(idx int, bean interface{}) error { diff --git a/models/bots/build_stage_list.go b/models/bots/build_stage_list.go new file mode 100644 index 0000000000000..4137e63725b6c --- /dev/null +++ b/models/bots/build_stage_list.go @@ -0,0 +1,7 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +type BuildStageList []*BuildStage diff --git a/routers/api/bots/core/scheduler.go b/routers/api/bots/core/scheduler.go new file mode 100644 index 0000000000000..167d2b3b62020 --- /dev/null +++ b/routers/api/bots/core/scheduler.go @@ -0,0 +1,24 @@ +package core + +import ( + "context" + + runnerv1 "gitea.com/gitea/proto-go/runner/v1" +) + +type Filter struct { + Kind string + Type string + OS string + Arch string + Kernel string +} + +// Scheduler schedules Build stages for execution. +type Scheduler interface { + // Schedule schedules the stage for execution. + Schedule(context.Context, *runnerv1.Stage) error + + // Request requests the next stage scheduled for execution. + Request(context.Context, Filter) (*runnerv1.Stage, error) +} diff --git a/routers/api/bots/grpc/runner.go b/routers/api/bots/grpc/runner.go index 496820f91a87e..74c59872a7740 100644 --- a/routers/api/bots/grpc/runner.go +++ b/routers/api/bots/grpc/runner.go @@ -8,11 +8,14 @@ import ( "net/http" "code.gitea.io/gitea/routers/api/bots/runner" + "code.gitea.io/gitea/routers/api/bots/scheduler/queue" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" ) func RunnerRoute() (string, http.Handler) { - runnerService := &runner.Service{} + runnerService := &runner.Service{ + Scheduler: queue.New(), + } return runnerv1connect.NewRunnerServiceHandler( runnerService, diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 5801211d7f423..18a61c22bdae2 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -10,6 +10,7 @@ import ( bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/routers/api/bots/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -17,6 +18,8 @@ import ( ) type Service struct { + Scheduler core.Scheduler + runnerv1connect.UnimplementedRunnerServiceHandler } @@ -64,8 +67,25 @@ func (s *Service) Request( ctx context.Context, req *connect.Request[runnerv1.RequestRequest], ) (*connect.Response[runnerv1.RequestResponse], error) { + log.Debug("manager: request queue item") + + stage, err := s.Scheduler.Request(ctx, core.Filter{ + Kind: req.Msg.Kind, + Type: req.Msg.Type, + OS: req.Msg.Os, + Arch: req.Msg.Arch, + }) + if err != nil && ctx.Err() != nil { + log.Debug("manager: context canceled") + return nil, err + } + if err != nil { + log.Warn("manager: request queue item error") + return nil, err + } + res := connect.NewResponse(&runnerv1.RequestResponse{ - Stage: &runnerv1.Stage{}, + Stage: stage, }) return res, nil } diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go new file mode 100644 index 0000000000000..d8ab0c15ae2eb --- /dev/null +++ b/routers/api/bots/scheduler/queue/queue.go @@ -0,0 +1,160 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package queue + +import ( + "context" + "sync" + "time" + + "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/routers/api/bots/core" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" +) + +type worker struct { + kind string + typ string + os string + arch string + channel chan *runnerv1.Stage +} + +type queue struct { + sync.Mutex + + ready chan struct{} + paused bool + interval time.Duration + workers map[*worker]struct{} + ctx context.Context +} + +func (q *queue) Schedule(ctx context.Context, stage *runnerv1.Stage) error { + select { + case q.ready <- struct{}{}: + default: + } + return nil +} + +func (q *queue) Request(ctx context.Context, params core.Filter) (*runnerv1.Stage, error) { + w := &worker{ + kind: params.Kind, + typ: params.Type, + os: params.OS, + arch: params.Arch, + channel: make(chan *runnerv1.Stage), + } + q.Lock() + q.workers[w] = struct{}{} + q.Unlock() + + select { + case q.ready <- struct{}{}: + default: + } + + select { + case <-ctx.Done(): + q.Lock() + delete(q.workers, w) + q.Unlock() + return nil, ctx.Err() + case b := <-w.channel: + return b, nil + } +} + +func (q *queue) start() error { + for { + select { + case <-q.ctx.Done(): + return q.ctx.Err() + case <-q.ready: + _ = q.signal(q.ctx) + case <-time.After(q.interval): + _ = q.signal(q.ctx) + } + } +} + +func (q *queue) signal(ctx context.Context) error { + q.Lock() + count := len(q.workers) + pause := q.paused + q.Unlock() + if pause { + return nil + } + if count == 0 { + return nil + } + items, err := bots.FindStages(ctx, bots.FindStageOptions{}) + if err != nil { + return err + } + + q.Lock() + defer q.Unlock() + for _, item := range items { + if item.Status == bots.StatusRunning { + continue + } + if item.Machine != "" { + continue + } + + loop: + for w := range q.workers { + // the worker must match the resource kind and type + if !matchResource(w.kind, w.typ, item.Kind, item.Type) { + continue + } + + if w.os != "" || w.arch != "" { + if w.os != item.OS { + continue + } + if w.arch != item.Arch { + continue + } + } + + stage := &runnerv1.Stage{ + Id: item.ID, + BuildId: item.BuildID, + Name: item.Name, + Kind: item.Name, + Type: item.Type, + Status: string(item.Status), + Started: int64(item.Started), + Stopped: int64(item.Stopped), + } + + w.channel <- stage + delete(q.workers, w) + break loop + } + } + return nil +} + +// matchResource is a helper function that returns +func matchResource(kinda, typea, kindb, typeb string) bool { + if kinda == "" { + kinda = "pipeline" + } + if kindb == "" { + kindb = "pipeline" + } + if typea == "" { + typea = "docker" + } + if typeb == "" { + typeb = "docker" + } + return kinda == kindb && typea == typeb +} diff --git a/routers/api/bots/scheduler/queue/scheduler.go b/routers/api/bots/scheduler/queue/scheduler.go new file mode 100644 index 0000000000000..9c3100dca6366 --- /dev/null +++ b/routers/api/bots/scheduler/queue/scheduler.go @@ -0,0 +1,37 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package queue + +import ( + "context" + "time" + + "code.gitea.io/gitea/routers/api/bots/core" +) + +type scheduler struct { + *queue +} + +// New creates a new scheduler. +func New() core.Scheduler { + return scheduler{ + queue: newQueue(), + } +} + +// newQueue returns a new Queue backed by the build datastore. +func newQueue() *queue { + q := &queue{ + ready: make(chan struct{}, 1), + workers: map[*worker]struct{}{}, + interval: time.Minute, + ctx: context.Background(), + } + go func() { + _ = q.start() + }() + return q +} From 1148903d79a81c60c5b1fc7de1660a0b26be4731 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 3 Sep 2022 16:48:03 +0800 Subject: [PATCH 021/408] refactor: move build status to core package --- models/bots/build.go | 46 ++++------------------- models/bots/build_stage.go | 7 ++-- models/bots/build_step.go | 3 +- modules/notification/bots/bots.go | 9 +++-- routers/api/bots/core/status.go | 34 +++++++++++++++++ routers/api/bots/scheduler/queue/queue.go | 2 +- routers/api/bots/socket.go | 5 ++- 7 files changed, 56 insertions(+), 50 deletions(-) create mode 100644 routers/api/bots/core/status.go diff --git a/models/bots/build.go b/models/bots/build.go index c6d818548797b..f80db0c2e269d 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/routers/api/bots/core" "github.com/google/uuid" "xorm.io/builder" @@ -26,39 +27,6 @@ func init() { db.RegisterModel(new(BuildIndex)) } -// BuildStatus represents a build status -type BuildStatus string - -// enumerate all the statuses of bot build -const ( - StatusSkipped BuildStatus = "skipped" - StatusBlocked BuildStatus = "blocked" - StatusDeclined BuildStatus = "declined" - StatusWaiting BuildStatus = "waiting_on_dependencies" - StatusPending BuildStatus = "pending" - StatusRunning BuildStatus = "running" - StatusPassing BuildStatus = "success" - StatusFailing BuildStatus = "failure" - StatusKilled BuildStatus = "killed" - StatusError BuildStatus = "error" -) - -func (status BuildStatus) IsPending() bool { - return status == StatusPending -} - -func (status BuildStatus) IsRunning() bool { - return status == StatusRunning -} - -func (status BuildStatus) IsFailed() bool { - return status == StatusFailing || status == StatusKilled || status == StatusError -} - -func (status BuildStatus) IsSuccess() bool { - return status == StatusPassing -} - // Build represnets bot build task type Build struct { ID int64 @@ -75,7 +43,7 @@ type Build struct { Grant string // permissions for this task EventPayload string `xorm:"LONGTEXT"` RunnerID int64 `xorm:"index"` - Status BuildStatus `xorm:"index"` + Status core.BuildStatus `xorm:"index"` Created timeutil.TimeStamp `xorm:"created"` StartTime timeutil.TimeStamp EndTime timeutil.TimeStamp @@ -102,7 +70,7 @@ func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) e Where(builder.Eq{ "repo_id": repo.ID, }.And( - builder.In("status", StatusFailing, StatusKilled, StatusPassing), + builder.In("status", core.StatusFailing, core.StatusKilled, core.StatusPassing), ), ), ). @@ -111,7 +79,7 @@ func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) e } // InsertBuild inserts a bot build task -func InsertBuild(t *Build, workflowsStatuses map[string]map[string]BuildStatus) error { +func InsertBuild(t *Build, workflowsStatuses map[string]map[string]core.BuildStatus) error { if t.UUID == "" { t.UUID = uuid.New().String() } @@ -196,7 +164,7 @@ func GetCurBuildByID(runnerID int64) (*Build, error) { var builds []Build err := db.GetEngine(db.DefaultContext). Where("runner_id=?", runnerID). - And("status=?", StatusPending). + And("status=?", core.StatusPending). Asc("created"). Find(&builds) if err != nil { @@ -263,9 +231,9 @@ func (opts FindBuildOptions) toConds() builder.Cond { cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) } if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", StatusError, StatusFailing, StatusPassing)) + cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing)) } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", StatusPending, StatusRunning)) + cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning)) } return cond } diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index 1f2f15f9bbafb..0135959f809bc 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/routers/api/bots/core" "xorm.io/builder" ) @@ -24,7 +25,7 @@ type BuildStage struct { OS string Arch string Filename string - Status BuildStatus + Status core.BuildStatus Started timeutil.TimeStamp Stopped timeutil.TimeStamp LogToFile bool // read log from database or from storage @@ -51,9 +52,9 @@ func (opts FindStageOptions) toConds() builder.Cond { cond = cond.And(builder.Eq{"build_id": opts.BuildID}) } if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", StatusError, StatusFailing, StatusPassing)) + cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing)) } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", StatusPending, StatusRunning)) + cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning)) } return cond } diff --git a/models/bots/build_step.go b/models/bots/build_step.go index 050ddb29ef20d..15da7245809ab 100644 --- a/models/bots/build_step.go +++ b/models/bots/build_step.go @@ -7,6 +7,7 @@ package bots import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/routers/api/bots/core" ) type BuildStep struct { @@ -16,7 +17,7 @@ type BuildStep struct { Name string Kind string Type string - Status BuildStatus + Status core.BuildStatus Started timeutil.TimeStamp Stopped timeutil.TimeStamp Created timeutil.TimeStamp `xorm:"created"` diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 044fadb1cc68d..9fab742be8ea2 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -26,6 +26,7 @@ import ( "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/routers/api/bots/core" bots_service "code.gitea.io/gitea/services/bots" ) @@ -83,11 +84,11 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str return } - workflowsStatuses := make(map[string]map[string]bots_model.BuildStatus) + workflowsStatuses := make(map[string]map[string]core.BuildStatus) for i, entry := range matchedEntries { - taskStatuses := make(map[string]bots_model.BuildStatus) + taskStatuses := make(map[string]core.BuildStatus) for k := range jobs[i] { - taskStatuses[k] = bots_model.StatusPending + taskStatuses[k] = core.StatusPending } workflowsStatuses[entry.Name()] = taskStatuses } @@ -98,7 +99,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str TriggerUserID: doer.ID, Event: evt, EventPayload: payload, - Status: bots_model.StatusPending, + Status: core.StatusPending, Ref: ref, CommitSHA: commit.ID.String(), } diff --git a/routers/api/bots/core/status.go b/routers/api/bots/core/status.go new file mode 100644 index 0000000000000..70aacb3747d17 --- /dev/null +++ b/routers/api/bots/core/status.go @@ -0,0 +1,34 @@ +package core + +// BuildStatus represents a build status +type BuildStatus string + +// enumerate all the statuses of bot build +const ( + StatusSkipped BuildStatus = "skipped" + StatusBlocked BuildStatus = "blocked" + StatusDeclined BuildStatus = "declined" + StatusWaiting BuildStatus = "waiting_on_dependencies" + StatusPending BuildStatus = "pending" + StatusRunning BuildStatus = "running" + StatusPassing BuildStatus = "success" + StatusFailing BuildStatus = "failure" + StatusKilled BuildStatus = "killed" + StatusError BuildStatus = "error" +) + +func (status BuildStatus) IsPending() bool { + return status == StatusPending +} + +func (status BuildStatus) IsRunning() bool { + return status == StatusRunning +} + +func (status BuildStatus) IsFailed() bool { + return status == StatusFailing || status == StatusKilled || status == StatusError +} + +func (status BuildStatus) IsSuccess() bool { + return status == StatusPassing +} diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go index d8ab0c15ae2eb..fd135d91bb679 100644 --- a/routers/api/bots/scheduler/queue/queue.go +++ b/routers/api/bots/scheduler/queue/queue.go @@ -100,7 +100,7 @@ func (q *queue) signal(ctx context.Context) error { q.Lock() defer q.Unlock() for _, item := range items { - if item.Status == bots.StatusRunning { + if item.Status == core.StatusRunning { continue } if item.Machine != "" { diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go index af1563b9a2066..1799fd0fa7c02 100644 --- a/routers/api/bots/socket.go +++ b/routers/api/bots/socket.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/routers/api/bots/core" "github.com/gorilla/websocket" ) @@ -116,9 +117,9 @@ func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, } cols := []string{"status", "end_time"} if msg.ErrCode == 0 { - build.Status = bots_model.StatusPassing + build.Status = core.StatusPassing } else { - build.Status = bots_model.StatusFailing + build.Status = core.StatusFailing } build.EndTime = timeutil.TimeStampNow() if err := bots_model.UpdateBuild(build, cols...); err != nil { From 825591535055aba5859bcb229e8df502ab260508 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 3 Sep 2022 17:09:40 +0800 Subject: [PATCH 022/408] chore: move core package to top folder. Signed-off-by: Bo-Yi.Wu --- {routers/api/bots/core => core}/scheduler.go | 0 {routers/api/bots/core => core}/status.go | 0 models/bots/build.go | 2 +- models/bots/build_stage.go | 2 +- models/bots/build_step.go | 2 +- modules/notification/bots/bots.go | 2 +- routers/api/bots/runner/runner.go | 2 +- routers/api/bots/scheduler/queue/queue.go | 2 +- routers/api/bots/scheduler/queue/scheduler.go | 2 +- routers/api/bots/socket.go | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename {routers/api/bots/core => core}/scheduler.go (100%) rename {routers/api/bots/core => core}/status.go (100%) diff --git a/routers/api/bots/core/scheduler.go b/core/scheduler.go similarity index 100% rename from routers/api/bots/core/scheduler.go rename to core/scheduler.go diff --git a/routers/api/bots/core/status.go b/core/status.go similarity index 100% rename from routers/api/bots/core/status.go rename to core/status.go diff --git a/models/bots/build.go b/models/bots/build.go index f80db0c2e269d..5edb396583935 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" @@ -16,7 +17,6 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/bots/core" "github.com/google/uuid" "xorm.io/builder" diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index 0135959f809bc..1b8a2f389bac7 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -7,10 +7,10 @@ package bots import ( "context" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/bots/core" "xorm.io/builder" ) diff --git a/models/bots/build_step.go b/models/bots/build_step.go index 15da7245809ab..4e3e3b12bfbb9 100644 --- a/models/bots/build_step.go +++ b/models/bots/build_step.go @@ -5,9 +5,9 @@ package bots import ( + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/routers/api/bots/core" ) type BuildStep struct { diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 9fab742be8ea2..7ceab1e70a66f 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -9,6 +9,7 @@ import ( "encoding/json" "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" @@ -26,7 +27,6 @@ import ( "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/bots/core" bots_service "code.gitea.io/gitea/services/bots" ) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 18a61c22bdae2..c1f8083519681 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -8,9 +8,9 @@ import ( "context" "errors" + "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/routers/api/bots/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go index fd135d91bb679..66730f55a78e6 100644 --- a/routers/api/bots/scheduler/queue/queue.go +++ b/routers/api/bots/scheduler/queue/queue.go @@ -9,8 +9,8 @@ import ( "sync" "time" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/routers/api/bots/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) diff --git a/routers/api/bots/scheduler/queue/scheduler.go b/routers/api/bots/scheduler/queue/scheduler.go index 9c3100dca6366..b0dc6b17bfa40 100644 --- a/routers/api/bots/scheduler/queue/scheduler.go +++ b/routers/api/bots/scheduler/queue/scheduler.go @@ -8,7 +8,7 @@ import ( "context" "time" - "code.gitea.io/gitea/routers/api/bots/core" + "code.gitea.io/gitea/core" ) type scheduler struct { diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go index 1799fd0fa7c02..370b39fb1fff8 100644 --- a/routers/api/bots/socket.go +++ b/routers/api/bots/socket.go @@ -11,11 +11,11 @@ import ( "strings" "time" + "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/routers/api/bots/core" "github.com/gorilla/websocket" ) From db02603882632ab175385e08bfffcd538df3ddf3 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 5 Sep 2022 10:53:07 +0800 Subject: [PATCH 023/408] Fix bug --- models/bots/build.go | 2 +- models/bots/build_stage.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/bots/build.go b/models/bots/build.go index 5edb396583935..1333fa586f114 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -233,7 +233,7 @@ func (opts FindBuildOptions) toConds() builder.Cond { if opts.IsClosed.IsTrue() { cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing)) } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning)) + cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusWaiting, core.StatusPending, core.StatusRunning)) } return cond } diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index 1b8a2f389bac7..c6c6e12b107d6 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -52,7 +52,7 @@ func (opts FindStageOptions) toConds() builder.Cond { cond = cond.And(builder.Eq{"build_id": opts.BuildID}) } if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing)) + cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing, core.StatusKilled)) } else if opts.IsClosed.IsFalse() { cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning)) } From fb738c41920392038ff3188d7bb589520ed465f6 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sun, 4 Sep 2022 15:18:32 +0800 Subject: [PATCH 024/408] chore(runner): support fetch detail stage data Signed-off-by: Bo-Yi.Wu --- core/scheduler.go | 3 ++ go.sum | 2 + models/bots/build.go | 28 +++++++++++++- models/bots/build_stage.go | 31 ++++++++++++++++ modules/notification/bots/bots.go | 2 +- routers/api/bots/runner/runner.go | 61 +++++++++++++++++++++++++++++++ routers/web/repo/builds/builds.go | 2 +- 7 files changed, 125 insertions(+), 4 deletions(-) diff --git a/core/scheduler.go b/core/scheduler.go index 167d2b3b62020..afbceecc5f2a2 100644 --- a/core/scheduler.go +++ b/core/scheduler.go @@ -2,10 +2,13 @@ package core import ( "context" + "errors" runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) +var ErrDataLock = errors.New("Data Lock Error") + type Filter struct { Kind string Type string diff --git a/go.sum b/go.sum index a5721c4dcd5b0..3693d28d722d3 100644 --- a/go.sum +++ b/go.sum @@ -91,6 +91,8 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134 h1:5ofH0FGEkIj/P9a6oFDgkdmGSWow1yD1uubiftMA2Kw= gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20220903092234-20f71c2df67e h1:xlNITjAs+Ce6QR4mo0BvHTzTdkpqgS7zwfLpEi31mIM= +gitea.com/gitea/proto-go v0.0.0-20220903092234-20f71c2df67e/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/bots/build.go b/models/bots/build.go index 1333fa586f114..9899d88199b0d 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -8,6 +8,7 @@ import ( "context" "errors" "fmt" + "strconv" "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" @@ -30,7 +31,7 @@ func init() { // Build represnets bot build task type Build struct { ID int64 - Title string + Name string UUID string `xorm:"CHAR(36)"` Index int64 `xorm:"index unique(repo_index)"` RepoID int64 `xorm:"index unique(repo_index)"` @@ -138,11 +139,20 @@ func UpdateBuild(t *Build, cols ...string) error { type ErrBuildNotExist struct { RepoID int64 Index int64 + ID int64 UUID string } func (err ErrBuildNotExist) Error() string { - return fmt.Sprintf("Bot build [%s] is not exist", err.UUID) + uuid := "" + if err.UUID != "" { + uuid = err.UUID + } + + if err.ID != 0 { + uuid = strconv.FormatInt(err.ID, 10) + } + return fmt.Sprintf("build [%s] is not exist", uuid) } // GetBuildByUUID gets bot build by uuid @@ -159,6 +169,20 @@ func GetBuildByUUID(buildUUID string) (*Build, error) { return &build, nil } +func GetBuildByID(id int64) (*Build, error) { + var build Build + has, err := db.GetEngine(db.DefaultContext).Where("id=?", id).Get(&build) + if err != nil { + return nil, err + } else if !has { + return nil, ErrBuildNotExist{ + ID: id, + } + } + + return &build, nil +} + // GetCurBuildByID return the build for the bot func GetCurBuildByID(runnerID int64) (*Build, error) { var builds []Build diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index c6c6e12b107d6..d0c5827436161 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -6,6 +6,7 @@ package bots import ( "context" + "fmt" "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" @@ -29,7 +30,9 @@ type BuildStage struct { Started timeutil.TimeStamp Stopped timeutil.TimeStamp LogToFile bool // read log from database or from storage + Version int `xorm:"version"` Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` } func (bj BuildStage) TableName() string { @@ -69,6 +72,34 @@ func FindStages(ctx context.Context, opts FindStageOptions) (BuildStageList, err return rows, sess.Find(&rows) } +// GetStageByID gets build stage by id +func GetStageByID(id int64) (*BuildStage, error) { + var build BuildStage + has, err := db.GetEngine(db.DefaultContext).Where("id=?", id).Get(&build) + if err != nil { + return nil, err + } else if !has { + return nil, ErrBuildStageNotExist{ + ID: id, + } + } + return &build, nil +} + +// ErrBuildNotExist represents an error for bot build not exist +type ErrBuildStageNotExist struct { + ID int64 +} + +func (err ErrBuildStageNotExist) Error() string { + return fmt.Sprintf("build stage [%d] is not exist", err.ID) +} + +// UpdateBuildStage updates build stage +func UpdateBuildStage(t *BuildStage, cols ...string) (int64, error) { + return db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) +} + func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildStage, error) { jobs := make(map[string]map[string]*BuildStage) err := db.GetEngine(db.DefaultContext).Iterate(new(BuildStage), func(idx int, bean interface{}) error { diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 7ceab1e70a66f..6c25dbd481653 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -94,7 +94,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str } build := bots_model.Build{ - Title: commit.Message(), + Name: commit.Message(), RepoID: repo.ID, TriggerUserID: doer.ID, Event: evt, diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index c1f8083519681..abb7caa9497af 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/log" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -90,6 +91,66 @@ func (s *Service) Request( return res, nil } +// Details fetches build details +func (s *Service) Detail( + ctx context.Context, + req *connect.Request[runnerv1.DetailRequest], +) (*connect.Response[runnerv1.DetailResponse], error) { + log.Info("stag id %d", req.Msg.Stage.Id) + + // fetch stage data + stage, err := bots_model.GetStageByID(req.Msg.Stage.Id) + if err != nil { + return nil, err + } + + stage.Machine = req.Msg.Stage.Machine + stage.Status = core.StatusPending + + count, err := bots_model.UpdateBuildStage(stage, "machine", "status") + if err != nil { + return nil, err + } + if count != 1 { + return nil, core.ErrDataLock + } + + // fetch build data + build, err := bots_model.GetBuildByID(stage.BuildID) + if err != nil { + return nil, err + } + + // fetch repo data + repo, err := repo_model.GetRepositoryByID(build.RepoID) + if err != nil { + return nil, err + } + + res := connect.NewResponse(&runnerv1.DetailResponse{ + Stage: &runnerv1.Stage{ + Id: stage.ID, + BuildId: stage.BuildID, + Name: stage.Name, + Kind: stage.Kind, + Type: stage.Type, + Status: string(stage.Status), + Started: int64(stage.Started), + Stopped: int64(stage.Stopped), + Machine: stage.Machine, + }, + Build: &runnerv1.Build{ + Id: build.ID, + Name: build.Name, + }, + Repo: &runnerv1.Repo{ + Id: repo.ID, + Name: repo.Name, + }, + }) + return res, nil +} + // Update updates the build stage. func (s *Service) Update( ctx context.Context, diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index 47c5ef82c36b8..7058661dba3fa 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -92,7 +92,7 @@ func ViewBuild(ctx *context.Context) { return } - ctx.Data["Title"] = build.Title + " - " + ctx.Tr("repo.builds") + ctx.Data["Name"] = build.Name + " - " + ctx.Tr("repo.builds") ctx.Data["PageIsBuildList"] = true ctx.Data["Build"] = build statuses, err := bots_model.GetBuildWorkflows(build.ID) From 5f0cb6b9e5088153fe73ceb605e994b767064714 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 29 Sep 2022 16:30:17 +0800 Subject: [PATCH 025/408] fix merge --- models/migrations/migrations.go | 4 +++ models/migrations/v-dev.go | 61 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 models/migrations/v-dev.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index a48c837e8b258..605303bbe2f4d 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -443,6 +443,10 @@ var migrations = []Migration{ NewMigration("Add package cleanup rule table", v1_19.CreatePackageCleanupRuleTable), // v235 -> v236 NewMigration("Add index for access_token", v1_19.AddIndexForAccessToken), + + + // in dev + NewMigration("Add bots tables", addBotTables), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v-dev.go b/models/migrations/v-dev.go new file mode 100644 index 0000000000000..23695cf5e412c --- /dev/null +++ b/models/migrations/v-dev.go @@ -0,0 +1,61 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/xorm" +) + +func addBotTables(x *xorm.Engine) error { + type BotsRunner struct { + ID int64 + UUID string `xorm:"CHAR(36) UNIQUE"` + Name string `xorm:"VARCHAR(32) UNIQUE"` + OS string `xorm:"VARCHAR(16) index"` // the runner running os + Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture + Type string `xorm:"VARCHAR(16)"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Description string `xorm:"TEXT"` + Base int // 0 native 1 docker 2 virtual machine + RepoRange string // glob match which repositories could use this runner + Token string + LastOnline timeutil.TimeStamp `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + } + + type BotsBuild struct { + ID int64 + Title string + UUID string `xorm:"CHAR(36)"` + Index int64 `xorm:"index unique(repo_index)"` + RepoID int64 `xorm:"index unique(repo_index)"` + TriggerUserID int64 + Ref string + CommitSHA string + Event string + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + RunnerID int64 `xorm:"index"` + Status int `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Updated timeutil.TimeStamp `xorm:"updated"` + } + + type Repository struct { + NumBuilds int `xorm:"NOT NULL DEFAULT 0"` + NumClosedBuilds int `xorm:"NOT NULL DEFAULT 0"` + } + + type BotsBuildIndex db.ResourceIndex + + return x.Sync2(new(BotsRunner), new(BotsBuild), new(Repository), new(BotsBuildIndex)) +} From 4f2330623efdb1bd689b03aacc217c262544d24c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 30 Sep 2022 00:06:59 +0800 Subject: [PATCH 026/408] view logs --- routers/web/dev/buildview.go | 11 + routers/web/web.go | 2 +- templates/dev/buildview.tmpl | 7 + web_src/js/components/RepoBuildView.vue | 313 ++++++++++++++++++++++++ web_src/js/index.js | 2 + web_src/js/svg.js | 2 + 6 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 routers/web/dev/buildview.go create mode 100644 templates/dev/buildview.tmpl create mode 100644 web_src/js/components/RepoBuildView.vue diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go new file mode 100644 index 0000000000000..a4361c848e07c --- /dev/null +++ b/routers/web/dev/buildview.go @@ -0,0 +1,11 @@ +package dev + +import ( + "net/http" + + "code.gitea.io/gitea/modules/context" +) + +func BuildView(ctx *context.Context) { + ctx.HTML(http.StatusOK, "dev/buildview") +} diff --git a/routers/web/web.go b/routers/web/web.go index 1b2b53e5e22f6..86b2fa2b43457 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -661,7 +661,7 @@ func RegisterRoutes(m *web.Route) { m.Post("/{username}", reqSignIn, context_service.UserAssignmentWeb(), user.Action) if !setting.IsProd { - m.Any("/dev/termdemo", dev.TermDemo) + m.Get("/dev/buildview", dev.BuildView) } reqRepoAdmin := context.RequireRepoAdmin() diff --git a/templates/dev/buildview.tmpl b/templates/dev/buildview.tmpl new file mode 100644 index 0000000000000..bd5ef151ba0bd --- /dev/null +++ b/templates/dev/buildview.tmpl @@ -0,0 +1,7 @@ +{{template "base/head" .}} + +
    + +
    + +{{template "base/footer" .}} diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue new file mode 100644 index 0000000000000..dbd88baacc714 --- /dev/null +++ b/web_src/js/components/RepoBuildView.vue @@ -0,0 +1,313 @@ + + + + + + + diff --git a/web_src/js/index.js b/web_src/js/index.js index f4638a60e09a7..780eff0980376 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -90,6 +90,7 @@ import {initRepoCommentForm, initRepository} from './features/repo-legacy.js'; import {initFormattingReplacements} from './features/formatting.js'; import {initMcaptcha} from './features/mcaptcha.js'; import {initCopyContent} from './features/copycontent.js'; +import {initRepositoryBuildView} from './components/RepoBuildView.vue'; // Run time-critical code as soon as possible. This is safe to do because this // script appears at the end of and rendered HTML is accessible at that point. @@ -187,6 +188,7 @@ $(document).ready(() => { initRepoTopicBar(); initRepoWikiForm(); initRepository(); + initRepositoryBuildView(); initCommitStatuses(); initMcaptcha(); diff --git a/web_src/js/svg.js b/web_src/js/svg.js index dedc126303a75..0e2b3f216c168 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -24,6 +24,7 @@ import octiconTriangleDown from '../../public/img/svg/octicon-triangle-down.svg' import octiconFile from '../../public/img/svg/octicon-file.svg'; import octiconSidebarExpand from '../../public/img/svg/octicon-sidebar-expand.svg'; import octiconSidebarCollapse from '../../public/img/svg/octicon-sidebar-collapse.svg'; +import octiconCheckCircleFill from '../../public/img/svg/octicon-check-circle-fill.svg'; export const svgs = { @@ -53,6 +54,7 @@ export const svgs = { 'octicon-diff-modified': octiconDiffModified, 'octicon-diff-removed': octiconDiffRemoved, 'octicon-diff-renamed': octiconDiffRenamed, + 'octicon-check-circle-fill': octiconCheckCircleFill, }; From 7ba22b740f11549c14d7d899e7bc93ec065e11d0 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 30 Sep 2022 01:09:56 +0800 Subject: [PATCH 027/408] view logs --- web_src/js/components/RepoBuildView.vue | 162 ++++++++++++++++-------- web_src/js/svg.js | 4 + 2 files changed, 111 insertions(+), 55 deletions(-) diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index dbd88baacc714..a56fd02a0d555 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -9,7 +9,11 @@
    - {{ job.name }} + + + + + {{ job.name }}
    @@ -24,19 +28,23 @@ {{ currentJobInfo.detail }}
    -
    -
    -
    - - - - - - {{ jobStage.summary }} +
    +
    +
    + + + + + + + + + {{ jobStep.summary }} + {{ Math.round(jobStep.duration/1000) }}s
    -
    +
    - -
    @@ -89,16 +90,19 @@ const sfc = { }, mounted() { + // TODO: the parent element's full height doesn't work well now const elBodyDiv = document.querySelector('body > div.full.height'); elBodyDiv.style.height = '100%'; this.loadJobData(); }, methods: { + // get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group` stepLogsGetActiveContainer(idx) { const el = this.$refs.elJobStepLogs[idx]; return el._stepLogsActiveContainer ?? el; }, + // begin a log group stepLogsGroupBegin(idx) { const el = this.$refs.elJobStepLogs[idx]; @@ -115,11 +119,13 @@ const sfc = { elJobLogGroup.appendChild(elJobLogList); el._stepLogsActiveContainer = elJobLogList; }, + // end a log group stepLogsGroupEnd(idx) { const el = this.$refs.elJobStepLogs[idx]; el._stepLogsActiveContainer = null; }, + // show/hide the step logs for a step toggleStepLogs(idx) { this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; }, @@ -152,6 +158,9 @@ const sfc = { } }, + // the respData has the fields + // stateData: it's stored into Vue data and used to update the UI state + // logsData: the logs in it will be appended to the UI manually, no touch to Vue data fetchMockData(reqData) { const stateData = { buildInfo: {title: 'The Demo Build'}, @@ -167,7 +176,11 @@ const sfc = { {summary: 'Job Step 4', duration: 3000, status: 'waiting'}, ], }; - const logsData = {streamingLogs: []}; + const logsData = { + streamingLogs: [ + // {stepIndex: 0, lines: [{t: timestamp, ln: lineNumber, m: message}, ...]}, + ] + }; for (const reqCursor of reqData.stepLogCursors) { if (!reqCursor.expanded) continue; @@ -177,10 +190,9 @@ const sfc = { const lines = []; for (let i = 0; i < 110; i++) { lines.push({ - ln: cursor+0, // line number + ln: cursor, // demo only, use cursor for line number m: `hello world ${Date.now()}, cursor: ${cursor}`, t: Date.now(), - d: 3000, // duration }); cursor++; } @@ -199,23 +211,33 @@ const sfc = { if (this.loading) return; this.loading = true; - const stepLogCursors = this.currentJobStepsStates.map((it, idx) => {return {stepIndex: idx, cursor: it.cursor, expanded: it.expanded}}); + const stepLogCursors = this.currentJobStepsStates.map((it, idx) => { + // cursor is used to indicate the last position of the logs + // it's only used by backend, frontend just reads it and passes it back, it and can be any type. + // for example: make cursor=null means the first time to fetch logs, cursor=eof means no more logs, etc + return {stepIndex: idx, cursor: it.cursor, expanded: it.expanded}; + }); const reqData = {stepLogCursors}; // const data = await this.fetchJobData(); - const data = this.fetchMockData(reqData); + const respData = this.fetchMockData(reqData); - console.log('loadJobData', data); + // console.log('loadJobData by request', reqData, ', get response ', respData); - for (const [key, value] of Object.entries(data.stateData)) { + // save the stateData to Vue data, then the UI will be updated + for (const [key, value] of Object.entries(respData.stateData)) { this[key] = value; } + + // sync the currentJobStepsStates to store the job step states for (let i = 0; i < this.currentJobSteps.length; i++) { if (!this.currentJobStepsStates[i]) { - this.$set(this.currentJobStepsStates, i, {cursor: null, expanded: false}); + this.$set(this.currentJobStepsStates, i, {cursor: null, expanded: false}); // array must use $set } } - for (const [_, logs] of data.logsData.streamingLogs.entries()) { + // append logs to the UI + for (const logs of respData.logsData.streamingLogs) { + // save the cursor, it will be passed to backend next time this.currentJobStepsStates[logs.stepIndex].cursor = logs.cursor; this.appendLogs(logs.stepIndex, logs.lines); } From 0abbc2b50f52530946ed05f7e5f218a399ae75e1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 30 Sep 2022 12:26:59 +0800 Subject: [PATCH 029/408] log color --- package-lock.json | 61 +++++++++++++++++++++++++ package.json | 1 + web_src/js/components/RepoBuildView.vue | 10 +++- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9c649c9de93c..d70d6bf47dae1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@primer/octicons": "17.9.0", "@vue/compiler-sfc": "3.2.45", "add-asset-webpack-plugin": "2.0.1", + "ansi-to-html": "0.7.2", "css-loader": "6.7.2", "dropzone": "6.0.0-beta.2", "easymde": "2.18.0", @@ -1682,6 +1683,41 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/ansi-to-html": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz", + "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==", + "dependencies": { + "entities": "^2.2.0" + }, + "bin": { + "ansi-to-html": "bin/ansi-to-html" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/ansi-to-html/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -11098,6 +11134,31 @@ "color-convert": "^2.0.1" } }, + "ansi-to-html": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz", + "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==", + "requires": { + "entities": "^2.2.0" + }, + "dependencies": { + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + } + } + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", diff --git a/package.json b/package.json index 15c2601cd7aa8..6135ba62f0af1 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@primer/octicons": "17.9.0", "@vue/compiler-sfc": "3.2.45", "add-asset-webpack-plugin": "2.0.1", + "ansi-to-html": "0.7.2", "css-loader": "6.7.2", "dropzone": "6.0.0-beta.2", "easymde": "2.18.0", diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index 49a0c749fdd9d..e7812578a3a19 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -68,6 +68,7 @@ From 5093d6b48ea4fae05b743063639994b2c933a907 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 8 Oct 2022 12:05:23 +0800 Subject: [PATCH 034/408] chore: fix mods --- assets/go-licenses.json | 105 ++++++ go.mod | 6 +- go.sum | 596 +----------------------------- modules/notification/bots/bots.go | 3 +- 4 files changed, 117 insertions(+), 593 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index c4b62475fd4bc..b392b5b844dd4 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -24,6 +24,11 @@ "path": "git.sr.ht/~mariusor/go-xsd-duration/LICENSE", "licenseText": "MIT License\n\nCopyright (c) 2019 Go xsd:duration\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, + { + "name": "gitea.com/gitea/proto-go", + "path": "gitea.com/gitea/proto-go/LICENSE", + "licenseText": "MIT License\n\nCopyright (c) \u003cyear\u003e \u003ccopyright holders\u003e\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" + }, { "name": "gitea.com/go-chi/binding", "path": "gitea.com/go-chi/binding/LICENSE", @@ -69,6 +74,11 @@ "path": "github.com/NYTimes/gziphandler/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2016-2017 The New York Times Company\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "github.com/ProtonMail/go-crypto", + "path": "github.com/ProtonMail/go-crypto/LICENSE", + "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "github.com/RoaringBitmap/roaring", "path": "github.com/RoaringBitmap/roaring/LICENSE", @@ -199,6 +209,21 @@ "path": "github.com/bradfitz/gomemcache/memcache/LICENSE", "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "github.com/bufbuild/connect-go", + "path": "github.com/bufbuild/connect-go/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2021-2022 Buf Technologies, Inc.\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, + { + "name": "github.com/bufbuild/connect-grpchealth-go", + "path": "github.com/bufbuild/connect-grpchealth-go/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2022 Buf Technologies, Inc.\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, + { + "name": "github.com/bufbuild/connect-grpcreflect-go", + "path": "github.com/bufbuild/connect-grpcreflect-go/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2022 Buf Technologies, Inc.\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, { "name": "github.com/buildkite/terminal-to-html/v3", "path": "github.com/buildkite/terminal-to-html/v3/LICENSE", @@ -224,6 +249,11 @@ "path": "github.com/cloudflare/cfssl/LICENSE", "licenseText": "Copyright (c) 2014 CloudFlare Inc.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\nRedistributions of source code must retain the above copyright notice,\nthis list of conditions and the following disclaimer.\n\nRedistributions in binary form must reproduce the above copyright notice,\nthis list of conditions and the following disclaimer in the documentation\nand/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nHOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\nPROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\nLIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "github.com/cloudflare/circl", + "path": "github.com/cloudflare/circl/LICENSE", + "licenseText": "Copyright (c) 2019 Cloudflare. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Cloudflare nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n========================================================================\n\nCopyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "github.com/couchbase/go-couchbase", "path": "github.com/couchbase/go-couchbase/LICENSE", @@ -294,6 +324,11 @@ "path": "github.com/editorconfig/editorconfig-core-go/v2/LICENSE", "licenseText": "MIT License\nCopyright (c) 2016 The Editorconfig Team\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" }, + { + "name": "github.com/emirpasic/gods", + "path": "github.com/emirpasic/gods/LICENSE", + "licenseText": "Copyright (c) 2015, Emir Pasic\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n-------------------------------------------------------------------------------\n\nAVL Tree:\n\nCopyright (c) 2017 Benjamin Scher Purcell \u003cbenjapurcell@gmail.com\u003e\n\nPermission to use, copy, modify, and distribute this software for any\npurpose with or without fee is hereby granted, provided that the above\ncopyright notice and this permission notice appear in all copies.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES\nWITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\nMERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR\nANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF\nOR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" + }, { "name": "github.com/ethantkoenig/rupture", "path": "github.com/ethantkoenig/rupture/LICENSE", @@ -359,6 +394,26 @@ "path": "github.com/go-fed/httpsig/LICENSE", "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2018, go-fed\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n contributors may be used to endorse or promote products derived from\n this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "github.com/go-git/gcfg", + "path": "github.com/go-git/gcfg/LICENSE", + "licenseText": "Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go\nAuthors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, + { + "name": "github.com/go-git/go-billy/v5", + "path": "github.com/go-git/go-billy/v5/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2017 Sourced Technologies S.L.\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, + { + "name": "github.com/go-git/go-git/v5", + "path": "github.com/go-git/go-git/v5/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2018 Sourced Technologies, S.L.\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, + { + "name": "github.com/go-ini/ini", + "path": "github.com/go-ini/ini/LICENSE", + "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n Copyright 2014 Unknwon\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, { "name": "github.com/go-ldap/ldap/v3", "path": "github.com/go-ldap/ldap/v3/LICENSE", @@ -484,6 +539,11 @@ "path": "github.com/gorilla/sessions/LICENSE", "licenseText": "Copyright (c) 2012-2018 The Gorilla Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n\t * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n\t * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\t * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "github.com/gorilla/websocket", + "path": "github.com/gorilla/websocket/LICENSE", + "licenseText": "Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "github.com/hashicorp/go-cleanhttp", "path": "github.com/hashicorp/go-cleanhttp/LICENSE", @@ -509,11 +569,21 @@ "path": "github.com/huandu/xstrings/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Huan Du\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" }, + { + "name": "github.com/imdario/mergo", + "path": "github.com/imdario/mergo/LICENSE", + "licenseText": "Copyright (c) 2013 Dario Castañé. All rights reserved.\nCopyright (c) 2012 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "github.com/jaytaylor/html2text", "path": "github.com/jaytaylor/html2text/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Jay Taylor\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" }, + { + "name": "github.com/jbenet/go-context/io", + "path": "github.com/jbenet/go-context/io/LICENSE", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Juan Batiz-Benet\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" + }, { "name": "github.com/josharian/intern", "path": "github.com/josharian/intern/license.md", @@ -529,6 +599,11 @@ "path": "github.com/kballard/go-shellquote/LICENSE", "licenseText": "Copyright (C) 2014 Kevin Ballard\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the \"Software\"),\nto deal in the Software without restriction, including without limitation\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\nand/or sell copies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\nOF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE\nOR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" }, + { + "name": "github.com/kevinburke/ssh_config", + "path": "github.com/kevinburke/ssh_config/LICENSE", + "licenseText": "Copyright (c) 2017 Kevin Burke.\n\nPermission is hereby granted, free of charge, to any person\nobtaining a copy of this software and associated documentation\nfiles (the \"Software\"), to deal in the Software without\nrestriction, including without limitation the rights to use,\ncopy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following\nconditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\nOF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\nHOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nWHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\nOTHER DEALINGS IN THE SOFTWARE.\n\n===================\n\nThe lexer and parser borrow heavily from github.com/pelletier/go-toml. The\nlicense for that project is copied below.\n\nThe MIT License (MIT)\n\nCopyright (c) 2013 - 2017 Thomas Pelletier, Eric Anderton\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + }, { "name": "github.com/keybase/go-crypto", "path": "github.com/keybase/go-crypto/LICENSE", @@ -654,6 +729,11 @@ "path": "github.com/modern-go/reflect2/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "github.com/nektos/act/pkg", + "path": "github.com/nektos/act/pkg/LICENSE", + "licenseText": "MIT License\n\nCopyright (c) 2019\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + }, { "name": "github.com/nfnt/resize", "path": "github.com/nfnt/resize/LICENSE", @@ -754,6 +834,11 @@ "path": "github.com/sergi/go-diff/diffmatchpatch/LICENSE", "licenseText": "Copyright (c) 2012-2016 The go-diff Authors. All rights reserved.\n\nPermission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the \"Software\"),\nto deal in the Software without restriction, including without limitation\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\nand/or sell copies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\nDEALINGS IN THE SOFTWARE.\n\n" }, + { + "name": "github.com/sirupsen/logrus", + "path": "github.com/sirupsen/logrus/LICENSE", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Simon Eskildsen\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" + }, { "name": "github.com/ssor/bom", "path": "github.com/ssor/bom/LICENSE", @@ -809,6 +894,11 @@ "path": "github.com/xanzy/go-gitlab/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright {yyyy} {name of copyright owner}\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "github.com/xanzy/ssh-agent", + "path": "github.com/xanzy/ssh-agent/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright {yyyy} {name of copyright owner}\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n\n" + }, { "name": "github.com/yohcop/openid-go", "path": "github.com/yohcop/openid-go/LICENSE", @@ -894,6 +984,16 @@ "path": "golang.org/x/time/rate/LICENSE", "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "google.golang.org/genproto/googleapis/rpc/status", + "path": "google.golang.org/genproto/googleapis/rpc/status/LICENSE", + "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, + { + "name": "google.golang.org/grpc", + "path": "google.golang.org/grpc/LICENSE", + "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, { "name": "google.golang.org/protobuf", "path": "google.golang.org/protobuf/LICENSE", @@ -909,6 +1009,11 @@ "path": "gopkg.in/ini.v1/LICENSE", "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n Copyright 2014 Unknwon\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "gopkg.in/warnings.v0", + "path": "gopkg.in/warnings.v0/LICENSE", + "licenseText": "Copyright (c) 2016 Péter Surányi.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "gopkg.in/yaml.v2", "path": "gopkg.in/yaml.v2/LICENSE", diff --git a/go.mod b/go.mod index c9fa1d3327776..70e919e1eac35 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134 + gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -76,7 +76,7 @@ require ( github.com/microcosm-cc/bluemonday v1.0.20 github.com/minio/minio-go/v7 v7.0.39 github.com/msteinert/pam v1.1.0 - github.com/nektos/act v0.2.24 + github.com/nektos/act v0.2.32 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/niklasfasching/go-org v1.6.5 github.com/oliamb/cutter v0.2.2 @@ -178,7 +178,7 @@ require ( github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect - github.com/go-ini/ini v1.62.0 // indirect + github.com/go-ini/ini v1.67.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect github.com/go-openapi/inflect v0.19.0 // indirect diff --git a/go.sum b/go.sum index 3693d28d722d3..6f8c55c0c3a02 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,8 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= -cloud.google.com/go v0.25.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.31.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.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= @@ -15,7 +11,6 @@ cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= @@ -73,7 +68,6 @@ code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFj code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4HyUcuHFfDsk/QuwO+wf+Y99RYdxY0= code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= -code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 h1:TXbikPqa7YRtfU9vS6QJBg77pUvbEb6StRdZO8t1bEY= @@ -85,14 +79,10 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EU contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134 h1:5ofH0FGEkIj/P9a6oFDgkdmGSWow1yD1uubiftMA2Kw= -gitea.com/gitea/proto-go v0.0.0-20220901135226-82a982903134/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= -gitea.com/gitea/proto-go v0.0.0-20220903092234-20f71c2df67e h1:xlNITjAs+Ce6QR4mo0BvHTzTdkpqgS7zwfLpEi31mIM= -gitea.com/gitea/proto-go v0.0.0-20220903092234-20f71c2df67e/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 h1:SKAZ2Fnay8Yx1Yw1BSU/ATEk3/WAFL/lMXhvBBVzyu4= +gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= @@ -113,60 +103,23 @@ github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 h1:r3qt8PCHnfjOv9PN3H github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121/go.mod h1:Ock8XgA7pvULhIaHGAk/cDnRfNrF9Jey81nPcc403iU= github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U= github.com/6543/go-version v1.3.1/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo= -github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod h1:0mMDvQFeLbbn1Wy8P2j3hwFhqBq+FKn8OZPno8WLmp8= -github.com/AlecAivazis/survey/v2 v2.2.7/go.mod h1:9DYvHgXtiXm6nCn+jXnOXLKbH+Yo9u8fAS/SduGdoPk= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v19.1.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= -github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= -github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU= github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= 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/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= -github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -182,42 +135,27 @@ github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -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.15-0.20200908182639-5b44b70ab3ab/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= -github.com/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.10/go.mod h1:g5uw8EV2mAlzqe94tfNBNdr89fnbD/n3HV0OhsddkmM= -github.com/Microsoft/hcsshim/test v0.0.0-20200826032352-301c83a30e7c/go.mod h1:30A5igQ91GEmhYJF8TaRP79pMBOYynRsyOByfVV0dU4= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad h1:QeeqI2zxxgZVe11UrYFXXx6gVxPVF40ygekjBzEg4XY= github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/RoaringBitmap/roaring v0.7.1/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I= github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= github.com/RoaringBitmap/roaring v1.2.1 h1:58/LJlg/81wfEHd5L9qsHduznOIhyv4qb1yWcSvVq9A= github.com/RoaringBitmap/roaring v1.2.1/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= @@ -235,7 +173,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy 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/andreaskoch/go-fswatch v1.0.0/go.mod h1:r5/iV+4jfwoY2sYqBkg8vpF04ehOvEl4qPptVGdxmqo= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -250,7 +187,6 @@ github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= -github.com/apex/log v1.3.0/go.mod h1:jd8Vpsr46WAe3EZSQ/IUMs2qQD/GOycT5rPWCO1yGcs= github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= @@ -265,40 +201,31 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:W github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.15.90/go.mod h1:es1KtYUFs7le0xQ3rOihkuoVD90z7D0fR2Qm4S00/gU= -github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= 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 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= 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 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.1.10/go.mod h1:w0XsmFg8qg6cmpTtJ0z3pKgjTDBMMnI/+I2syrE6XBE= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.3.3 h1:R1XWiopGiXf66xygsiLpzLo67xEYvMkHw3w+rCOSAwg= github.com/bits-and-blooms/bitset v1.3.3/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blevesearch/bleve/v2 v2.0.5/go.mod h1:ZjWibgnbRX33c+vBRgla9QhPb4QOjD6fdVJ+R1Bk8LM= github.com/blevesearch/bleve/v2 v2.3.4 h1:SSb7/cwGzo85LWX1jchIsXM8ZiNNMX3shT5lROM63ew= github.com/blevesearch/bleve/v2 v2.3.4/go.mod h1:Ot0zYum8XQRfPcwhae8bZmNyYubynsoMjVvl1jPqL30= @@ -346,28 +273,18 @@ github.com/blevesearch/zapx/v14 v14.3.5/go.mod h1:954A/eKFb+pg/ncIYWLWCKY+mIjReM github.com/blevesearch/zapx/v15 v15.2.0/go.mod h1:MmQceLpWfME4n1WrBFIwplhWmaQbQqLQARpaKUEOs/A= github.com/blevesearch/zapx/v15 v15.3.5 h1:NVD0qq8vRk66ImJn1KloXT5ckqPDUZT7VbVJs9jKlac= github.com/blevesearch/zapx/v15 v15.3.5/go.mod h1:QMUh2hXCaYIWFKPYGavq/Iga2zbHWZ9DZAa9uFbWyvg= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= -github.com/bombsimon/wsl/v2 v2.2.0/go.mod h1:Azh8c3XGEJl9LyX0/sFC+CKMc7Ssgua0g+6abzXN4Pg= -github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bufbuild/connect-go v1.0.0 h1:htSflKUT8y1jxhoPhPYTZMrsY3ipUXjjrbcZR5O2cVo= github.com/bufbuild/connect-go v1.0.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= github.com/bufbuild/connect-grpchealth-go v1.0.0 h1:33v883tL86jLomQT6R2ZYVYaI2cRkuUXvU30WfbQ/ko= github.com/bufbuild/connect-grpchealth-go v1.0.0/go.mod h1:6OEb4J3rh5+Wdvt4/muOIfZo1lt9cPU8ggwpsjBaZ3Y= github.com/bufbuild/connect-grpcreflect-go v1.0.0 h1:zWsLFYqrT1O2sNJFYfTXI5WxbAyiY2dvevvnJHPtV5A= github.com/bufbuild/connect-grpcreflect-go v1.0.0/go.mod h1:825I20H8bfE9rLnBH/046JSpmm3uwpNYdG4duCARetc= -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/buildkite/terminal-to-html/v3 v3.7.0 h1:chdLUSpiOj/A4v3dzxyOqixXI6aw7IDA6Dk77FXsvNU= github.com/buildkite/terminal-to-html/v3 v3.7.0/go.mod h1:g0ME1XqbkBSgXR9YmlIHcJIjzaMyWW+HbsG0rPb5puo= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= @@ -390,14 +307,11 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/chi-middleware/proxy v1.1.1 h1:4HaXUp8o2+bhHr1OhVy+VjN0+L7/07JDcn6v7YrTjrQ= github.com/chi-middleware/proxy v1.1.1/go.mod h1:jQwMEJct2tz9VmtCELxvnXoMfa+SOdikvbVJVHv/M+0= 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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= @@ -428,54 +342,21 @@ github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcK github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -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/console v0.0.0-20180822173158-c12b1e7919c1/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.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -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.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/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-20200928162600-f2cc35102c2a/go.mod h1:W0qIOTD7mp2He++YVq+kgfXezRYqzP1uDuMVH1bITDY= -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/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/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/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116/go.mod h1:o59b3PCKVAf9jjiKtCc/9hLAd+5p/rfhBfm6aBcTEr4= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= -github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= 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/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -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 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/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 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= 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-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= github.com/couchbase/go-couchbase v0.0.0-20201026062457-7b3be89bbd89/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A= @@ -498,10 +379,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -511,9 +390,7 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go. github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= -github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= -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-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= @@ -527,32 +404,8 @@ github.com/djherbis/nio/v3 v3.0.1/go.mod h1:Ng4h80pbZFMla1yKzm61cF0tqqilXZYrogmW github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.3+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.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.0.0-20200511152416-a93e9eb0e95c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -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-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -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/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= @@ -569,10 +422,6 @@ github.com/editorconfig/editorconfig-core-go/v2 v2.4.5 h1:kTcVMyCvFGQmTk0S5+R7GF github.com/editorconfig/editorconfig-core-go/v2 v2.4.5/go.mod h1:rDB5UUleQsOI1HLbojaBmDNR8oUUe31InmNDTVzcDHY= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -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/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= @@ -595,8 +444,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= github.com/ethantkoenig/rupture v1.0.1 h1:6aAXghmvtnngMgQzy7SMGdicMvkV86V4n9fT0meE5E4= github.com/ethantkoenig/rupture v1.0.1/go.mod h1:Sjqo/nbffZp1pVVXNGhpugIjsWmuS9KiIB4GtpEBur4= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -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 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= @@ -624,12 +471,9 @@ github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66 github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -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/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= @@ -649,8 +493,6 @@ github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= -github.com/go-critic/go-critic v0.4.1/go.mod h1:7/14rZGnZbY6E38VEGk2kVhoq6itzc1E68facVDK23g= -github.com/go-critic/go-critic v0.4.3/go.mod h1:j4O3D4RoIwRqlZw5jJpx0BNfXWWbpcJoKu5cYSe4YmQ= github.com/go-enry/go-enry/v2 v2.8.3 h1:BwvNrN58JqBJhyyVdZSl5QD3xoxEEGYUrRyPh31FGhw= github.com/go-enry/go-enry/v2 v2.8.3/go.mod h1:GVzIiAytiS5uT/QiuakK7TF1u4xDab87Y8V5EJRpsIQ= github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo= @@ -659,21 +501,18 @@ github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5Hql github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ= github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= -github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf h1:tmTaR5nN6RJs6G9+tmd3MRBNXSk6YTI9+8nv1WrIKzI= github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf/go.mod h1:cGzI9Lmtnh5wmJ5NjO/Cr3d6Iljyy588mEFUKs5vMvw= 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-ini/ini v1.62.0 h1:7VJT/ZXjzqSrvtraFp4ONq80hTcRQth1c9ZnQ3uNQvU= -github.com/go-ini/ini v1.62.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/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/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -681,14 +520,10 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs= github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI= -github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= 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-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -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-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= @@ -699,14 +534,9 @@ github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2uj github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -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/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -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/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= @@ -715,8 +545,6 @@ github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8en github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw= github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo= github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI= @@ -726,8 +554,6 @@ github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrC github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -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-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= @@ -753,21 +579,6 @@ github.com/go-swagger/go-swagger v0.30.3/go.mod h1:neDPes8r8PCz2JPvHRDj8BTULLh4V github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l9rI6sNaZgNC0LnF3MiE+qTmyBA/tZAg1rtyrGbUMK0= github.com/go-testfixtures/testfixtures/v3 v3.8.1 h1:uonwvepqRvSgddcrReZQhojTlWlmOlHkYAb9ZaOMWgU= github.com/go-testfixtures/testfixtures/v3 v3.8.1/go.mod h1:Kdu7YeMC0KRXVHdaQ91Vmx3pcjoTF63h4f1qTJDdXLA= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= 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= @@ -799,19 +610,13 @@ github.com/goccy/go-json v0.9.5/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGF github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -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/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/flock v0.7.3/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= -github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/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= @@ -841,7 +646,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= 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= @@ -852,7 +656,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/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= @@ -877,26 +680,6 @@ github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= -github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= -github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.23.7/go.mod h1:g/38bxfhp4rI7zeWSxcdIeHTQGS58TCak8FYcyCmavQ= -github.com/golangci/golangci-lint v1.27.0/go.mod h1:+eZALfxIuthdrHPtfM7w/R3POJLjHDfJJw8XZl9xOng= -github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= -github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -905,7 +688,6 @@ github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod h1:6CKh9dscIRoqc2kC6YUFICHZMT9NrClyPrRVFrdw1QQ= github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 h1:806qveZBQtRNHroYHyg6yrsjqBJh9kIB4nfmB8uJnak= github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92/go.mod h1:kXWPsHVPSKVuxPPG69BRtumCbAW537FydV/GH89oBhM= -github.com/google/crfs v0.0.0-20191108021818-71d77da419c9/go.mod h1:etGhoOqfwPkooV6aqoX3eBGQOJblqdoc9XvWOeuxpPw= 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= @@ -921,9 +703,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod h1:KyKXa9ciM8+lgMXwOVsXi7UxGrsf9mM61Mzs+xKUrKE= -github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI= github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28= @@ -933,10 +712,7 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= 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/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -965,7 +741,6 @@ github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40 h1:ykKxL12NZd3JmWZnyq github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod h1:1dPv0CUjNQVFEDuAUFhZql16pw/VlPgaX8qj+g5pVzQ= github.com/google/trillian v1.3.14-0.20210428093031-b4ddea2e86b1/go.mod h1:FdIJX+NoDk/dIN2ZxTyz5nAJWgf+NSSSriPAMThChTY= @@ -977,9 +752,7 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= -github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= 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= @@ -988,33 +761,24 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= -github.com/goreleaser/goreleaser v0.136.0/go.mod h1:wiKrPUeSNh6Wu8nUHxZydSOVQ/OZvOaO7DTtFqie904= github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= -github.com/goreleaser/nfpm v1.3.0/go.mod h1:w0p7Kc9TAUgWMyrub63ex3M2Mgw88M4GZXoTq5UCb40= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= 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/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY= github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/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.6.2/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.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -1030,20 +794,13 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -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.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= 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 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -1051,14 +808,10 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= -github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok= -github.com/hanwen/go-fuse/v2 v2.0.3/go.mod h1:0EQM6aH2ctVpvZ6a+onrQ/vaykxh2GH7hy3e13vzTUY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -1067,10 +820,8 @@ github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-immutable-radix v1.0.0/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-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -1081,7 +832,6 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b 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.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -1090,8 +840,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c/go.mod h1:fHzc09UnyJyqyW+bFuq864eh+wC7dj65aXmXLRe5to0= -github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= @@ -1105,7 +853,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -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.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -1115,7 +862,6 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= 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= @@ -1173,31 +919,22 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f 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/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea/go.mod h1:QMdK4dGB3YhEW2BmA1wgGpPYI3HZy/5gD705PXKUVSg= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg= github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= -github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= 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.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= -github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= -github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -1208,8 +945,6 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= 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.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1242,13 +977,11 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkGnWpac= -github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -1263,20 +996,15 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.4/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/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ= @@ -1298,7 +1026,6 @@ github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis= github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ= github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af/go.mod h1:Cqz6pqow14VObJ7peltM+2n3PWOz7yTrfUuGbVFkzN0= github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 h1:F/3FfGmKdiKFa8kL3YrpZ7pe9H4l4AzA1pbaOUnRvPI= @@ -1310,22 +1037,17 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= 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.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0= github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA= github.com/markbates/goth v1.73.0 h1:X5QUUHLP5puJ4dhoPKkV3PhDIvvQEzsfVxsUmDNSJ28= github.com/markbates/goth v1.73.0/go.mod h1:X6xdNgpapSENS0O35iTBBcMHoJDQDfI9bJl+APCkYMc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= 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/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -1333,10 +1055,8 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea 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.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -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= @@ -1354,7 +1074,6 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.11.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.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -1362,10 +1081,8 @@ github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mholt/acmez v1.0.4 h1:N3cE4Pek+dSolbsofIkAYz6H1d3pE+2G0os7QHslf80= github.com/mholt/acmez v1.0.4/go.mod h1:qFGLZ4u+ehWINeJZjzPlsnjJBCPAADWTcIqE/7DAYQY= @@ -1390,37 +1107,23 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= 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-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= 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/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= 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 v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/sys/mount v0.1.0/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= -github.com/moby/sys/mount v0.1.1/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74= -github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= -github.com/moby/sys/mountinfo v0.1.0/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= -github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= 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 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -1428,27 +1131,19 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUllUJF9mWUESr9TWKS7iEKsQ/IipM= github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= -github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/msteinert/pam v1.1.0 h1:VhLun/0n0kQYxiRBJJvVpC2jR6d21SWJFjpvUVj20Kc= github.com/msteinert/pam v1.1.0/go.mod h1:M4FPeAW8g2ITO68W8gACDz13NDJyOQM9IQsQhrR6TOI= -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/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/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -1456,10 +1151,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/nektos/act v0.2.24 h1:kKLOu2+Noubp6zlsBk60prC5XotHcCnOZT+aUg2rmjs= -github.com/nektos/act v0.2.24/go.mod h1:aLdBHPnAggcGI98HD4jppS4DbMP7tgnoMDSJT/ILsoI= +github.com/nektos/act v0.2.32 h1:WQjdgE6ejd6ZvQhyHYCOLfqmEc06uZVhZe4otwSIfK8= +github.com/nektos/act v0.2.32/go.mod h1:81lNGeCUVWHVFz4J+v3HXslT3xHQrD10Mu/s/QWtjP8= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1484,52 +1177,26 @@ github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k= github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU= github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= -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.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.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/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -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.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -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/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/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE= -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/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/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/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= 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/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= @@ -1544,15 +1211,12 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= 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.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -1562,23 +1226,18 @@ github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= 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= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/otp v1.3.0 h1:oJV/SkzR33anKXwQU3Of42rL4wbrffP4uvUf1SvS5Xs= github.com/pquerna/otp v1.3.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.8.0/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-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -1592,7 +1251,6 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -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-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1600,8 +1258,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= 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-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1615,14 +1271,10 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/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-20190117184657-bf6a532e95b1/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.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= @@ -1633,13 +1285,10 @@ github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0ua github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= -github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= github.com/quasoft/websspi v1.1.2 h1:/mA4w0LxWlE3novvsoEL6BBA1WnjJATbjkh1kFrTidw= github.com/quasoft/websspi v1.1.2/go.mod h1:HmVdl939dQ0WIXZhyik+ARdI03M6bQzaSEKcgpFmewk= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= 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= @@ -1647,14 +1296,12 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= -github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= 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.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= @@ -1665,38 +1312,24 @@ github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= 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/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= -github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/santhosh-tekuri/jsonschema/v5 v5.0.1 h1:HNLA3HtUIROrQwG1cuu5EYuqk3UEoJ61Dr/9xkd6sok= github.com/santhosh-tekuri/jsonschema/v5 v5.0.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= -github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= 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/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= -github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989/go.mod h1:i9l/TNj+yDFh9SZXUTvspXTjbFXgZGP/UvhU1S65A4A= -github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= -github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= 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/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -1704,7 +1337,6 @@ github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBf github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d/go.mod h1:vq0tzqLRu6TS7Id0wMo2N5QzJoKedVeovOpHjnykSzY= github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg= github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1721,7 +1353,6 @@ github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUr github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -1731,11 +1362,8 @@ github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= -github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= 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.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -1745,7 +1373,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra 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 v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -1756,15 +1383,12 @@ github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJ 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.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= @@ -1776,15 +1400,11 @@ github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.1/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= @@ -1798,19 +1418,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= -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/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= -github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= @@ -1822,16 +1433,10 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= -github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85/go.mod h1:a7cilN64dG941IOXfhJhlH0qB92hxJ9A1ewrdUmJ6xo= -github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk= github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= github.com/tstranex/u2f v1.0.0 h1:HhJkSzDDlVSVIVt7pDJwCHQj67k7A5EeBgPmeD+pVsQ= github.com/tstranex/u2f v1.0.0/go.mod h1:eahSLaqAS0zsIEv80+vXT7WanXs7MQQDg3j3wGBSayo= -github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= @@ -1840,46 +1445,31 @@ github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= github.com/unrolled/render v1.5.0 h1:uNTHMvVoI9pyyXfgoDHHycIqFONNY2p4eQR9ty+NsxM= github.com/unrolled/render v1.5.0/go.mod h1:eLTosBkQqEPEk7pRfkCRApXd++lm++nCsVlFOHpeedw= -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/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.10 h1:p8Fspmz3iTctJstry1PYS3HVdllxnEzTEsgIgtxTrCk= github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= -github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc= github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= -github.com/xanzy/go-gitlab v0.32.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/go-gitlab v0.73.1 h1:UMagqUZLJdjss1SovIC+kJCH4k2AZWXl58gJd38Y/hI= github.com/xanzy/go-gitlab v0.73.1/go.mod h1:d/a0vswScO7Agg1CZNz15Ic6SSvBG9vfw8egL99t4kA= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= github.com/xanzy/ssh-agent v0.3.2 h1:eKj4SX2Fe7mui28ZgnFW5fmTz1EIr7ugo5s6wDxdHBM= github.com/xanzy/ssh-agent v0.3.2/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= @@ -1888,9 +1478,6 @@ github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+ github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -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/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= @@ -1911,9 +1498,6 @@ github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87 h1:P github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= -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= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= @@ -1961,9 +1545,6 @@ go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAV go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4= go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= -go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= -go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -2000,16 +1581,11 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= -go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= -golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/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= @@ -2017,24 +1593,19 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/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-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -2052,9 +1623,7 @@ golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891 h1:WhEPFM1Ck5gaKybeSWvzI7Y/cd8K9K5tJGRxXMACOBA= golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= 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-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= 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-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -2066,9 +1635,7 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/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= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -2094,14 +1661,10 @@ 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/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-20180911220305-26e67e76b6c3/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-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/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= @@ -2121,11 +1684,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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-20191002035440-2ec189313ef0/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-20191119073136-fc4aabc6c914/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= @@ -2175,11 +1735,8 @@ golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/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-20181017192945-9dcd33a902f4/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-20181203162652-d668ce993890/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-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2204,7 +1761,6 @@ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= -golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= 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= @@ -2218,21 +1774,17 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= 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-20181029174526-d69651ed3497/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-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2243,42 +1795,28 @@ golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7w 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-20190530182044-ad28b68e88f1/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-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190730183949-1393eb018365/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-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-20191010194322-b09406accb47/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-20191119060738-e882bf8e40c2/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-20191220142924-d4481acd189f/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-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2292,20 +1830,12 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/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-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-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201013081832-0aaa2718063a/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= @@ -2365,7 +1895,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2381,29 +1910,19 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb 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-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/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-20180828015842-6cd1fcedba52/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-20181011042414-1f849cf54d09/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-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/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-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= 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-20190311215038-5c2858a9cfe5/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-20190322203728-c1a832b0ad89/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= @@ -2412,30 +1931,21 @@ golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3 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-20190521203540-521d6ed310dd/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-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= 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-20190910044552-dd2b5c81c578/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-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/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= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2443,28 +1953,21 @@ 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-20200102140908-9497f49d5709/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= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200331202046-9d5940d49312/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -2503,20 +2006,10 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= -google.golang.org/api v0.3.0/go.mod h1:IuvZyQh8jgscv8qWfQ4ABd8m7hEudgBFM/EdhA3BnXw= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= -google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= 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= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -2530,7 +2023,6 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= @@ -2570,13 +2062,9 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= 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= @@ -2592,7 +2080,6 @@ 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= @@ -2607,7 +2094,6 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2615,7 +2101,6 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200929141702-51c3e5b607fe/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-20201117123952-62d171c70ae1/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= @@ -2668,10 +2153,7 @@ google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 h1:4SPz2GL2CXJt28MTF8V6Ap/9ZiVbQlJeGSd9qtA7DLs= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2728,12 +2210,10 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -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/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= 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= @@ -2744,29 +2224,21 @@ gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/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/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.44.2/go.mod h1:M3Cogqpuv0QCi3ExAY5V4uOt4qb/R3xZubo9m8lK5wg= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/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/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -2775,7 +2247,6 @@ 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= @@ -2787,11 +2258,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= @@ -2799,43 +2266,9 @@ 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= -honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= -k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apiserver v0.17.4/go.mod h1:5ZDQ6Xr5MNBxyi3iUZXS84QOhZl+W7Oq2us/29c0j9I= -k8s.io/client-go v0.0.0-20180910083459-2cefa64ff137/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v0.17.4/go.mod h1:ouF6o5pz3is8qU0/qYL2RnoxOPqgfuidYLowytyLJmc= -k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU= -k8s.io/cloud-provider v0.17.4/go.mod h1:XEjKDzfD+b9MTLXQFlDGkk6Ho8SGMpaU8Uugx/KNK9U= -k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= -k8s.io/component-base v0.17.4/go.mod h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/csi-translation-lib v0.17.4/go.mod h1:CsxmjwxEI0tTNMzffIAcgR9lX4wOh6AKHdxQrT7L0oo= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/legacy-cloud-providers v0.17.4/go.mod h1:FikRNoD64ECjkxO36gkDgJeiQWwyZTuBkhu+yxOc1Js= -k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc v1.0.0 h1:nPibNuDEx6tvYrUAtvDTTw98rx5juGsa5zuDnKwEEQQ= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= @@ -2888,7 +2321,6 @@ modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6r modernc.org/ccgo/v3 v3.12.82 h1:wudcnJyjLj1aQQCXF3IM9Gz2X6UNjw+afIghzdtn0v8= modernc.org/ccgo/v3 v3.12.82/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -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/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= @@ -2926,7 +2358,6 @@ modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= modernc.org/libc v1.11.87 h1:PzIzOqtlzMDDcCzJ5cUP6h/Ku6Fa9iyflP2ccTY64aE= modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= -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/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -2939,33 +2370,22 @@ modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.14.2 h1:ohsW2+e+Qe2To1W6GNezzKGwjXwSax6R+CrhRxVaFbE= modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY= modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= -mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= mvdan.cc/xurls/v2 v2.4.0 h1:tzxjVAj+wSBmDcF6zBB7/myTy3gX9xvi8Tyr28AuQgc= mvdan.cc/xurls/v2 v2.4.0/go.mod h1:+GEjq9uNjqs8LQfM9nVnM8rff0OQ5Iash5rzX+N1CSg= pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= 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/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -sourcegraph.com/sqs/pbtypes v1.0.0/go.mod h1:3AciMUv4qUuRHRHhOG4TZOB+72GdPVz5k+c648qsFS4= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3FJbP5Cvdq7Khzn6J9OCUQJaBwgBkCR+MOwSs= strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 6c25dbd481653..cdbb214374fba 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -10,7 +10,6 @@ import ( "fmt" "code.gitea.io/gitea/core" - "code.gitea.io/gitea/models" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" @@ -219,5 +218,5 @@ func (a *botsNotifier) NotifySyncCreateRef(doer *user_model.User, repo *repo_mod func (a *botsNotifier) NotifySyncDeleteRef(doer *user_model.User, repo *repo_model.Repository, refType, refFullName string) { } -func (a *botsNotifier) NotifyNewRelease(rel *models.Release) { +func (a *botsNotifier) NotifyNewRelease(rel *repo_model.Release) { } From 905bce6cb65292ac7539c110252c6359cc824014 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 8 Oct 2022 15:16:52 +0800 Subject: [PATCH 035/408] feat: models for runner task --- models/bots/run.go | 43 ++++++++++++++++++++++++++++++++++++ models/bots/run_job.go | 34 +++++++++++++++++++++++++++++ models/bots/task.go | 33 ++++++++++++++++++++++++++++ models/bots/task_log.go | 47 ++++++++++++++++++++++++++++++++++++++++ models/bots/task_step.go | 32 +++++++++++++++++++++++++++ 5 files changed, 189 insertions(+) create mode 100644 models/bots/run.go create mode 100644 models/bots/run_job.go create mode 100644 models/bots/task.go create mode 100644 models/bots/task_log.go create mode 100644 models/bots/task_step.go diff --git a/models/bots/run.go b/models/bots/run.go new file mode 100644 index 0000000000000..8aac6de23e418 --- /dev/null +++ b/models/bots/run.go @@ -0,0 +1,43 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/core" + "code.gitea.io/gitea/models/db" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/timeutil" +) + +// Run represents a run of a workflow file +type Run struct { + ID int64 + Name string + RepoID int64 `xorm:"index unique(repo_workflow_number)"` + WorkflowID string `xorm:"index unique(repo_workflow_number)"` // the name of workflow file + Number int64 `xorm:"index unique(repo_workflow_number)"` // a unique number for each run of a particular workflow in a repository + TriggerUserID int64 + TriggerUser *user_model.User `xorm:"-"` + Ref string + CommitSHA string + Event webhook.HookEventType + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + Status core.BuildStatus `xorm:"index"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` +} + +func init() { + db.RegisterModel(new(Run)) +} + +func (Run) TableName() string { + return "bots_run" +} diff --git a/models/bots/run_job.go b/models/bots/run_job.go new file mode 100644 index 0000000000000..4760478ce2d1f --- /dev/null +++ b/models/bots/run_job.go @@ -0,0 +1,34 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/core" + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +// RunJob represents a job of a run +type RunJob struct { + ID int64 + RunID int64 + Name string + WorkflowPayload string `xorm:"LONGTEXT"` + Needs []int64 `xorm:"JSON TEXT"` + TaskID int64 // the latest task of the job + Status core.BuildStatus `xorm:"index"` + StartTime timeutil.TimeStamp + EndTime timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` +} + +func init() { + db.RegisterModel(new(RunJob)) +} + +func (RunJob) TableName() string { + return "bots_run_job" +} diff --git a/models/bots/task.go b/models/bots/task.go new file mode 100644 index 0000000000000..1fa99758bbf87 --- /dev/null +++ b/models/bots/task.go @@ -0,0 +1,33 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +// Task represents a distribution of job +type Task struct { + ID int64 + JobID int64 + Attempt int64 + RunnerID int64 `xorm:"index"` + LogToFile bool // read log from database or from storage + LogUrl string // url of the log file in storage + Result int64 // TODO: use runnerv1.Result + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` +} + +func init() { + db.RegisterModel(new(Task)) +} + +func (Task) TableName() string { + return "bots_task" +} diff --git a/models/bots/task_log.go b/models/bots/task_log.go new file mode 100644 index 0000000000000..41949a83080ec --- /dev/null +++ b/models/bots/task_log.go @@ -0,0 +1,47 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "fmt" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +// TaskLog represents a task's log, every task has a standalone table +type TaskLog struct { + ID int64 + Content string `xorm:"BINARY"` + Created timeutil.TimeStamp `xorm:"created"` +} + +func init() { + db.RegisterModel(new(TaskLog)) +} + +func GetTaskLogTableName(taskID int64) string { + return fmt.Sprintf("bots_task_log_%d", taskID) +} + +// CreateTaskLog table for a build +func CreateTaskLog(buildID int64) error { + return db.GetEngine(db.DefaultContext). + Table(GetBuildLogTableName(buildID)). + Sync2(new(BuildLog)) +} + +func GetTaskLogs(taskID, index, length int64) (logs []*TaskLog, err error) { + sess := db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(taskID)). + Where("id>=?", index) + + if length > 0 { + sess.Limit(int(length)) + } + + err = sess.Find(&logs) + + return +} diff --git a/models/bots/task_step.go b/models/bots/task_step.go new file mode 100644 index 0000000000000..f8319cbde0b02 --- /dev/null +++ b/models/bots/task_step.go @@ -0,0 +1,32 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" +) + +// TaskStep represents a step of Task +type TaskStep struct { + ID int64 + TaskID int64 + Number int64 + Result int64 // TODO: use runnerv1.Result + LogIndex int64 + LogLength int64 + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` +} + +func (TaskStep) TableName() string { + return "bots_task_step" +} + +func init() { + db.RegisterModel(new(TaskStep)) +} From 91bea969d42036c8a91770fa62c52c6030e5aaca Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 8 Oct 2022 15:30:22 +0800 Subject: [PATCH 036/408] chore: replace act --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 70e919e1eac35..b7dc61997be62 100644 --- a/go.mod +++ b/go.mod @@ -313,3 +313,5 @@ exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible exclude github.com/goccy/go-json v0.4.11 + +replace github.com/nektos/act => gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa diff --git a/go.sum b/go.sum index 6f8c55c0c3a02..e9512d67b98da 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,8 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= +gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa h1:HHqlvfIvqFlny3sgJgAM1BYeLNr1uM4yXtvF7aAoYK8= +gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa/go.mod h1:9W/Nz16tjfnWp7O5DUo3EjZBnZFBI/5rlWstX4o7+hU= gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 h1:SKAZ2Fnay8Yx1Yw1BSU/ATEk3/WAFL/lMXhvBBVzyu4= gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= @@ -1151,8 +1153,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nektos/act v0.2.32 h1:WQjdgE6ejd6ZvQhyHYCOLfqmEc06uZVhZe4otwSIfK8= -github.com/nektos/act v0.2.32/go.mod h1:81lNGeCUVWHVFz4J+v3HXslT3xHQrD10Mu/s/QWtjP8= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= From f355188e12b16a557f3776d2ccdc5dc76c904d0e Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 8 Oct 2022 18:20:17 +0800 Subject: [PATCH 037/408] feat: parse workflows --- assets/go-licenses.json | 25 +++++++++++ go.mod | 7 +++- go.sum | 13 +++++- models/bots/run.go | 69 +++++++++++++++++++++++++++++-- models/bots/run_job.go | 7 ++-- modules/bots/bots.go | 54 ++++++++++++++++-------- modules/notification/bots/bots.go | 53 +++++++++++------------- 7 files changed, 173 insertions(+), 55 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index b392b5b844dd4..1afb6b45abfa8 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -334,6 +334,11 @@ "path": "github.com/ethantkoenig/rupture/LICENSE", "licenseText": "MIT License\n\nCopyright (c) 2018 Ethan Koenig\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, + { + "name": "github.com/fatih/color", + "path": "github.com/fatih/color/LICENSE.md", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2013 Fatih Arslan\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" + }, { "name": "github.com/felixge/fgprof", "path": "github.com/felixge/fgprof/LICENSE.txt", @@ -664,6 +669,11 @@ "path": "github.com/markbates/goth/LICENSE.txt", "licenseText": "Copyright (c) 2014 Mark Bates\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" }, + { + "name": "github.com/mattn/go-colorable", + "path": "github.com/mattn/go-colorable/LICENSE", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2016 Yasuhiro Matsumoto\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + }, { "name": "github.com/mattn/go-isatty", "path": "github.com/mattn/go-isatty/LICENSE", @@ -809,11 +819,21 @@ "path": "github.com/prometheus/procfs/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, + { + "name": "github.com/rhysd/actionlint", + "path": "github.com/rhysd/actionlint/LICENSE.txt", + "licenseText": "the MIT License\n\nCopyright (c) 2021 rhysd\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,\nINCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR\nPURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n" + }, { "name": "github.com/rivo/uniseg", "path": "github.com/rivo/uniseg/LICENSE.txt", "licenseText": "MIT License\n\nCopyright (c) 2019 Oliver Kuederle\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, + { + "name": "github.com/robfig/cron", + "path": "github.com/robfig/cron/LICENSE", + "licenseText": "Copyright (C) 2012 Rob Figueiredo\nAll Rights Reserved.\n\nMIT LICENSE\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" + }, { "name": "github.com/rs/xid", "path": "github.com/rs/xid/LICENSE", @@ -969,6 +989,11 @@ "path": "golang.org/x/oauth2/LICENSE", "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, + { + "name": "golang.org/x/sync", + "path": "golang.org/x/sync/LICENSE", + "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "golang.org/x/sys", "path": "golang.org/x/sys/LICENSE", diff --git a/go.mod b/go.mod index b7dc61997be62..a8bb4b63fb5fd 100644 --- a/go.mod +++ b/go.mod @@ -170,6 +170,7 @@ require ( github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect + github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fullstorydev/grpcurl v1.8.1 // indirect @@ -227,6 +228,7 @@ require ( github.com/magiconair/properties v1.8.6 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/markbates/going v1.0.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mholt/acmez v1.0.4 // indirect @@ -250,7 +252,9 @@ require ( github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect + github.com/rhysd/actionlint v1.6.17 // indirect github.com/rivo/uniseg v0.4.2 // indirect + github.com/robfig/cron v1.2.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/rs/xid v1.4.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -291,6 +295,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect @@ -314,4 +319,4 @@ exclude github.com/gofrs/uuid v4.0.0+incompatible exclude github.com/goccy/go-json v0.4.11 -replace github.com/nektos/act => gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa +replace github.com/nektos/act => gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 diff --git a/go.sum b/go.sum index e9512d67b98da..828e33cdf2f5b 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa h1:HHqlvfIvqFlny3sgJgAM1BYeLNr1uM4yXtvF7aAoYK8= -gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa/go.mod h1:9W/Nz16tjfnWp7O5DUo3EjZBnZFBI/5rlWstX4o7+hU= +gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/ODIhBc/cxfp5p5yA8pOSb4= +gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 h1:SKAZ2Fnay8Yx1Yw1BSU/ATEk3/WAFL/lMXhvBBVzyu4= gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= @@ -449,6 +449,7 @@ github.com/ethantkoenig/rupture v1.0.1/go.mod h1:Sjqo/nbffZp1pVVXNGhpugIjsWmuS9K 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 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -1057,7 +1058,9 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea 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.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= 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= @@ -1067,6 +1070,7 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= 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.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -1291,11 +1295,15 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rhysd/actionlint v1.6.17 h1:U6Idx7mLvWFBnaL8tm8oye0fdBUH9ehgoxG25bBy9p8= +github.com/rhysd/actionlint v1.6.17/go.mod h1:fCaKErUfJqiyFdeUp3858hULCCupHWlPRB3RhIHS6pY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= +github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= +github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -1775,6 +1783,7 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= +golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= diff --git a/models/bots/run.go b/models/bots/run.go index 8aac6de23e418..19f5e7e0d1f09 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -5,20 +5,25 @@ package bots import ( + "fmt" + "hash/fnv" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/timeutil" + + "github.com/nektos/act/pkg/jobparser" ) // Run represents a run of a workflow file type Run struct { ID int64 Name string - RepoID int64 `xorm:"index unique(repo_workflow_number)"` - WorkflowID string `xorm:"index unique(repo_workflow_number)"` // the name of workflow file - Number int64 `xorm:"index unique(repo_workflow_number)"` // a unique number for each run of a particular workflow in a repository + RepoID int64 `xorm:"index unique(repo_workflow_index)"` + WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file + Index int64 `xorm:"index unique(repo_workflow_index)"` // a unique number for each run of a particular workflow in a repository TriggerUserID int64 TriggerUser *user_model.User `xorm:"-"` Ref string @@ -36,8 +41,66 @@ type Run struct { func init() { db.RegisterModel(new(Run)) + db.RegisterModel(new(RunIndex)) } func (Run) TableName() string { return "bots_run" } + +// InsertRun inserts a bot run +func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { + var groupId int64 + { + // tricky way to get resource group id + h := fnv.New64() + _, _ = h.Write([]byte(fmt.Sprintf("%d_%s", run.RepoID, run.WorkflowID))) + groupId = int64(h.Sum64()) + } + + index, err := db.GetNextResourceIndex("bots_run_index", groupId) + if err != nil { + return err + } + run.Index = index + + ctx, commiter, err := db.TxContext() + if err != nil { + return err + } + defer commiter.Close() + + if err := db.Insert(ctx, run); err != nil { + return err + } + + runJobs := make([]*RunJob, 0, len(jobs)) + for _, v := range jobs { + _, job := v.Job() + payload, _ := v.Marshal() + runJobs = append(runJobs, &RunJob{ + RunID: run.ID, + Name: job.Name, + WorkflowPayload: payload, + Needs: nil, // TODO: analyse needs + RunsOn: job.RunsOn(), + TaskID: 0, + Status: core.StatusPending, + }) + } + if err := db.Insert(ctx, runJobs); err != nil { + return err + } + + if err := commiter.Commit(); err != nil { + return err + } + + return nil +} + +type RunIndex db.ResourceIndex + +func (RunIndex) TableName() string { + return "bots_run_index" +} diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 4760478ce2d1f..361803e4e5373 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -15,12 +15,13 @@ type RunJob struct { ID int64 RunID int64 Name string - WorkflowPayload string `xorm:"LONGTEXT"` + WorkflowPayload []byte Needs []int64 `xorm:"JSON TEXT"` + RunsOn []string `xorm:"JSON TEXT"` TaskID int64 // the latest task of the job Status core.BuildStatus `xorm:"index"` - StartTime timeutil.TimeStamp - EndTime timeutil.TimeStamp + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp Created timeutil.TimeStamp `xorm:"created"` Updated timeutil.TimeStamp `xorm:"updated"` } diff --git a/modules/bots/bots.go b/modules/bots/bots.go index 6880a6e73d804..4c11a60e757d4 100644 --- a/modules/bots/bots.go +++ b/modules/bots/bots.go @@ -5,57 +5,75 @@ package bots import ( + "bytes" + "io" "strings" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" "github.com/nektos/act/pkg/model" ) -func DetectWorkflows(commit *git.Commit, event webhook.HookEventType) (git.Entries, []map[string]*model.Job, error) { - tree, err := commit.SubTree(".github/workflows") +func ListWorkflows(commit *git.Commit) (git.Entries, error) { + tree, err := commit.SubTree(".gitea/workflows") if _, ok := err.(git.ErrNotExist); ok { - tree, err = commit.SubTree(".gitea/workflows") + tree, err = commit.SubTree(".github/workflows") } if _, ok := err.(git.ErrNotExist); ok { - return nil, nil, nil + return nil, nil } if err != nil { - return nil, nil, err + return nil, err } entries, err := tree.ListEntriesRecursiveFast() if err != nil { - return nil, nil, err + return nil, err } - matchedEntries := make(git.Entries, 0, len(entries)) - jobs := make([]map[string]*model.Job, 0, len(entries)) - + idx := 0 for _, entry := range entries { if !strings.HasSuffix(entry.Name(), ".yml") && !strings.HasSuffix(entry.Name(), ".yaml") { continue } + entries[idx] = entry + idx++ + } + + return entries[:idx], nil +} + +func DetectWorkflows(commit *git.Commit, event webhook.HookEventType) (map[string][]byte, error) { + entries, err := ListWorkflows(commit) + if err != nil { + return nil, err + } + + workflows := make(map[string][]byte, len(entries)) + for _, entry := range entries { f, err := entry.Blob().DataAsync() if err != nil { - return nil, nil, err + return nil, err } - workflow, err := model.ReadWorkflow(f) + content, err := io.ReadAll(f) + _ = f.Close() if err != nil { - f.Close() - return nil, nil, err + return nil, err + } + workflow, err := model.ReadWorkflow(bytes.NewReader(content)) + if err != nil { + log.Warn("ignore invalid workflow %q: %v", entry.Name(), err) + continue } - for _, e := range workflow.On() { if e == event.Event() { - matchedEntries = append(matchedEntries, entry) - jobs = append(jobs, workflow.Jobs) + workflows[entry.Name()] = content break } } - f.Close() } - return matchedEntries, jobs, nil + return workflows, nil } diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index cdbb214374fba..0a1032648af03 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -26,7 +26,8 @@ import ( "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - bots_service "code.gitea.io/gitea/services/bots" + + "github.com/nektos/act/pkg/jobparser" ) type botsNotifier struct { @@ -72,41 +73,37 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str return } - matchedEntries, jobs, err := bots_module.DetectWorkflows(commit, evt) + workflows, err := bots_module.DetectWorkflows(commit, evt) if err != nil { - log.Error("detectWorkflows: %v", err) + log.Error("DetectWorkflows: %v", err) return } - log.Trace("detected %s has %d entries", commit.ID, len(matchedEntries)) - if len(matchedEntries) == 0 { + + if len(workflows) == 0 { log.Trace("repo %s with commit %s couldn't find workflows", repo.RepoPath(), commit.ID) return } - workflowsStatuses := make(map[string]map[string]core.BuildStatus) - for i, entry := range matchedEntries { - taskStatuses := make(map[string]core.BuildStatus) - for k := range jobs[i] { - taskStatuses[k] = core.StatusPending + for id, content := range workflows { + run := bots_model.Run{ + Name: commit.Message(), + RepoID: repo.ID, + WorkflowID: id, + TriggerUserID: doer.ID, + Ref: ref, + CommitSHA: commit.ID.String(), + Event: evt, + EventPayload: payload, + Status: core.StatusPending, + } + jobs, err := jobparser.Parse(content) // TODO: parse with options + if err != nil { + log.Error("jobparser.Parse: %v", err) + continue + } + if err := bots_model.InsertRun(&run, jobs); err != nil { + log.Error("InsertBotTask: %v", err) } - workflowsStatuses[entry.Name()] = taskStatuses - } - - build := bots_model.Build{ - Name: commit.Message(), - RepoID: repo.ID, - TriggerUserID: doer.ID, - Event: evt, - EventPayload: payload, - Status: core.StatusPending, - Ref: ref, - CommitSHA: commit.ID.String(), - } - - if err := bots_model.InsertBuild(&build, workflowsStatuses); err != nil { - log.Error("InsertBotTask: %v", err) - } else { - bots_service.PushToQueue(&build) } } From 4dd135580fe8d5a4e3f36ee7aa6ae79c6a52e4e1 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 13:58:47 +0800 Subject: [PATCH 038/408] chore(runner): update to latest proto format. Signed-off-by: Bo-Yi.Wu --- core/scheduler.go | 4 +- go.mod | 2 +- go.sum | 6 +- models/bots/runner.go | 14 +-- routers/api/bots/runner/runner.go | 113 ++++++---------------- routers/api/bots/scheduler/queue/queue.go | 26 ++--- 6 files changed, 55 insertions(+), 110 deletions(-) diff --git a/core/scheduler.go b/core/scheduler.go index afbceecc5f2a2..966d558a94665 100644 --- a/core/scheduler.go +++ b/core/scheduler.go @@ -20,8 +20,8 @@ type Filter struct { // Scheduler schedules Build stages for execution. type Scheduler interface { // Schedule schedules the stage for execution. - Schedule(context.Context, *runnerv1.Stage) error + Schedule(context.Context, *runnerv1.Task) error // Request requests the next stage scheduled for execution. - Request(context.Context, Filter) (*runnerv1.Stage, error) + Request(context.Context, Filter) (*runnerv1.Task, error) } diff --git a/go.mod b/go.mod index a8bb4b63fb5fd..a09b46f928a94 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 + gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 828e33cdf2f5b..4a50d987ab07a 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,10 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/ODIhBc/cxfp5p5yA8pOSb4= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2 h1:SKAZ2Fnay8Yx1Yw1BSU/ATEk3/WAFL/lMXhvBBVzyu4= -gitea.com/gitea/proto-go v0.0.0-20220921035813-6a5980d5b2a2/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20221008030753-07d7bbcfb9f5 h1:tCf76mJIGJkIvFCOFy6O30diGdA5zt07EUSZangUAzk= +gitea.com/gitea/proto-go v0.0.0-20221008030753-07d7bbcfb9f5/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d h1:/c5HiuU195m2HR7VhJV11CnwpEWWXkgYi02Z6SU37ks= +gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/bots/runner.go b/models/bots/runner.go index ef7f5d37737d2..cba459e017000 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -35,9 +35,6 @@ type Runner struct { ID int64 UUID string `xorm:"CHAR(36) UNIQUE"` Name string `xorm:"VARCHAR(32) UNIQUE"` - OS string `xorm:"VARCHAR(16) index"` // the runner running os - Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture - Type string `xorm:"VARCHAR(16)"` OwnerID int64 `xorm:"index"` // org level runner, 0 means system Owner *user_model.User `xorm:"-"` RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global @@ -46,9 +43,14 @@ type Runner struct { Base int // 0 native 1 docker 2 virtual machine RepoRange string // glob match which repositories could use this runner Token string - Capacity int64 - LastOnline timeutil.TimeStamp `xorm:"index"` - Created timeutil.TimeStamp `xorm:"created"` + + // Store OS and Artch. + AgentLabels []string + // Store custom labes use defined. + CustomLabels []string + + LastOnline timeutil.TimeStamp `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` } func (Runner) TableName() string { diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index abb7caa9497af..7dbd4d5ca007a 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -10,7 +10,6 @@ import ( "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" - repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/log" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -18,6 +17,8 @@ import ( "github.com/bufbuild/connect-go" ) +var _ runnerv1connect.RunnerServiceClient = (*Service)(nil) + type Service struct { Scheduler core.Scheduler @@ -38,25 +39,24 @@ func (s *Service) Register( return nil, errors.New("missing runner token") } + // TODO: Get token data from runner_token table runner, err := bots_model.GetRunnerByToken(token) if err != nil { return nil, errors.New("runner not found") } // update runner information - runner.Arch = req.Msg.Arch - runner.OS = req.Msg.Os - runner.Capacity = req.Msg.Capacity - if err := bots_model.UpdateRunner(ctx, runner, []string{"arch", "os", "capacity"}...); err != nil { + runner.AgentLabels = req.Msg.AgentLabels + runner.CustomLabels = req.Msg.CustomLabels + runner.Name = req.Msg.Name + if err := bots_model.UpdateRunner(ctx, runner, []string{"name", "agent_labels", "custom_labels"}...); err != nil { return nil, errors.New("can't update runner") } res := connect.NewResponse(&runnerv1.RegisterResponse{ Runner: &runnerv1.Runner{ - Uuid: runner.UUID, - Os: req.Msg.Os, - Arch: req.Msg.Arch, - Capacity: req.Msg.Capacity, + Uuid: runner.UUID, + Token: runner.Token, }, }) @@ -64,15 +64,13 @@ func (s *Service) Register( } // Request requests the next available build stage for execution. -func (s *Service) Request( +func (s *Service) FetchTask( ctx context.Context, - req *connect.Request[runnerv1.RequestRequest], -) (*connect.Response[runnerv1.RequestResponse], error) { + req *connect.Request[runnerv1.FetchTaskRequest], +) (*connect.Response[runnerv1.FetchTaskResponse], error) { log.Debug("manager: request queue item") - stage, err := s.Scheduler.Request(ctx, core.Filter{ - Kind: req.Msg.Kind, - Type: req.Msg.Type, + task, err := s.Scheduler.Request(ctx, core.Filter{ OS: req.Msg.Os, Arch: req.Msg.Arch, }) @@ -85,86 +83,29 @@ func (s *Service) Request( return nil, err } - res := connect.NewResponse(&runnerv1.RequestResponse{ - Stage: stage, - }) - return res, nil -} - -// Details fetches build details -func (s *Service) Detail( - ctx context.Context, - req *connect.Request[runnerv1.DetailRequest], -) (*connect.Response[runnerv1.DetailResponse], error) { - log.Info("stag id %d", req.Msg.Stage.Id) - - // fetch stage data - stage, err := bots_model.GetStageByID(req.Msg.Stage.Id) - if err != nil { - return nil, err - } - - stage.Machine = req.Msg.Stage.Machine - stage.Status = core.StatusPending + // TODO: update task and check data lock + task.Machine = req.Msg.Os - count, err := bots_model.UpdateBuildStage(stage, "machine", "status") - if err != nil { - return nil, err - } - if count != 1 { - return nil, core.ErrDataLock - } - - // fetch build data - build, err := bots_model.GetBuildByID(stage.BuildID) - if err != nil { - return nil, err - } - - // fetch repo data - repo, err := repo_model.GetRepositoryByID(build.RepoID) - if err != nil { - return nil, err - } - - res := connect.NewResponse(&runnerv1.DetailResponse{ - Stage: &runnerv1.Stage{ - Id: stage.ID, - BuildId: stage.BuildID, - Name: stage.Name, - Kind: stage.Kind, - Type: stage.Type, - Status: string(stage.Status), - Started: int64(stage.Started), - Stopped: int64(stage.Stopped), - Machine: stage.Machine, - }, - Build: &runnerv1.Build{ - Id: build.ID, - Name: build.Name, - }, - Repo: &runnerv1.Repo{ - Id: repo.ID, - Name: repo.Name, - }, + res := connect.NewResponse(&runnerv1.FetchTaskResponse{ + Task: task, }) return res, nil } -// Update updates the build stage. -func (s *Service) Update( +// UpdateTask updates the task status. +func (s *Service) UpdateTask( ctx context.Context, - req *connect.Request[runnerv1.UpdateRequest], -) (*connect.Response[runnerv1.UpdateResponse], error) { - res := connect.NewResponse(&runnerv1.UpdateResponse{}) + req *connect.Request[runnerv1.UpdateTaskRequest], +) (*connect.Response[runnerv1.UpdateTaskResponse], error) { + res := connect.NewResponse(&runnerv1.UpdateTaskResponse{}) return res, nil } -// UpdateStep updates the build step. -func (s *Service) UpdateStep( +// UpdateLog uploads log of the task. +func (s *Service) UpdateLog( ctx context.Context, - req *connect.Request[runnerv1.UpdateStepRequest], -) (*connect.Response[runnerv1.UpdateStepResponse], error) { - res := connect.NewResponse(&runnerv1.UpdateStepResponse{}) + req *connect.Request[runnerv1.UpdateLogRequest], +) (*connect.Response[runnerv1.UpdateLogResponse], error) { + res := connect.NewResponse(&runnerv1.UpdateLogResponse{}) return res, nil } diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go index 66730f55a78e6..95495be1463e3 100644 --- a/routers/api/bots/scheduler/queue/queue.go +++ b/routers/api/bots/scheduler/queue/queue.go @@ -19,7 +19,7 @@ type worker struct { typ string os string arch string - channel chan *runnerv1.Stage + channel chan *runnerv1.Task } type queue struct { @@ -32,7 +32,7 @@ type queue struct { ctx context.Context } -func (q *queue) Schedule(ctx context.Context, stage *runnerv1.Stage) error { +func (q *queue) Schedule(ctx context.Context, stage *runnerv1.Task) error { select { case q.ready <- struct{}{}: default: @@ -40,13 +40,13 @@ func (q *queue) Schedule(ctx context.Context, stage *runnerv1.Stage) error { return nil } -func (q *queue) Request(ctx context.Context, params core.Filter) (*runnerv1.Stage, error) { +func (q *queue) Request(ctx context.Context, params core.Filter) (*runnerv1.Task, error) { w := &worker{ kind: params.Kind, typ: params.Type, os: params.OS, arch: params.Arch, - channel: make(chan *runnerv1.Stage), + channel: make(chan *runnerv1.Task), } q.Lock() q.workers[w] = struct{}{} @@ -123,15 +123,15 @@ func (q *queue) signal(ctx context.Context) error { } } - stage := &runnerv1.Stage{ - Id: item.ID, - BuildId: item.BuildID, - Name: item.Name, - Kind: item.Name, - Type: item.Type, - Status: string(item.Status), - Started: int64(item.Started), - Stopped: int64(item.Stopped), + stage := &runnerv1.Task{ + Id: item.ID, + // BuildId: item.BuildID, + // Name: item.Name, + // Kind: item.Name, + // Type: item.Type, + // Status: string(item.Status), + // Started: int64(item.Started), + // Stopped: int64(item.Stopped), } w.channel <- stage From 0993c40c4fb74dae07fdec0e0225f864f3e0092c Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 14:43:38 +0800 Subject: [PATCH 039/408] chore(runner): create runner token table Signed-off-by: Bo-Yi.Wu --- core/status.go | 7 ++++++ models/bots/build_step.go | 32 --------------------------- models/bots/runner.go | 3 +++ models/bots/runner_token.go | 43 +++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 32 deletions(-) delete mode 100644 models/bots/build_step.go create mode 100644 models/bots/runner_token.go diff --git a/core/status.go b/core/status.go index 70aacb3747d17..371ad6b0b2756 100644 --- a/core/status.go +++ b/core/status.go @@ -2,9 +2,11 @@ package core // BuildStatus represents a build status type BuildStatus string +type RunnerStatus string // enumerate all the statuses of bot build const ( + // Build status StatusSkipped BuildStatus = "skipped" StatusBlocked BuildStatus = "blocked" StatusDeclined BuildStatus = "declined" @@ -15,6 +17,11 @@ const ( StatusFailing BuildStatus = "failure" StatusKilled BuildStatus = "killed" StatusError BuildStatus = "error" + + // Runner status + StatusIdle RunnerStatus = "idle" + StatusActive RunnerStatus = "active" + StatusOffline RunnerStatus = "offline" ) func (status BuildStatus) IsPending() bool { diff --git a/models/bots/build_step.go b/models/bots/build_step.go deleted file mode 100644 index 4e3e3b12bfbb9..0000000000000 --- a/models/bots/build_step.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "code.gitea.io/gitea/core" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" -) - -type BuildStep struct { - ID int64 - StageID int64 `xorm:"index"` - Number int64 - Name string - Kind string - Type string - Status core.BuildStatus - Started timeutil.TimeStamp - Stopped timeutil.TimeStamp - Created timeutil.TimeStamp `xorm:"created"` -} - -func (bj BuildStep) TableName() string { - return "bots_build_step" -} - -func init() { - db.RegisterModel(new(BuildStep)) -} diff --git a/models/bots/runner.go b/models/bots/runner.go index cba459e017000..39de26830a546 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -8,6 +8,7 @@ import ( "context" "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" @@ -44,6 +45,8 @@ type Runner struct { RepoRange string // glob match which repositories could use this runner Token string + // instance status (idle) + Status core.RunnerStatus // Store OS and Artch. AgentLabels []string // Store custom labes use defined. diff --git a/models/bots/runner_token.go b/models/bots/runner_token.go new file mode 100644 index 0000000000000..234b3961516fd --- /dev/null +++ b/models/bots/runner_token.go @@ -0,0 +1,43 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package bots + +import ( + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/timeutil" + + gouuid "github.com/google/uuid" +) + +// RunnerToken represents runner tokens +type RunnerToken struct { + ID int64 + Token string `xorm:"CHAR(36) UNIQUE"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + Owner *user_model.User `xorm:"-"` + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Repo *repo_model.Repository `xorm:"-"` + + CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` + UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` +} + +func (RunnerToken) TableName() string { + return "bots_runner_token" +} + +func init() { + db.RegisterModel(new(RunnerToken)) +} + +// NewAccessToken creates new access token. +func NewRunnerToken(t *RunnerToken) error { + t.Token = base.EncodeSha1(gouuid.New().String()) + _, err := db.GetEngine(db.DefaultContext).Insert(t) + return err +} From e21c07cc5518fafbf501864d64d246431a6d5fb8 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 10 Oct 2022 14:53:21 +0800 Subject: [PATCH 040/408] feat: parse runner from ctx --- routers/api/bots/grpc/grpc.go | 39 ++++++++++++++++++++++++++++++++- routers/api/bots/grpc/runner.go | 2 ++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/routers/api/bots/grpc/grpc.go b/routers/api/bots/grpc/grpc.go index a59672f4f5e7c..dc70bf62576fa 100644 --- a/routers/api/bots/grpc/grpc.go +++ b/routers/api/bots/grpc/grpc.go @@ -5,11 +5,14 @@ package grpc import ( + "context" "net/http" + "strings" + + "code.gitea.io/gitea/models/bots" "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" - "github.com/bufbuild/connect-go" grpcreflect "github.com/bufbuild/connect-grpcreflect-go" "google.golang.org/grpc/health/grpc_health_v1" @@ -41,3 +44,37 @@ func V1AlphaRoute() (string, http.Handler) { compress1KB, ) } + +var withRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { + return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) { + if methodName(request) == "Register" { + return unaryFunc(ctx, request) + } + uuid := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID + // TODO: get runner from db, refuse request if it doesn't exist + r := &bots.Runner{ + UUID: uuid, + } + ctx = context.WithValue(ctx, runnerCtxKey{}, r) + return unaryFunc(ctx, request) + } +})) + +func methodName(req connect.AnyRequest) string { + splits := strings.Split(req.Spec().Procedure, "/") + if len(splits) > 0 { + return splits[len(splits)-1] + } + return "" +} + +type runnerCtxKey struct{} + +func GetRunner(ctx context.Context) *bots.Runner { + if v := ctx.Value(runnerCtxKey{}); v != nil { + if r, ok := v.(*bots.Runner); ok { + return r + } + } + return nil +} diff --git a/routers/api/bots/grpc/runner.go b/routers/api/bots/grpc/runner.go index 74c59872a7740..a4e25d649feac 100644 --- a/routers/api/bots/grpc/runner.go +++ b/routers/api/bots/grpc/runner.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/routers/api/bots/runner" "code.gitea.io/gitea/routers/api/bots/scheduler/queue" + "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" ) @@ -20,5 +21,6 @@ func RunnerRoute() (string, http.Handler) { return runnerv1connect.NewRunnerServiceHandler( runnerService, compress1KB, + withRunner, ) } From ade88b3a7b225ebdb4930953c6bd8e75880e29fa Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 16:37:18 +0800 Subject: [PATCH 041/408] chore(runner): register new runner Signed-off-by: Bo-Yi.Wu --- models/bots/runner.go | 10 ++++-- models/bots/runner_token.go | 53 +++++++++++++++++++++++++++---- routers/api/bots/runner/runner.go | 51 +++++++++++++++++++---------- 3 files changed, 88 insertions(+), 26 deletions(-) diff --git a/models/bots/runner.go b/models/bots/runner.go index 39de26830a546..047945e1a320e 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -43,7 +43,7 @@ type Runner struct { Description string `xorm:"TEXT"` Base int // 0 native 1 docker 2 virtual machine RepoRange string // glob match which repositories could use this runner - Token string + Token string `xorm:"CHAR(36) UNIQUE"` // instance status (idle) Status core.RunnerStatus @@ -148,7 +148,7 @@ func GetRunnerByToken(token string) (*Runner, error) { return nil, err } else if !has { return nil, ErrRunnerNotExist{ - UUID: "", + Token: token, } } return &runner, nil @@ -177,3 +177,9 @@ func FindRunnersByRepoID(repoID int64) ([]*Runner, error) { err = db.GetEngine(db.DefaultContext).Join("INNER", "repository", "repository.owner_id = bot_runner.owner_id").Find(&runners) return runners, err } + +// NewRunner creates new runner. +func NewRunner(ctx context.Context, t *Runner) error { + _, err := db.GetEngine(ctx).Insert(t) + return err +} diff --git a/models/bots/runner_token.go b/models/bots/runner_token.go index 234b3961516fd..90070c57bb20c 100644 --- a/models/bots/runner_token.go +++ b/models/bots/runner_token.go @@ -5,6 +5,9 @@ package bots import ( + "context" + "fmt" + "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" @@ -14,14 +17,24 @@ import ( gouuid "github.com/google/uuid" ) +// ErrRunnerNotExist represents an error for bot runner not exist +type ErrRunnerTokenNotExist struct { + Token string +} + +func (err ErrRunnerTokenNotExist) Error() string { + return fmt.Sprintf("runner token [%s] is not exist", err.Token) +} + // RunnerToken represents runner tokens type RunnerToken struct { - ID int64 - Token string `xorm:"CHAR(36) UNIQUE"` - OwnerID int64 `xorm:"index"` // org level runner, 0 means system - Owner *user_model.User `xorm:"-"` - RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global - Repo *repo_model.Repository `xorm:"-"` + ID int64 + Token string `xorm:"CHAR(36) UNIQUE"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + Owner *user_model.User `xorm:"-"` + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + Repo *repo_model.Repository `xorm:"-"` + IsActive bool CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` @@ -35,9 +48,35 @@ func init() { db.RegisterModel(new(RunnerToken)) } -// NewAccessToken creates new access token. +// NewRunnerToken creates new runner token. func NewRunnerToken(t *RunnerToken) error { t.Token = base.EncodeSha1(gouuid.New().String()) _, err := db.GetEngine(db.DefaultContext).Insert(t) return err } + +// GetRunnerByToken returns a bot runner via token +func GetRunnerToken(token string) (*RunnerToken, error) { + var runnerToken RunnerToken + has, err := db.GetEngine(db.DefaultContext).Where("token=?", token).Get(&runnerToken) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunnerTokenNotExist{ + Token: token, + } + } + return &runnerToken, nil +} + +// UpdateRunnerToken updates runner token information. +func UpdateRunnerToken(ctx context.Context, r *RunnerToken, cols ...string) (err error) { + e := db.GetEngine(ctx) + + if len(cols) == 0 { + _, err = e.ID(r.ID).AllCols().Update(r) + } else { + _, err = e.ID(r.ID).Cols(cols...).Update(r) + } + return err +} diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 7dbd4d5ca007a..07575b1db247a 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -15,6 +15,7 @@ import ( "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" + gouuid "github.com/google/uuid" ) var _ runnerv1connect.RunnerServiceClient = (*Service)(nil) @@ -30,33 +31,49 @@ func (s *Service) Register( ctx context.Context, req *connect.Request[runnerv1.RegisterRequest], ) (*connect.Response[runnerv1.RegisterResponse], error) { - log.Info("Request headers: %v", req.Header()) + if req.Msg.Token == "" || req.Msg.Name == "" { + return nil, errors.New("missing runner token or name") + } + + runnerToken, err := bots_model.GetRunnerToken(req.Msg.Token) + if err != nil { + return nil, errors.New("runner token not found") + } - token := req.Header().Get("X-Runner-Token") - log.Info("token: %v", token) + if runnerToken.IsActive { + return nil, errors.New("runner token has already activated") + } - if token == "" { - return nil, errors.New("missing runner token") + // create new runner + runner := &bots_model.Runner{ + UUID: gouuid.New().String(), + Name: req.Msg.Name, + OwnerID: runnerToken.OwnerID, + RepoID: runnerToken.RepoID, + Token: req.Msg.Token, + Status: core.StatusOffline, + AgentLabels: req.Msg.AgentLabels, + CustomLabels: req.Msg.CustomLabels, } - // TODO: Get token data from runner_token table - runner, err := bots_model.GetRunnerByToken(token) - if err != nil { - return nil, errors.New("runner not found") + // create new runner + if err := bots_model.NewRunner(ctx, runner); err != nil { + return nil, errors.New("can't create new runner") } - // update runner information - runner.AgentLabels = req.Msg.AgentLabels - runner.CustomLabels = req.Msg.CustomLabels - runner.Name = req.Msg.Name - if err := bots_model.UpdateRunner(ctx, runner, []string{"name", "agent_labels", "custom_labels"}...); err != nil { - return nil, errors.New("can't update runner") + // update token status + runnerToken.IsActive = true + if err := bots_model.UpdateRunnerToken(ctx, runnerToken, "is_active"); err != nil { + return nil, errors.New("can't update runner token status") } res := connect.NewResponse(&runnerv1.RegisterResponse{ Runner: &runnerv1.Runner{ - Uuid: runner.UUID, - Token: runner.Token, + Uuid: runner.UUID, + Token: runner.Token, + Name: runner.Name, + AgentLabels: runner.AgentLabels, + CustomLabels: runner.CustomLabels, }, }) From f79bc4f6055f71ac2cc32dd83063d6cb883e4092 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 17:04:46 +0800 Subject: [PATCH 042/408] chore(runner): vaildate the repo URL Signed-off-by: Bo-Yi.Wu --- routers/api/bots/runner/runner.go | 43 +++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 07575b1db247a..8b1c4f0ce9c6f 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -7,9 +7,13 @@ package runner import ( "context" "errors" + "net/url" + "strings" "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -31,8 +35,8 @@ func (s *Service) Register( ctx context.Context, req *connect.Request[runnerv1.RegisterRequest], ) (*connect.Response[runnerv1.RegisterResponse], error) { - if req.Msg.Token == "" || req.Msg.Name == "" { - return nil, errors.New("missing runner token or name") + if req.Msg.Token == "" || req.Msg.Name == "" || req.Msg.Url == "" { + return nil, errors.New("missing runner token, name or URL") } runnerToken, err := bots_model.GetRunnerToken(req.Msg.Token) @@ -44,6 +48,41 @@ func (s *Service) Register( return nil, errors.New("runner token has already activated") } + // valiate user data + u, err := url.Parse(req.Msg.Url) + if err != nil { + return nil, errors.New("can't parse url: " + req.Msg.Url) + } + + urls := strings.Split(u.Path, "/") + if runnerToken.OwnerID != 0 { + if len(urls) < 2 { + return nil, errors.New("can't parse owner name") + } + owner, err := user.GetUserByID(runnerToken.OwnerID) + if err != nil { + return nil, errors.New("can't get owner name") + } + if owner.LowerName != strings.ToLower(urls[1]) { + return nil, errors.New("wrong owner name") + } + } + + if runnerToken.RepoID != 0 { + if len(urls) < 3 { + return nil, errors.New("can't parse repo name") + } + + r, err := repo.GetRepositoryByIDCtx(ctx, runnerToken.RepoID) + if err != nil { + return nil, errors.New("can't get repo name") + } + + if r.LowerName != strings.ToLower(urls[2]) { + return nil, errors.New("wrong repo name") + } + } + // create new runner runner := &bots_model.Runner{ UUID: gouuid.New().String(), From 4233090738027d42e1d4e26d7d1bd928e5b6b248 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 17:17:23 +0800 Subject: [PATCH 043/408] chore(runner): get token from header Signed-off-by: Bo-Yi.Wu --- routers/api/bots/runner/runner.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 8b1c4f0ce9c6f..d10a8789290ab 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -35,7 +35,9 @@ func (s *Service) Register( ctx context.Context, req *connect.Request[runnerv1.RegisterRequest], ) (*connect.Response[runnerv1.RegisterResponse], error) { - if req.Msg.Token == "" || req.Msg.Name == "" || req.Msg.Url == "" { + token := req.Header().Get("X-Runner-Token") + + if token == "" || req.Msg.Name == "" || req.Msg.Url == "" { return nil, errors.New("missing runner token, name or URL") } From 3daaf92c64f7a63e6b2195a7e0a2d3d167706914 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 17:24:01 +0800 Subject: [PATCH 044/408] chore(deps): update proto to latest version Signed-off-by: Bo-Yi.Wu --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a09b46f928a94..121651294c36b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d + gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 4a50d987ab07a..e9d788ecd4436 100644 --- a/go.sum +++ b/go.sum @@ -83,10 +83,8 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/ODIhBc/cxfp5p5yA8pOSb4= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20221008030753-07d7bbcfb9f5 h1:tCf76mJIGJkIvFCOFy6O30diGdA5zt07EUSZangUAzk= -gitea.com/gitea/proto-go v0.0.0-20221008030753-07d7bbcfb9f5/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= -gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d h1:/c5HiuU195m2HR7VhJV11CnwpEWWXkgYi02Z6SU37ks= -gitea.com/gitea/proto-go v0.0.0-20221010043111-8f5efb3ec51d/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b h1:BEEgR2+rEOyWGbY3iyGCIrv6wmlaj9dAECWONexibrI= +gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= From 530faf72278da8849201ba2296ed6fa8f7816dd0 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 10 Oct 2022 15:35:26 +0800 Subject: [PATCH 045/408] feat: assign task to runner --- models/bots/run.go | 12 ++++-- models/bots/run_job.go | 3 ++ models/bots/task.go | 71 +++++++++++++++++++++++++++++++ routers/api/bots/grpc/grpc.go | 39 +---------------- routers/api/bots/grpc/runner.go | 3 +- routers/api/bots/runner/runner.go | 70 ++++++++++++++++++++++-------- routers/api/bots/runner/unary.go | 48 +++++++++++++++++++++ 7 files changed, 185 insertions(+), 61 deletions(-) create mode 100644 routers/api/bots/runner/unary.go diff --git a/models/bots/run.go b/models/bots/run.go index 19f5e7e0d1f09..ffece5f3e7e40 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/timeutil" @@ -21,9 +22,10 @@ import ( type Run struct { ID int64 Name string - RepoID int64 `xorm:"index unique(repo_workflow_index)"` - WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file - Index int64 `xorm:"index unique(repo_workflow_index)"` // a unique number for each run of a particular workflow in a repository + RepoID int64 `xorm:"index unique(repo_workflow_index)"` + Repo *repo_model.Repository `xorm:"-"` + WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file + Index int64 `xorm:"index unique(repo_workflow_index)"` // a unique number for each run of a particular workflow in a repository TriggerUserID int64 TriggerUser *user_model.User `xorm:"-"` Ref string @@ -76,12 +78,14 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { runJobs := make([]*RunJob, 0, len(jobs)) for _, v := range jobs { - _, job := v.Job() + id, job := v.Job() payload, _ := v.Marshal() runJobs = append(runJobs, &RunJob{ RunID: run.ID, Name: job.Name, + Ready: true, // TODO: should be false if there are needs to satisfy WorkflowPayload: payload, + JobID: id, Needs: nil, // TODO: analyse needs RunsOn: job.RunsOn(), TaskID: 0, diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 361803e4e5373..3a477eaa27157 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -15,7 +15,10 @@ type RunJob struct { ID int64 RunID int64 Name string + Ready bool // ready to be executed + Attempt int64 WorkflowPayload []byte + JobID string // job id in workflow, not job's id Needs []int64 `xorm:"JSON TEXT"` RunsOn []string `xorm:"JSON TEXT"` TaskID int64 // the latest task of the job diff --git a/models/bots/task.go b/models/bots/task.go index 1fa99758bbf87..efad43168e5ee 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -5,6 +5,7 @@ package bots import ( + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" ) @@ -31,3 +32,73 @@ func init() { func (Task) TableName() string { return "bots_task" } + +func CreateTask(runner *Runner) (task *Task, job *RunJob, run *Run, ok bool, err error) { + ctx, commiter, err := db.TxContext() + if err != nil { + return + } + defer commiter.Close() + + var jobs []*RunJob + if err = db.GetEngine(ctx).Where("task_id = 0 AND ready = true").OrderBy("id").Find(jobs); err != nil { + return + } + + labels := append(runner.AgentLabels, runner.CustomLabels...) + for _, v := range jobs { + if isSubset(v.RunsOn, labels) { + job = v + break + } + } + if job == nil { + return + } + + now := timeutil.TimeStampNow() + job.Attempt++ + job.Started = now + job.Status = core.StatusRunning + + task = &Task{ + JobID: job.ID, + Attempt: job.Attempt, + RunnerID: runner.ID, + Started: now, + } + + if err = db.Insert(ctx, task); err != nil { + return + } + + job.TaskID = task.ID + if _, err = db.GetEngine(ctx).ID(job.ID).Update(job); err != nil { + return + } + + run = &Run{} + if _, err = db.GetEngine(ctx).ID(job.RunID).Get(run); err != nil { + return + } + + if err = commiter.Commit(); err != nil { + return + } + + ok = true + return +} + +func isSubset(set, subset []string) bool { + m := make(map[string]struct{}, len(set)) + for _, v := range set { + m[v] = struct{}{} + } + for _, v := range subset { + if _, ok := m[v]; !ok { + return false + } + } + return true +} diff --git a/routers/api/bots/grpc/grpc.go b/routers/api/bots/grpc/grpc.go index dc70bf62576fa..a59672f4f5e7c 100644 --- a/routers/api/bots/grpc/grpc.go +++ b/routers/api/bots/grpc/grpc.go @@ -5,14 +5,11 @@ package grpc import ( - "context" "net/http" - "strings" - - "code.gitea.io/gitea/models/bots" "gitea.com/gitea/proto-go/ping/v1/pingv1connect" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" + "github.com/bufbuild/connect-go" grpcreflect "github.com/bufbuild/connect-grpcreflect-go" "google.golang.org/grpc/health/grpc_health_v1" @@ -44,37 +41,3 @@ func V1AlphaRoute() (string, http.Handler) { compress1KB, ) } - -var withRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { - return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) { - if methodName(request) == "Register" { - return unaryFunc(ctx, request) - } - uuid := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID - // TODO: get runner from db, refuse request if it doesn't exist - r := &bots.Runner{ - UUID: uuid, - } - ctx = context.WithValue(ctx, runnerCtxKey{}, r) - return unaryFunc(ctx, request) - } -})) - -func methodName(req connect.AnyRequest) string { - splits := strings.Split(req.Spec().Procedure, "/") - if len(splits) > 0 { - return splits[len(splits)-1] - } - return "" -} - -type runnerCtxKey struct{} - -func GetRunner(ctx context.Context) *bots.Runner { - if v := ctx.Value(runnerCtxKey{}); v != nil { - if r, ok := v.(*bots.Runner); ok { - return r - } - } - return nil -} diff --git a/routers/api/bots/grpc/runner.go b/routers/api/bots/grpc/runner.go index a4e25d649feac..c084f99488d61 100644 --- a/routers/api/bots/grpc/runner.go +++ b/routers/api/bots/grpc/runner.go @@ -9,7 +9,6 @@ import ( "code.gitea.io/gitea/routers/api/bots/runner" "code.gitea.io/gitea/routers/api/bots/scheduler/queue" - "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" ) @@ -21,6 +20,6 @@ func RunnerRoute() (string, http.Handler) { return runnerv1connect.NewRunnerServiceHandler( runnerService, compress1KB, - withRunner, + runner.WithRunner, ) } diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index d10a8789290ab..8c46d56f478de 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -7,6 +7,7 @@ package runner import ( "context" "errors" + "fmt" "net/url" "strings" @@ -14,12 +15,15 @@ import ( bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/json" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" gouuid "github.com/google/uuid" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/structpb" ) var _ runnerv1connect.RunnerServiceClient = (*Service)(nil) @@ -121,29 +125,20 @@ func (s *Service) Register( return res, nil } -// Request requests the next available build stage for execution. +// FetchTask assigns a task to the runner func (s *Service) FetchTask( ctx context.Context, req *connect.Request[runnerv1.FetchTaskRequest], ) (*connect.Response[runnerv1.FetchTaskResponse], error) { - log.Debug("manager: request queue item") + runner := GetRunner(ctx) - task, err := s.Scheduler.Request(ctx, core.Filter{ - OS: req.Msg.Os, - Arch: req.Msg.Arch, - }) - if err != nil && ctx.Err() != nil { - log.Debug("manager: context canceled") - return nil, err - } - if err != nil { - log.Warn("manager: request queue item error") - return nil, err + var task *runnerv1.Task + if t, ok, err := s.pickTask(ctx, runner); err != nil { + return nil, status.Errorf(codes.Internal, "pick task: %v", err) + } else if ok { + task = t } - // TODO: update task and check data lock - task.Machine = req.Msg.Os - res := connect.NewResponse(&runnerv1.FetchTaskResponse{ Task: task, }) @@ -167,3 +162,44 @@ func (s *Service) UpdateLog( res := connect.NewResponse(&runnerv1.UpdateLogResponse{}) return res, nil } + +func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) { + t, job, run, ok, err := bots_model.CreateTask(runner) + if err != nil { + return nil, false, fmt.Errorf("CreateTask: %w", err) + } + if !ok { + return nil, false, nil + } + + event := map[string]interface{}{} + _ = json.Unmarshal([]byte(run.EventPayload), &event) + + // TODO: more context in https://docs.github.com/cn/actions/learn-github-actions/contexts#github-context + taskContext, _ := structpb.NewStruct(map[string]interface{}{ + "event": event, + "run_id": fmt.Sprint(run.ID), + "run_number": fmt.Sprint(run.Index), + "run_attempt": fmt.Sprint(job.Attempt), + "actor": fmt.Sprint(run.TriggerUser.Name), + "repository": fmt.Sprint(run.Repo.Name), + "event_name": fmt.Sprint(run.Event.Event()), + "sha": fmt.Sprint(run.CommitSHA), + "ref": fmt.Sprint(run.Ref), + "ref_name": "", + "ref_type": "", + "head_ref": "", + "base_ref": "", + "token": "", + "repository_owner": fmt.Sprint(run.Repo.OwnerName), + "retention_days": "", + }) + + task := &runnerv1.Task{ + Id: t.ID, + WorkflowPayload: job.WorkflowPayload, + Context: taskContext, + Secrets: nil, // TODO: query secrets + } + return task, true, nil +} diff --git a/routers/api/bots/runner/unary.go b/routers/api/bots/runner/unary.go new file mode 100644 index 0000000000000..005db2103c7bd --- /dev/null +++ b/routers/api/bots/runner/unary.go @@ -0,0 +1,48 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package runner + +import ( + "context" + "strings" + + "code.gitea.io/gitea/models/bots" + + "github.com/bufbuild/connect-go" +) + +var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { + return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) { + if methodName(request) == "Register" { + return unaryFunc(ctx, request) + } + uuid := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID + // TODO: get runner from db, refuse request if it doesn't exist + r := &bots.Runner{ + UUID: uuid, + } + ctx = context.WithValue(ctx, runnerCtxKey{}, r) + return unaryFunc(ctx, request) + } +})) + +func methodName(req connect.AnyRequest) string { + splits := strings.Split(req.Spec().Procedure, "/") + if len(splits) > 0 { + return splits[len(splits)-1] + } + return "" +} + +type runnerCtxKey struct{} + +func GetRunner(ctx context.Context) *bots.Runner { + if v := ctx.Value(runnerCtxKey{}); v != nil { + if r, ok := v.(*bots.Runner); ok { + return r + } + } + return nil +} From 6f18f76577753a90113e5537751951c1f71676a2 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Mon, 10 Oct 2022 18:32:27 +0800 Subject: [PATCH 046/408] chore(runner): update runner status using proto define Signed-off-by: Bo-Yi.Wu --- core/status.go | 6 ------ go.mod | 2 +- go.sum | 2 ++ models/bots/runner.go | 6 +++--- routers/api/bots/runner/runner.go | 3 ++- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/status.go b/core/status.go index 371ad6b0b2756..bd1476c661317 100644 --- a/core/status.go +++ b/core/status.go @@ -2,7 +2,6 @@ package core // BuildStatus represents a build status type BuildStatus string -type RunnerStatus string // enumerate all the statuses of bot build const ( @@ -17,11 +16,6 @@ const ( StatusFailing BuildStatus = "failure" StatusKilled BuildStatus = "killed" StatusError BuildStatus = "error" - - // Runner status - StatusIdle RunnerStatus = "idle" - StatusActive RunnerStatus = "active" - StatusOffline RunnerStatus = "offline" ) func (status BuildStatus) IsPending() bool { diff --git a/go.mod b/go.mod index 121651294c36b..9df3087b68829 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b + gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index e9d788ecd4436..548d7e123028e 100644 --- a/go.sum +++ b/go.sum @@ -85,6 +85,8 @@ gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/O gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b h1:BEEgR2+rEOyWGbY3iyGCIrv6wmlaj9dAECWONexibrI= gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 h1:roFxcMnXJrjZvHBfba5Py6Jin9VTTute0WwzRXhJnQs= +gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/bots/runner.go b/models/bots/runner.go index 047945e1a320e..78eb62d405bca 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" "xorm.io/builder" ) @@ -45,8 +45,8 @@ type Runner struct { RepoRange string // glob match which repositories could use this runner Token string `xorm:"CHAR(36) UNIQUE"` - // instance status (idle) - Status core.RunnerStatus + // instance status (idle, active, offline) + Status runnerv1.RunnerStatus // Store OS and Artch. AgentLabels []string // Store custom labes use defined. diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 8c46d56f478de..aadd00bf6aef7 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -96,7 +96,7 @@ func (s *Service) Register( OwnerID: runnerToken.OwnerID, RepoID: runnerToken.RepoID, Token: req.Msg.Token, - Status: core.StatusOffline, + Status: runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE, AgentLabels: req.Msg.AgentLabels, CustomLabels: req.Msg.CustomLabels, } @@ -119,6 +119,7 @@ func (s *Service) Register( Name: runner.Name, AgentLabels: runner.AgentLabels, CustomLabels: runner.CustomLabels, + Status: runner.Status, }, }) From 79966763c6d37a29e3adbd03e92c0f874170a18a Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 11 Oct 2022 18:14:23 +0800 Subject: [PATCH 047/408] feat: distribute tasks to runner --- models/bots/run.go | 52 +++++++++++++++++++++++++ models/bots/run_job.go | 47 +++++++++++++++++++++++ models/bots/task.go | 63 +++++++++++++++++++++---------- models/bots/task_step.go | 3 +- routers/api/bots/runner/runner.go | 36 ++++++++++++------ routers/api/bots/runner/unary.go | 21 +++++++---- 6 files changed, 182 insertions(+), 40 deletions(-) diff --git a/models/bots/run.go b/models/bots/run.go index ffece5f3e7e40..d8eac83297b85 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -5,6 +5,7 @@ package bots import ( + "context" "fmt" "hash/fnv" @@ -50,6 +51,34 @@ func (Run) TableName() string { return "bots_run" } +// LoadAttributes load Repo TriggerUser if not loaded +func (r *Run) LoadAttributes(ctx context.Context) error { + if r == nil { + return nil + } + + if r.Repo == nil { + repo, err := repo_model.GetRepositoryByIDCtx(ctx, r.RepoID) + if err != nil { + return err + } + r.Repo = repo + } + if err := r.Repo.LoadAttributes(ctx); err != nil { + return err + } + + if r.TriggerUser == nil { + u, err := user_model.GetUserByIDCtx(ctx, r.TriggerUserID) + if err != nil { + return err + } + r.TriggerUser = u + } + + return nil +} + // InsertRun inserts a bot run func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { var groupId int64 @@ -103,6 +132,29 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { return nil } +// ErrRunNotExist represents an error for bot run not exist +type ErrRunNotExist struct { + ID int64 +} + +func (err ErrRunNotExist) Error() string { + return fmt.Sprintf("run [%d] is not exist", err.ID) +} + +func GetRunByID(ctx context.Context, id int64) (*Run, error) { + var run Run + has, err := db.GetEngine(ctx).Where("id=?", id).Get(&run) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunNotExist{ + ID: id, + } + } + + return &run, nil +} + type RunIndex db.ResourceIndex func (RunIndex) TableName() string { diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 3a477eaa27157..6e55088135f05 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -5,6 +5,9 @@ package bots import ( + "context" + "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" @@ -14,6 +17,7 @@ import ( type RunJob struct { ID int64 RunID int64 + Run *Run `xorm:"-"` Name string Ready bool // ready to be executed Attempt int64 @@ -36,3 +40,46 @@ func init() { func (RunJob) TableName() string { return "bots_run_job" } + +// LoadAttributes load Run if not loaded +func (job *RunJob) LoadAttributes(ctx context.Context) error { + if job == nil { + return nil + } + + if job.Run == nil { + run, err := GetRunByID(ctx, job.RunID) + if err != nil { + return err + } + job.Run = run + } + if err := job.Run.LoadAttributes(ctx); err != nil { + return err + } + + return nil +} + +// ErrRunJobNotExist represents an error for bot run job not exist +type ErrRunJobNotExist struct { + ID int64 +} + +func (err ErrRunJobNotExist) Error() string { + return fmt.Sprintf("run job [%d] is not exist", err.ID) +} + +func GetRunJobByID(ctx context.Context, id int64) (*RunJob, error) { + var job RunJob + has, err := db.GetEngine(ctx).Where("id=?", id).Get(&job) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunNotExist{ + ID: id, + } + } + + return &job, nil +} diff --git a/models/bots/task.go b/models/bots/task.go index efad43168e5ee..fe705497d4d76 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -5,20 +5,24 @@ package bots import ( + "context" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) // Task represents a distribution of job type Task struct { ID int64 JobID int64 + Job *RunJob `xorm:"-"` Attempt int64 RunnerID int64 `xorm:"index"` LogToFile bool // read log from database or from storage LogUrl string // url of the log file in storage - Result int64 // TODO: use runnerv1.Result + Result runnerv1.Result Started timeutil.TimeStamp Stopped timeutil.TimeStamp Created timeutil.TimeStamp `xorm:"created"` @@ -33,27 +37,49 @@ func (Task) TableName() string { return "bots_task" } -func CreateTask(runner *Runner) (task *Task, job *RunJob, run *Run, ok bool, err error) { +// LoadAttributes load Job if not loaded +func (task *Task) LoadAttributes(ctx context.Context) error { + if task == nil { + return nil + } + + if task.Job == nil { + job, err := GetRunJobByID(ctx, task.JobID) + if err != nil { + return err + } + task.Job = job + } + if err := task.Job.LoadAttributes(ctx); err != nil { + return err + } + + return nil +} + +func CreateTask(runner *Runner) (*Task, bool, error) { ctx, commiter, err := db.TxContext() if err != nil { - return + return nil, false, err } defer commiter.Close() var jobs []*RunJob - if err = db.GetEngine(ctx).Where("task_id = 0 AND ready = true").OrderBy("id").Find(jobs); err != nil { - return + if err := db.GetEngine(ctx).Where("task_id=? AND ready=?", 0, true).OrderBy("id").Find(&jobs); err != nil { + return nil, false, err } + // TODO: a more efficient way to filter labels + var job *RunJob labels := append(runner.AgentLabels, runner.CustomLabels...) for _, v := range jobs { - if isSubset(v.RunsOn, labels) { + if isSubset(labels, v.RunsOn) { job = v break } } if job == nil { - return + return nil, false, nil } now := timeutil.TimeStampNow() @@ -61,33 +87,32 @@ func CreateTask(runner *Runner) (task *Task, job *RunJob, run *Run, ok bool, err job.Started = now job.Status = core.StatusRunning - task = &Task{ + task := &Task{ JobID: job.ID, Attempt: job.Attempt, RunnerID: runner.ID, Started: now, } - if err = db.Insert(ctx, task); err != nil { - return + if err := db.Insert(ctx, task); err != nil { + return nil, false, err } job.TaskID = task.ID - if _, err = db.GetEngine(ctx).ID(job.ID).Update(job); err != nil { - return + if _, err := db.GetEngine(ctx).ID(job.ID).Update(job); err != nil { + return nil, false, err } - run = &Run{} - if _, err = db.GetEngine(ctx).ID(job.RunID).Get(run); err != nil { - return + task.Job = job + if err := task.Job.LoadAttributes(ctx); err != nil { + return nil, false, err } - if err = commiter.Commit(); err != nil { - return + if err := commiter.Commit(); err != nil { + return nil, false, err } - ok = true - return + return task, true, nil } func isSubset(set, subset []string) bool { diff --git a/models/bots/task_step.go b/models/bots/task_step.go index f8319cbde0b02..c54cb6f913622 100644 --- a/models/bots/task_step.go +++ b/models/bots/task_step.go @@ -7,6 +7,7 @@ package bots import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) // TaskStep represents a step of Task @@ -14,7 +15,7 @@ type TaskStep struct { ID int64 TaskID int64 Number int64 - Result int64 // TODO: use runnerv1.Result + Result runnerv1.Result LogIndex int64 LogLength int64 Started timeutil.TimeStamp diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index aadd00bf6aef7..4ae385f83e2e6 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -10,6 +10,7 @@ import ( "fmt" "net/url" "strings" + "time" "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" @@ -140,6 +141,17 @@ func (s *Service) FetchTask( task = t } + // avoid crazy retry + if task == nil { + duration := 2 * time.Second + if deadline, ok := ctx.Deadline(); ok { + if d := time.Until(deadline) - time.Second; d < duration { + duration = d + } + } + time.Sleep(duration) + } + res := connect.NewResponse(&runnerv1.FetchTaskResponse{ Task: task, }) @@ -165,7 +177,7 @@ func (s *Service) UpdateLog( } func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) { - t, job, run, ok, err := bots_model.CreateTask(runner) + t, ok, err := bots_model.CreateTask(runner) if err != nil { return nil, false, fmt.Errorf("CreateTask: %w", err) } @@ -174,31 +186,31 @@ func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*run } event := map[string]interface{}{} - _ = json.Unmarshal([]byte(run.EventPayload), &event) + _ = json.Unmarshal([]byte(t.Job.Run.EventPayload), &event) // TODO: more context in https://docs.github.com/cn/actions/learn-github-actions/contexts#github-context taskContext, _ := structpb.NewStruct(map[string]interface{}{ "event": event, - "run_id": fmt.Sprint(run.ID), - "run_number": fmt.Sprint(run.Index), - "run_attempt": fmt.Sprint(job.Attempt), - "actor": fmt.Sprint(run.TriggerUser.Name), - "repository": fmt.Sprint(run.Repo.Name), - "event_name": fmt.Sprint(run.Event.Event()), - "sha": fmt.Sprint(run.CommitSHA), - "ref": fmt.Sprint(run.Ref), + "run_id": fmt.Sprint(t.Job.ID), + "run_number": fmt.Sprint(t.Job.Run.Index), + "run_attempt": fmt.Sprint(t.Job.Attempt), + "actor": fmt.Sprint(t.Job.Run.TriggerUser.Name), + "repository": fmt.Sprint(t.Job.Run.Repo.Name), + "event_name": fmt.Sprint(t.Job.Run.Event.Event()), + "sha": fmt.Sprint(t.Job.Run.CommitSHA), + "ref": fmt.Sprint(t.Job.Run.Ref), "ref_name": "", "ref_type": "", "head_ref": "", "base_ref": "", "token": "", - "repository_owner": fmt.Sprint(run.Repo.OwnerName), + "repository_owner": fmt.Sprint(t.Job.Run.Repo.OwnerName), "retention_days": "", }) task := &runnerv1.Task{ Id: t.ID, - WorkflowPayload: job.WorkflowPayload, + WorkflowPayload: t.Job.WorkflowPayload, Context: taskContext, Secrets: nil, // TODO: query secrets } diff --git a/routers/api/bots/runner/unary.go b/routers/api/bots/runner/unary.go index 005db2103c7bd..df6324e1446a8 100644 --- a/routers/api/bots/runner/unary.go +++ b/routers/api/bots/runner/unary.go @@ -8,9 +8,11 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/bots" "github.com/bufbuild/connect-go" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { @@ -18,12 +20,15 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar if methodName(request) == "Register" { return unaryFunc(ctx, request) } - uuid := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID - // TODO: get runner from db, refuse request if it doesn't exist - r := &bots.Runner{ - UUID: uuid, + token := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID + runner, err := bots_model.GetRunnerByToken(token) + if err != nil { + if _, ok := err.(*bots_model.ErrRunnerNotExist); ok { + return nil, status.Error(codes.Unauthenticated, "unregistered runner") + } + return nil, status.Error(codes.Internal, err.Error()) } - ctx = context.WithValue(ctx, runnerCtxKey{}, r) + ctx = context.WithValue(ctx, runnerCtxKey{}, runner) return unaryFunc(ctx, request) } })) @@ -38,9 +43,9 @@ func methodName(req connect.AnyRequest) string { type runnerCtxKey struct{} -func GetRunner(ctx context.Context) *bots.Runner { +func GetRunner(ctx context.Context) *bots_model.Runner { if v := ctx.Value(runnerCtxKey{}); v != nil { - if r, ok := v.(*bots.Runner); ok { + if r, ok := v.(*bots_model.Runner); ok { return r } } From 32a5797608e1e18189aa57c3e5669038bef33c34 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 11 Oct 2022 18:27:52 +0800 Subject: [PATCH 048/408] chore: debug runner log reporting --- routers/api/bots/runner/runner.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 4ae385f83e2e6..9af96bcd783b6 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/log" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -164,6 +165,10 @@ func (s *Service) UpdateTask( req *connect.Request[runnerv1.UpdateTaskRequest], ) (*connect.Response[runnerv1.UpdateTaskResponse], error) { res := connect.NewResponse(&runnerv1.UpdateTaskResponse{}) + + // to debug + log.Info("task state: %+v", req.Msg.State) + return res, nil } @@ -173,6 +178,13 @@ func (s *Service) UpdateLog( req *connect.Request[runnerv1.UpdateLogRequest], ) (*connect.Response[runnerv1.UpdateLogResponse], error) { res := connect.NewResponse(&runnerv1.UpdateLogResponse{}) + + // to debug + for i, row := range req.Msg.Rows { + log.Info("log[%v]: %v %v", req.Msg.Index+int64(i), row.Time.AsTime().Local().Format(time.RFC3339), row.Content) + } + res.Msg.AckIndex = req.Msg.Index + int64(len(req.Msg.Rows)) + return res, nil } From 1a78fd349415a55525fa208c4e99b14e43b77a77 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Tue, 11 Oct 2022 20:28:36 +0800 Subject: [PATCH 049/408] feat(runner): update runner last_online and status when FetchTask --- routers/api/bots/runner/runner.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 9af96bcd783b6..95643982056d5 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -18,6 +18,7 @@ import ( "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -128,6 +129,8 @@ func (s *Service) Register( return res, nil } +const runnerOnlineTimeDeltaSecs = 30 + // FetchTask assigns a task to the runner func (s *Service) FetchTask( ctx context.Context, @@ -135,6 +138,21 @@ func (s *Service) FetchTask( ) (*connect.Response[runnerv1.FetchTaskResponse], error) { runner := GetRunner(ctx) + // update runner online status + if runner.Status == runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE { + runner.LastOnline = timeutil.TimeStampNow() + runner.Status = runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE + if err := bots_model.UpdateRunner(ctx, runner, "last_online", "status"); err != nil { + log.Error("can't update runner status: %v", err) + } + } + if timeutil.TimeStampNow()-runner.LastOnline >= runnerOnlineTimeDeltaSecs { + runner.LastOnline = timeutil.TimeStampNow() + if err := bots_model.UpdateRunner(ctx, runner, "last_online"); err != nil { + log.Error("can't update runner last_online: %v", err) + } + } + var task *runnerv1.Task if t, ok, err := s.pickTask(ctx, runner); err != nil { return nil, status.Errorf(codes.Internal, "pick task: %v", err) From 206b2a104e21ff87c712486a3da6040109f7bc19 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Sun, 9 Oct 2022 20:44:12 +0800 Subject: [PATCH 050/408] feat(runner): begin runner view ui --- models/bots/runner.go | 16 ++++++++ routers/web/admin/runners.go | 62 ++++++++++++++++------------- routers/web/web.go | 1 - templates/admin/runner/list.tmpl | 68 +++++++++++++++++++++++++------- web_src/less/_runner.less | 5 +++ 5 files changed, 108 insertions(+), 44 deletions(-) create mode 100644 web_src/less/_runner.less diff --git a/models/bots/runner.go b/models/bots/runner.go index 78eb62d405bca..90dcea7294802 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -19,6 +19,7 @@ import ( // ErrRunnerNotExist represents an error for bot runner not exist type ErrRunnerNotExist struct { + ID int64 UUID string Token string } @@ -79,6 +80,7 @@ type FindRunnerOptions struct { db.ListOptions RepoID int64 OwnerID int64 + Sort string } func (opts FindRunnerOptions) toCond() builder.Cond { @@ -140,6 +142,20 @@ func GetRunnerByUUID(uuid string) (*Runner, error) { return &runner, nil } +// GetRunnerByID returns a bot runner via id +func GetRunnerByID(id int64) (*Runner, error) { + var runner Runner + has, err := db.GetEngine(db.DefaultContext).Where("id=?", id).Get(&runner) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunnerNotExist{ + ID: id, + } + } + return &runner, nil +} + // GetRunnerByToken returns a bot runner via token func GetRunnerByToken(token string) (*Runner, error) { var runner Runner diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 952c71466b09c..ccc7afe963e17 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -65,43 +65,22 @@ func Runners(ctx *context.Context) { ctx.HTML(http.StatusOK, tplRunners) } -// NewRunner render adding a new runner page -func NewRunner(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.runners.new") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminRunners"] = true - - ctx.HTML(http.StatusOK, tplRunnerNew) -} - -// NewRunnerPost response for adding a new runner -func NewRunnerPost(ctx *context.Context) { - // form := web.GetForm(ctx).(*forms.AdminCreateRunnerForm) - ctx.Data["Title"] = ctx.Tr("admin.runners.new") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminRunners"] = true - - if ctx.HasError() { - ctx.HTML(http.StatusOK, tplRunnerNew) - return - } - - // ctx.Flash.Success(ctx.Tr("admin.runners.new_success", u.Name)) - // ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10)) -} - // EditRunner show editing runner page func EditRunner(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.runners.edit") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRunners"] = true - prepareUserInfo(ctx) - if ctx.Written() { + runner, err := bots_model.GetBuildByID(ctx.ParamsInt64(":runnerid")) + if err != nil { + ctx.ServerError("GetRunnerByID", err) return } + ctx.Data["Runner"] = runner - ctx.HTML(http.StatusOK, tplUserEdit) + // TODO: get task list for this runner + + ctx.HTML(http.StatusOK, tplRunnerEdit) } // EditRunnerPost response for editing runner @@ -127,3 +106,30 @@ func DeleteRunner(ctx *context.Context) { "redirect": setting.AppSubURL + "/admin/runners", }) } + +/** +// NewRunner render adding a new runner page +func NewRunner(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.runners.new") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + ctx.HTML(http.StatusOK, tplRunnerNew) +} + +// NewRunnerPost response for adding a new runner +func NewRunnerPost(ctx *context.Context) { + // form := web.GetForm(ctx).(*forms.AdminCreateRunnerForm) + ctx.Data["Title"] = ctx.Tr("admin.runners.new") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminRunners"] = true + + if ctx.HasError() { + ctx.HTML(http.StatusOK, tplRunnerNew) + return + } + + // ctx.Flash.Success(ctx.Tr("admin.runners.new_success", u.Name)) + // ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10)) +} +**/ diff --git a/routers/web/web.go b/routers/web/web.go index 86b2fa2b43457..ecd8e856f6a26 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -628,7 +628,6 @@ func RegisterRoutes(m *web.Route) { m.Group("/runners", func() { m.Get("", admin.Runners) - m.Combo("/new").Get(admin.NewRunner).Post(bindIgnErr(forms.AdminCreateRunnerForm{}), admin.NewRunnerPost) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost) m.Post("/{runnerid}/delete", admin.DeleteRunner) }) diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl index 9500613aba90c..61adc43161560 100644 --- a/templates/admin/runner/list.tmpl +++ b/templates/admin/runner/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    {{template "admin/navbar" .}}
    {{template "base/alert" .}} @@ -10,7 +10,7 @@
    -
    +
    @@ -22,26 +22,64 @@ - + - - - + + + + + + + + + + + + + + + + + + + {{range .Runners}} - - - - - - - - + + + + + + + + {{end}}
    ID{{.locale.Tr "admin.runners.status"}} - {{.locale.Tr "admin.runners.name"}} + {{.locale.Tr "admin.runners.id"}} {{.locale.Tr "admin.runners.own_type"}}{{.locale.Tr "admin.runners.uuid"}}{{.locale.Tr "admin.runners.created"}}{{.locale.Tr "admin.runners.edit"}}{{.locale.Tr "admin.runners.tags"}}{{.locale.Tr "admin.runners.latest_contact"}}
    online + #1 + focused_mcclintock + shared + linux + amd64 + 3 days ago + {{svg "octicon-pencil"}} +
    offline + #2 + lucid_khorana + shared + linux + aarch64 + self-host + custom + 3 minutes ago + {{svg "octicon-pencil"}} + {{svg "octicon-x-circle"}} +
    {{.ID}}{{.Name}}{{.OwnType}}{{.UUID}}{{.Created}}{{svg "octicon-pencil"}}
    {{.ID}}{{.Name}}{{.OwnType}}{{.UUID}}{{.Created}} + {{svg "octicon-pencil"}} + {{svg "octicon-x-circle"}} +
    diff --git a/web_src/less/_runner.less b/web_src/less/_runner.less new file mode 100644 index 0000000000000..0a47ba8d93c7e --- /dev/null +++ b/web_src/less/_runner.less @@ -0,0 +1,5 @@ +@import "variables.less"; + +.admin.runner{ + +} From dff0d4b907aa1c6bdabba85cccf4da25a82c09db Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Mon, 10 Oct 2022 21:53:53 +0800 Subject: [PATCH 051/408] feat(runner): update edit.html --- models/bots/runner.go | 25 +++- routers/web/admin/runners.go | 9 +- templates/admin/runner/edit.tmpl | 192 +++++-------------------------- templates/admin/runner/list.tmpl | 56 +++------ web_src/less/_runner.less | 12 +- web_src/less/index.less | 1 + 6 files changed, 84 insertions(+), 211 deletions(-) diff --git a/models/bots/runner.go b/models/bots/runner.go index 90dcea7294802..cecc2e7e9f154 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -72,6 +72,11 @@ func (r *Runner) OwnType() string { return r.Repo.FullName() } +// AllLabels returns agent and custom labels +func (r *Runner) AllLabels() []string { + return append(r.AgentLabels, r.CustomLabels...) +} + func init() { db.RegisterModel(&Runner{}) } @@ -81,6 +86,7 @@ type FindRunnerOptions struct { RepoID int64 OwnerID int64 Sort string + Filter string } func (opts FindRunnerOptions) toCond() builder.Cond { @@ -92,19 +98,36 @@ func (opts FindRunnerOptions) toCond() builder.Cond { cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) } cond = cond.Or(builder.Eq{"repo_id": 0, "owner_id": 0}) + if opts.Filter != "" { + cond = cond.And(builder.Like{"name", opts.Filter}) + } return cond } +func (opts FindRunnerOptions) toOrder() string { + switch opts.Sort { + case "online": + return "last_online DESC" + case "offline": + return "last_online ASC" + case "alphabetically": + return "name ASC" + } + return "last_online DESC" +} + func CountRunners(opts FindRunnerOptions) (int64, error) { return db.GetEngine(db.DefaultContext). Table("bots_runner"). Where(opts.toCond()). + OrderBy(opts.toOrder()). Count() } func FindRunners(opts FindRunnerOptions) (runners RunnerList, err error) { sess := db.GetEngine(db.DefaultContext). - Where(opts.toCond()) + Where(opts.toCond()). + OrderBy(opts.toOrder()) if opts.Page > 0 { sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) } diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index ccc7afe963e17..a37cce8661c2f 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -38,17 +38,19 @@ func Runners(ctx *context.Context) { Page: page, PageSize: 100, }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), } count, err := bots_model.CountRunners(opts) if err != nil { - ctx.ServerError("SearchUsers", err) + ctx.ServerError("AdminRunners", err) return } runners, err := bots_model.FindRunners(opts) if err != nil { - ctx.ServerError("SearchUsers", err) + ctx.ServerError("AdminRunners", err) return } if err := runners.LoadAttributes(ctx); err != nil { @@ -56,6 +58,7 @@ func Runners(ctx *context.Context) { return } + ctx.Data["Keyword"] = opts.Filter ctx.Data["Runners"] = runners ctx.Data["Total"] = count @@ -71,7 +74,7 @@ func EditRunner(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRunners"] = true - runner, err := bots_model.GetBuildByID(ctx.ParamsInt64(":runnerid")) + runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid")) if err != nil { ctx.ServerError("GetRunnerByID", err) return diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl index 29dcaa127af28..5a7f7f8c20cfe 100644 --- a/templates/admin/runner/edit.tmpl +++ b/templates/admin/runner/edit.tmpl @@ -1,197 +1,61 @@ {{template "base/head" .}} -
    +
    {{template "admin/navbar" .}}
    {{template "base/alert" .}}

    - {{.locale.Tr "admin.users.edit_account"}} + {{.locale.Tr "admin.runners.runner_title"}} #{{.Runner.ID}} {{.Runner.Name}}

    {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} -
    - - -
    - -
    - -
    - -
    {{.locale.Tr "admin.users.local"}}
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    -
    {{.locale.Tr "admin.users.local"}}
    - {{range .Sources}} -
    {{.Name}}
    - {{end}} -
    +
    +
    + + {{TimeSinceUnix .Runner.LastOnline $.locale}}
    -
    - -
    - -
    - {{if .User.Visibility.IsPublic}}{{end}} - {{if .User.Visibility.IsLimited}}{{end}} - {{if .User.Visibility.IsPrivate}}{{end}} -
    - {{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} - {{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} - {{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}} -
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{range $mode := .AllowedUserVisibilityModes}} - {{if $mode.IsPublic}} -
    {{$.locale.Tr "settings.visibility.public"}}
    - {{else if $mode.IsLimited}} -
    {{$.locale.Tr "settings.visibility.limited"}}
    - {{else if $mode.IsPrivate}} -
    {{$.locale.Tr "settings.visibility.private"}}
    - {{end}} +
    + + + {{range .Runner.AgentLabels}} + {{.}} {{end}} -
    + +
    +
    + + {{.Runner.OwnType}}
    -
    - -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -

    {{.locale.Tr "admin.users.password_helper"}}

    -
    -
    - - -
    -
    - - -
    - -
    - -
    - - -

    {{.locale.Tr "admin.users.max_repo_creation_desc"}}

    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - {{if not .DisableRegularOrgCreation}} -
    -
    - - -
    +
    + +
    - {{end}} - - {{if .TwoFactorEnabled}} -
    -
    -
    - - -
    +
    + + +

    {{.locale.Tr "admin.runners.custom_labels_helper"}}

    - {{end}}
    - -
    {{.locale.Tr "admin.users.delete_account"}}
    + +
    + {{.locale.Tr "admin.runners.delete_runner"}}

    - {{.locale.Tr "settings.avatar"}} + {{.locale.Tr "admin.runner.task_list"}}

    -
    - {{.CsrfTokenHtml}} - {{if not DisableGravatar}} -
    -
    - - -
    -
    -
    - - -
    - {{end}} - -
    -
    - - -
    -
    - -
    - - -
    - -
    - - {{$.locale.Tr "settings.delete_current_avatar"}} -
    -
    + Comming soon
    diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl index 61adc43161560..dc85a82d3dfd9 100644 --- a/templates/admin/runner/list.tmpl +++ b/templates/admin/runner/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    {{template "admin/navbar" .}}
    {{template "base/alert" .}} @@ -33,51 +33,25 @@ + {{range .Runners}} - online - - #1 - focused_mcclintock - - shared - - linux - amd64 - - 3 days ago - - {{svg "octicon-pencil"}} + status + + + #{{.ID}} + {{.Name}} + - - - offline - - #2 - lucid_khorana - - shared + {{.OwnType}} - linux - aarch64 - self-host - custom + {{range .AllLabels}} + {{.}} + {{end}} - 3 minutes ago - - {{svg "octicon-pencil"}} - {{svg "octicon-x-circle"}} - - - {{range .Runners}} - - {{.ID}} - {{.Name}} - {{.OwnType}} - {{.UUID}} - {{.Created}} + {{TimeSinceUnix .LastOnline $.locale}} - {{svg "octicon-pencil"}} - {{svg "octicon-x-circle"}} + {{svg "octicon-pencil"}} + {{svg "octicon-x-circle"}} {{end}} diff --git a/web_src/less/_runner.less b/web_src/less/_runner.less index 0a47ba8d93c7e..f5e1953d4a6d2 100644 --- a/web_src/less/_runner.less +++ b/web_src/less/_runner.less @@ -1,5 +1,13 @@ @import "variables.less"; -.admin.runner{ - +.admin.runners { + .runner-ops > a { + margin-left: 0.5em; + } + .runner-ops-delete { + color: var(--color-red-light); + } + .runner-basic-info .dib { + margin-right: 1em; + } } diff --git a/web_src/less/index.less b/web_src/less/index.less index 2d670ac2d5d34..dafed3eb2755d 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -36,5 +36,6 @@ @import "_explore"; @import "_review"; @import "_package"; +@import "_runner"; @import "./helpers.less"; From 9648482ed6ed7f8e732aba92c3a64fc951d41fd3 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Tue, 11 Oct 2022 20:42:35 +0800 Subject: [PATCH 052/408] feat(bots): move runner status update function to context --- routers/api/bots/runner/runner.go | 18 ------------------ routers/api/bots/runner/unary.go | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 95643982056d5..9af96bcd783b6 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -18,7 +18,6 @@ import ( "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -129,8 +128,6 @@ func (s *Service) Register( return res, nil } -const runnerOnlineTimeDeltaSecs = 30 - // FetchTask assigns a task to the runner func (s *Service) FetchTask( ctx context.Context, @@ -138,21 +135,6 @@ func (s *Service) FetchTask( ) (*connect.Response[runnerv1.FetchTaskResponse], error) { runner := GetRunner(ctx) - // update runner online status - if runner.Status == runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE { - runner.LastOnline = timeutil.TimeStampNow() - runner.Status = runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE - if err := bots_model.UpdateRunner(ctx, runner, "last_online", "status"); err != nil { - log.Error("can't update runner status: %v", err) - } - } - if timeutil.TimeStampNow()-runner.LastOnline >= runnerOnlineTimeDeltaSecs { - runner.LastOnline = timeutil.TimeStampNow() - if err := bots_model.UpdateRunner(ctx, runner, "last_online"); err != nil { - log.Error("can't update runner last_online: %v", err) - } - } - var task *runnerv1.Task if t, ok, err := s.pickTask(ctx, runner); err != nil { return nil, status.Errorf(codes.Internal, "pick task: %v", err) diff --git a/routers/api/bots/runner/unary.go b/routers/api/bots/runner/unary.go index df6324e1446a8..f644a90fe173e 100644 --- a/routers/api/bots/runner/unary.go +++ b/routers/api/bots/runner/unary.go @@ -9,12 +9,17 @@ import ( "strings" bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/bufbuild/connect-go" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) +const runnerOnlineTimeDeltaSecs = 30 + var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) { if methodName(request) == "Register" { @@ -28,6 +33,22 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar } return nil, status.Error(codes.Internal, err.Error()) } + + // update runner online status + if runner.Status == runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE { + runner.LastOnline = timeutil.TimeStampNow() + runner.Status = runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE + if err := bots_model.UpdateRunner(ctx, runner, "last_online", "status"); err != nil { + log.Error("can't update runner status: %v", err) + } + } + if timeutil.TimeStampNow()-runner.LastOnline >= runnerOnlineTimeDeltaSecs { + runner.LastOnline = timeutil.TimeStampNow() + if err := bots_model.UpdateRunner(ctx, runner, "last_online"); err != nil { + log.Error("can't update runner last_online: %v", err) + } + } + ctx = context.WithValue(ctx, runnerCtxKey{}, runner) return unaryFunc(ctx, request) } From 699f5c5a06b30640044dde5947ea68310da8169f Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 12 Oct 2022 14:37:57 +0800 Subject: [PATCH 053/408] chore(runner): add soft deleted field --- go.mod | 2 +- go.sum | 2 -- models/bots/build.go | 2 +- models/bots/run.go | 6 +++--- models/bots/run_job.go | 5 +---- models/bots/runner.go | 2 ++ models/bots/runner_token.go | 5 +++-- models/bots/task.go | 9 +++------ 8 files changed, 14 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 9df3087b68829..b5b2fa1a67759 100644 --- a/go.mod +++ b/go.mod @@ -107,6 +107,7 @@ require ( golang.org/x/text v0.4.0 golang.org/x/tools v0.1.12 google.golang.org/grpc v1.47.0 + google.golang.org/protobuf v1.28.1 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 @@ -299,7 +300,6 @@ require ( golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect - google.golang.org/protobuf v1.28.1 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 548d7e123028e..ab76cd6ef28f3 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,6 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/ODIhBc/cxfp5p5yA8pOSb4= gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b h1:BEEgR2+rEOyWGbY3iyGCIrv6wmlaj9dAECWONexibrI= -gitea.com/gitea/proto-go v0.0.0-20221010074642-cc3659a7348b/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 h1:roFxcMnXJrjZvHBfba5Py6Jin9VTTute0WwzRXhJnQs= gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= diff --git a/models/bots/build.go b/models/bots/build.go index 9899d88199b0d..e10f8725bf2c1 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -226,7 +226,7 @@ func GetBuildByRepoAndIndex(repoID, index int64) (*Build, error) { } // AssignBuildToRunner assign a build to a runner -func AssignBuildToRunner(buildID int64, runnerID int64) error { +func AssignBuildToRunner(buildID, runnerID int64) error { cnt, err := db.GetEngine(db.DefaultContext). Where("runner_id=0"). And("id=?", buildID). diff --git a/models/bots/run.go b/models/bots/run.go index d8eac83297b85..7685b971080cb 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -81,15 +81,15 @@ func (r *Run) LoadAttributes(ctx context.Context) error { // InsertRun inserts a bot run func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { - var groupId int64 + var groupID int64 { // tricky way to get resource group id h := fnv.New64() _, _ = h.Write([]byte(fmt.Sprintf("%d_%s", run.RepoID, run.WorkflowID))) - groupId = int64(h.Sum64()) + groupID = int64(h.Sum64()) } - index, err := db.GetNextResourceIndex("bots_run_index", groupId) + index, err := db.GetNextResourceIndex("bots_run_index", groupID) if err != nil { return err } diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 6e55088135f05..91e32aaf0418f 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -54,11 +54,8 @@ func (job *RunJob) LoadAttributes(ctx context.Context) error { } job.Run = run } - if err := job.Run.LoadAttributes(ctx); err != nil { - return err - } - return nil + return job.Run.LoadAttributes(ctx) } // ErrRunJobNotExist represents an error for bot run job not exist diff --git a/models/bots/runner.go b/models/bots/runner.go index cecc2e7e9f154..7112d45784aa0 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -55,6 +55,8 @@ type Runner struct { LastOnline timeutil.TimeStamp `xorm:"index"` Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + Deleted timeutil.TimeStamp `xorm:"deleted"` } func (Runner) TableName() string { diff --git a/models/bots/runner_token.go b/models/bots/runner_token.go index 90070c57bb20c..a97d47cd479bf 100644 --- a/models/bots/runner_token.go +++ b/models/bots/runner_token.go @@ -36,8 +36,9 @@ type RunnerToken struct { Repo *repo_model.Repository `xorm:"-"` IsActive bool - CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` - UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + Deleted timeutil.TimeStamp `xorm:"deleted"` } func (RunnerToken) TableName() string { diff --git a/models/bots/task.go b/models/bots/task.go index fe705497d4d76..073fdcb29fe1b 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -21,7 +21,7 @@ type Task struct { Attempt int64 RunnerID int64 `xorm:"index"` LogToFile bool // read log from database or from storage - LogUrl string // url of the log file in storage + LogURL string // url of the log file in storage Result runnerv1.Result Started timeutil.TimeStamp Stopped timeutil.TimeStamp @@ -50,11 +50,8 @@ func (task *Task) LoadAttributes(ctx context.Context) error { } task.Job = job } - if err := task.Job.LoadAttributes(ctx); err != nil { - return err - } - return nil + return task.Job.LoadAttributes(ctx) } func CreateTask(runner *Runner) (*Task, bool, error) { @@ -71,7 +68,7 @@ func CreateTask(runner *Runner) (*Task, bool, error) { // TODO: a more efficient way to filter labels var job *RunJob - labels := append(runner.AgentLabels, runner.CustomLabels...) + labels := append([]string{}, append(runner.AgentLabels, runner.CustomLabels...)...) for _, v := range jobs { if isSubset(labels, v.RunsOn) { job = v From 6df53243aa592f2e970b634084f30b4b34e708e1 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 12 Oct 2022 14:46:06 +0800 Subject: [PATCH 054/408] feat: create task steps --- go.mod | 2 +- go.sum | 4 +-- models/bots/task.go | 41 ++++++++++++++++++++++++++++++- models/bots/task_step.go | 5 ++-- routers/api/bots/runner/runner.go | 4 +-- 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index b5b2fa1a67759..e55905aaa19bc 100644 --- a/go.mod +++ b/go.mod @@ -319,4 +319,4 @@ exclude github.com/gofrs/uuid v4.0.0+incompatible exclude github.com/goccy/go-json v0.4.11 -replace github.com/nektos/act => gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 +replace github.com/nektos/act => gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725 diff --git a/go.sum b/go.sum index ab76cd6ef28f3..3467e1ffc629f 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580 h1:F/VSl4oP5Gqe0FQ2i6BX/ODIhBc/cxfp5p5yA8pOSb4= -gitea.com/gitea/act v0.0.0-20221008102131-d89ab14fb580/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= +gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725 h1:H5lZ5fqSXAZ082wBKfqaME070sw5DeNwT8Bwyfa5mcc= +gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 h1:roFxcMnXJrjZvHBfba5Py6Jin9VTTute0WwzRXhJnQs= gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= diff --git a/models/bots/task.go b/models/bots/task.go index 073fdcb29fe1b..6a312143300bb 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -6,11 +6,14 @@ package bots import ( "context" + "fmt" "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" + + "github.com/nektos/act/pkg/jobparser" ) // Task represents a distribution of job @@ -54,7 +57,7 @@ func (task *Task) LoadAttributes(ctx context.Context) error { return task.Job.LoadAttributes(ctx) } -func CreateTask(runner *Runner) (*Task, bool, error) { +func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { ctx, commiter, err := db.TxContext() if err != nil { return nil, false, err @@ -91,10 +94,31 @@ func CreateTask(runner *Runner) (*Task, bool, error) { Started: now, } + var wolkflowJob *jobparser.Job + if gots, err := jobparser.Parse(job.WorkflowPayload); err != nil { + return nil, false, fmt.Errorf("parse workflow of job %d: %w", job.ID, err) + } else if len(gots) != 1 { + return nil, false, fmt.Errorf("workflow of job %d: not signle workflow", job.ID) + } else { + _, wolkflowJob = gots[0].Job() + } + if err := db.Insert(ctx, task); err != nil { return nil, false, err } + steps := make([]*TaskStep, len(wolkflowJob.Steps)) + for i, v := range wolkflowJob.Steps { + steps[i] = &TaskStep{ + Name: v.String(), + TaskID: task.ID, + Number: int64(i), + } + } + if err := db.Insert(ctx, steps); err != nil { + return nil, false, err + } + job.TaskID = task.ID if _, err := db.GetEngine(ctx).ID(job.ID).Update(job); err != nil { return nil, false, err @@ -112,6 +136,21 @@ func CreateTask(runner *Runner) (*Task, bool, error) { return task, true, nil } +func UpdateTask(state *runnerv1.TaskState) error { + //ctx, commiter, err := db.TxContext() + //if err != nil { + // return err + //} + //defer commiter.Close() + // + //task := &Task{ + // ID: state.Id, + // Result: state.Result, + // Stopped: timeutil.TimeStamp(state.StoppedAt.AsTime().Unix()), + //} + return nil +} + func isSubset(set, subset []string) bool { m := make(map[string]struct{}, len(set)) for _, v := range set { diff --git a/models/bots/task_step.go b/models/bots/task_step.go index c54cb6f913622..8bd2f9f304b7a 100644 --- a/models/bots/task_step.go +++ b/models/bots/task_step.go @@ -13,8 +13,9 @@ import ( // TaskStep represents a step of Task type TaskStep struct { ID int64 - TaskID int64 - Number int64 + Name string + TaskID int64 `xorm:"index unique(task_number)"` + Number int64 `xorm:"index unique(task_number)"` Result runnerv1.Result LogIndex int64 LogLength int64 diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 9af96bcd783b6..96c42106d744d 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -189,9 +189,9 @@ func (s *Service) UpdateLog( } func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) { - t, ok, err := bots_model.CreateTask(runner) + t, ok, err := bots_model.CreateTaskForRunner(runner) if err != nil { - return nil, false, fmt.Errorf("CreateTask: %w", err) + return nil, false, fmt.Errorf("CreateTaskForRunner: %w", err) } if !ok { return nil, false, nil From 7497155d14c50564bcbd82df7daa2aaa4768aa24 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 12 Oct 2022 15:39:27 +0800 Subject: [PATCH 055/408] feat: update step state --- models/bots/task.go | 74 ++++++++++++++++++++++++------- models/bots/task_step.go | 7 +++ routers/api/bots/runner/runner.go | 5 ++- 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/models/bots/task.go b/models/bots/task.go index 6a312143300bb..3420c8a811b99 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -20,7 +20,8 @@ import ( type Task struct { ID int64 JobID int64 - Job *RunJob `xorm:"-"` + Job *RunJob `xorm:"-"` + Steps []*TaskStep `xorm:"-"` Attempt int64 RunnerID int64 `xorm:"index"` LogToFile bool // read log from database or from storage @@ -40,7 +41,7 @@ func (Task) TableName() string { return "bots_task" } -// LoadAttributes load Job if not loaded +// LoadAttributes load Job Steps if not loaded func (task *Task) LoadAttributes(ctx context.Context) error { if task == nil { return nil @@ -53,8 +54,19 @@ func (task *Task) LoadAttributes(ctx context.Context) error { } task.Job = job } + if err := task.Job.LoadAttributes(ctx); err != nil { + return err + } + + if task.Steps == nil { // be careful, an empty slice (not nil) also means loaded + steps, err := GetTaskStepsByTaskID(ctx, task.ID) + if err != nil { + return err + } + task.Steps = steps + } - return task.Job.LoadAttributes(ctx) + return nil } func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { @@ -71,7 +83,7 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { // TODO: a more efficient way to filter labels var job *RunJob - labels := append([]string{}, append(runner.AgentLabels, runner.CustomLabels...)...) + labels := append(runner.AgentLabels, runner.CustomLabels...) for _, v := range jobs { if isSubset(labels, v.RunsOn) { job = v @@ -118,6 +130,7 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { if err := db.Insert(ctx, steps); err != nil { return nil, false, err } + task.Steps = steps job.TaskID = task.ID if _, err := db.GetEngine(ctx).ID(job.ID).Update(job); err != nil { @@ -137,17 +150,48 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { } func UpdateTask(state *runnerv1.TaskState) error { - //ctx, commiter, err := db.TxContext() - //if err != nil { - // return err - //} - //defer commiter.Close() - // - //task := &Task{ - // ID: state.Id, - // Result: state.Result, - // Stopped: timeutil.TimeStamp(state.StoppedAt.AsTime().Unix()), - //} + stepStates := map[int64]*runnerv1.StepState{} + for _, v := range state.Steps { + stepStates[v.Id] = v + } + + ctx, commiter, err := db.TxContext() + if err != nil { + return err + } + defer commiter.Close() + + task := &Task{} + if _, err := db.GetEngine(ctx).ID(state.Id).Get(task); err != nil { + return err + } + + task.Result = state.Result + task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix()) + + if _, err := db.GetEngine(ctx).ID(task.ID).Update(task); err != nil { + return err + } + + if err := task.LoadAttributes(ctx); err != nil { + return err + } + + for _, step := range task.Steps { + if v, ok := stepStates[step.Number]; ok { + step.Result = v.Result + step.LogIndex = v.LogIndex + step.LogLength = v.LogLength + if _, err := db.GetEngine(ctx).ID(step.ID).Update(step); err != nil { + return err + } + } + } + + if err := commiter.Commit(); err != nil { + return err + } + return nil } diff --git a/models/bots/task_step.go b/models/bots/task_step.go index 8bd2f9f304b7a..3cd7d1973faf4 100644 --- a/models/bots/task_step.go +++ b/models/bots/task_step.go @@ -5,6 +5,8 @@ package bots import ( + "context" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" @@ -32,3 +34,8 @@ func (TaskStep) TableName() string { func init() { db.RegisterModel(new(TaskStep)) } + +func GetTaskStepsByTaskID(ctx context.Context, taskID int64) ([]*TaskStep, error) { + var steps []*TaskStep + return steps, db.GetEngine(ctx).Where("task_id=?", taskID).OrderBy("number").Find(&steps) +} diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 96c42106d744d..3d35c943046ed 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -166,8 +166,9 @@ func (s *Service) UpdateTask( ) (*connect.Response[runnerv1.UpdateTaskResponse], error) { res := connect.NewResponse(&runnerv1.UpdateTaskResponse{}) - // to debug - log.Info("task state: %+v", req.Msg.State) + if err := bots_model.UpdateTask(req.Msg.State); err != nil { + return nil, status.Errorf(codes.Internal, "update task: %v", err) + } return res, nil } From 848a1ae30941b66110acf7ee88a894217c011b12 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 12 Oct 2022 17:58:36 +0800 Subject: [PATCH 056/408] feat: receive task logs --- models/bots/task_log.go | 50 ++++++++++++++++++++++++++----- routers/api/bots/runner/runner.go | 30 +++++++++++++++---- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/models/bots/task_log.go b/models/bots/task_log.go index 41949a83080ec..072108fdaca70 100644 --- a/models/bots/task_log.go +++ b/models/bots/task_log.go @@ -8,14 +8,15 @@ import ( "fmt" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) // TaskLog represents a task's log, every task has a standalone table type TaskLog struct { - ID int64 - Content string `xorm:"BINARY"` - Created timeutil.TimeStamp `xorm:"created"` + ID int64 + Timestamp timeutil.TimeStamp + Content string `xorm:"LONGTEXT"` } func init() { @@ -26,16 +27,16 @@ func GetTaskLogTableName(taskID int64) string { return fmt.Sprintf("bots_task_log_%d", taskID) } -// CreateTaskLog table for a build -func CreateTaskLog(buildID int64) error { +// CreateTaskLog table for a task +func CreateTaskLog(taskID int64) error { return db.GetEngine(db.DefaultContext). - Table(GetBuildLogTableName(buildID)). - Sync2(new(BuildLog)) + Table(GetTaskLogTableName(taskID)). + Sync(new(TaskLog)) } func GetTaskLogs(taskID, index, length int64) (logs []*TaskLog, err error) { sess := db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(taskID)). - Where("id>=?", index) + Where("id>=?", index).OrderBy("id") if length > 0 { sess.Limit(int(length)) @@ -45,3 +46,36 @@ func GetTaskLogs(taskID, index, length int64) (logs []*TaskLog, err error) { return } + +func InsertTaskLogs(taskID int64, logs []*TaskLog) (int64, error) { + if err := CreateTaskLog(taskID); err != nil { + return 0, err + } + table := GetTaskLogTableName(taskID) + + // TODO: A more complete way to insert logs + // Be careful: + // - the id of a log can be 0 + // - some logs may already exist in db + // - if use exec, consider different databases + // - the input should be ordered by id + // - the ids should be continuously increasing + // - the min id of input should be 1 + (the max id in db) + + if len(logs) == 0 { + return 0, fmt.Errorf("no logs") + } + ack := logs[0].ID - 1 + + sess := db.GetEngine(db.DefaultContext) + for _, v := range logs { + _, err := sess.Exec(fmt.Sprintf("INSERT IGNORE INTO %s (id, timestamp, content) VALUES (?,?,?)", table), v.ID, v.Timestamp, []byte(v.Content)) + if err != nil { + log.Error("insert log %d of task %d: %v", v.ID, taskID, err) + break + } + ack = v.ID + } + + return ack, nil +} diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 3d35c943046ed..b6533d9918581 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -180,11 +180,31 @@ func (s *Service) UpdateLog( ) (*connect.Response[runnerv1.UpdateLogResponse], error) { res := connect.NewResponse(&runnerv1.UpdateLogResponse{}) - // to debug - for i, row := range req.Msg.Rows { - log.Info("log[%v]: %v %v", req.Msg.Index+int64(i), row.Time.AsTime().Local().Format(time.RFC3339), row.Content) + if len(req.Msg.Rows) == 0 { + // TODO: should be 1 + the max id of stored log + res.Msg.AckIndex = req.Msg.Index + return res, nil + } + + rowIndex := req.Msg.Index + rows := make([]*bots_model.TaskLog, len(req.Msg.Rows)) + for i, v := range req.Msg.Rows { + rows[i] = &bots_model.TaskLog{ + ID: rowIndex + int64(i), + Timestamp: timeutil.TimeStamp(v.Time.AsTime().Unix()), + Content: v.Content, + } + } + + ack, err := bots_model.InsertTaskLogs(req.Msg.TaskId, rows) + if err != nil { + return nil, status.Errorf(codes.Internal, "insert task log: %v", err) + } + res.Msg.AckIndex = ack + + if req.Msg.NoMore { + // TODO: transfer logs to storage from db } - res.Msg.AckIndex = req.Msg.Index + int64(len(req.Msg.Rows)) return res, nil } From 5b989e2a1100f21109da251c909a2f765b3948c1 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Tue, 11 Oct 2022 21:28:58 +0800 Subject: [PATCH 057/408] feat(bots): update runner data in html page --- models/bots/runner.go | 12 ++++++++++++ routers/web/admin/runners.go | 33 +++++++++++++++++++++++++------- services/forms/admin.go | 4 ++-- templates/admin/runner/edit.tmpl | 6 +++++- templates/admin/runner/list.tmpl | 2 +- web_src/less/_runner.less | 5 +++++ 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/models/bots/runner.go b/models/bots/runner.go index 7112d45784aa0..f2824b1dc958f 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -74,6 +74,18 @@ func (r *Runner) OwnType() string { return r.Repo.FullName() } +func (r *Runner) StatusType() string { + switch r.Status { + case runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE: + return "offline" + case runnerv1.RunnerStatus_RUNNER_STATUS_IDLE: + return "online" + case runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE: + return "online" + } + return "unknown" +} + // AllLabels returns agent and custom labels func (r *Runner) AllLabels() []string { return append(r.AgentLabels, r.CustomLabels...) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index a37cce8661c2f..c44a425973361 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -8,12 +8,16 @@ package admin import ( "net/http" "net/url" + "strings" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/web" + "code.gitea.io/gitea/services/forms" ) const ( @@ -88,18 +92,33 @@ func EditRunner(ctx *context.Context) { // EditRunnerPost response for editing runner func EditRunnerPost(ctx *context.Context) { - // form := web.GetForm(ctx).(*forms.AdminEditRunnerForm) + runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid")) + if err != nil { + log.Warn("EditRunnerPost.GetRunnerByID failed: %v, url: %s", err, ctx.Req.URL) + ctx.ServerError("EditRunnerPost.GetRunnerByID", err) + return + } + + form := web.GetForm(ctx).(*forms.AdminEditRunnerForm) + runner.Description = form.Description + runner.CustomLabels = strings.Split(form.CustomLabels, ",") + + err = bots_model.UpdateRunner(ctx, runner, "description", "custom_labels") + if err != nil { + log.Warn("EditRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL) + ctx.Flash.Warning(ctx.Tr("admin.runners.edit_failed")) + ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) + return + } + ctx.Data["Title"] = ctx.Tr("admin.runners.edit") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRunners"] = true - if ctx.HasError() { - ctx.HTML(http.StatusOK, tplUserEdit) - return - } + log.Debug("EditRunnerPost success: %s", ctx.Req.URL) - ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success")) - ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid"))) + ctx.Flash.Success(ctx.Tr("admin.runners.edit_success")) + ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) } // DeleteRunner response for deleting a runner diff --git a/services/forms/admin.go b/services/forms/admin.go index 8c1ba0589ea13..8a1e679f68cf6 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -86,8 +86,8 @@ func (f *AdminCreateRunnerForm) Validate(req *http.Request, errs binding.Errors) // AdminEditRunnerForm form for admin to create runner type AdminEditRunnerForm struct { - Name string `binding:"Required"` - Type string + Description string + CustomLabels string } // Validate validates form fields diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl index 5a7f7f8c20cfe..b12b53101cb1d 100644 --- a/templates/admin/runner/edit.tmpl +++ b/templates/admin/runner/edit.tmpl @@ -11,6 +11,10 @@ {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}}
    +
    + + {{.Runner.StatusType}} +
    {{TimeSinceUnix .Runner.LastOnline $.locale}} @@ -55,7 +59,7 @@ {{.locale.Tr "admin.runner.task_list"}}
    - Comming soon + Comming soon
    diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl index dc85a82d3dfd9..d0167fb91028e 100644 --- a/templates/admin/runner/list.tmpl +++ b/templates/admin/runner/list.tmpl @@ -35,7 +35,7 @@ {{range .Runners}} - status + {{.StatusType}} #{{.ID}} diff --git a/web_src/less/_runner.less b/web_src/less/_runner.less index f5e1953d4a6d2..dacbe94f9e541 100644 --- a/web_src/less/_runner.less +++ b/web_src/less/_runner.less @@ -10,4 +10,9 @@ .runner-basic-info .dib { margin-right: 1em; } + .runner-status-online{ + .ui.label; + background-color: var(--color-green); + color: var(--color-white); + } } From fbb9f437a653a6c37677432d7be69cb73b38004d Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Wed, 12 Oct 2022 20:57:40 +0800 Subject: [PATCH 058/408] feat(runner): delete runner from admin html page --- models/bots/runner.go | 22 ++++++++++++++++------ routers/api/bots/runner/unary.go | 2 +- routers/web/admin/runners.go | 28 ++++++++++++++++++++++------ routers/web/web.go | 2 +- templates/admin/runner/edit.tmpl | 26 +++++++++++++++++--------- templates/admin/runner/list.tmpl | 2 +- 6 files changed, 58 insertions(+), 24 deletions(-) diff --git a/models/bots/runner.go b/models/bots/runner.go index f2824b1dc958f..37f42e9d3f998 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -97,10 +97,11 @@ func init() { type FindRunnerOptions struct { db.ListOptions - RepoID int64 - OwnerID int64 - Sort string - Filter string + RepoID int64 + OwnerID int64 + Sort string + Filter string + WithDeleted bool } func (opts FindRunnerOptions) toCond() builder.Cond { @@ -115,6 +116,9 @@ func (opts FindRunnerOptions) toCond() builder.Cond { if opts.Filter != "" { cond = cond.And(builder.Like{"name", opts.Filter}) } + if !opts.WithDeleted { + cond = cond.And(builder.IsNull{"deleted"}) + } return cond } @@ -208,9 +212,9 @@ func GetRunnerByToken(token string) (*Runner, error) { } // UpdateRunner updates runner's information. -func UpdateRunner(ctx context.Context, r *Runner, cols ...string) (err error) { +func UpdateRunner(ctx context.Context, r *Runner, cols ...string) error { e := db.GetEngine(ctx) - + var err error if len(cols) == 0 { _, err = e.ID(r.ID).AllCols().Update(r) } else { @@ -219,6 +223,12 @@ func UpdateRunner(ctx context.Context, r *Runner, cols ...string) (err error) { return err } +func DeleteRunner(ctx context.Context, r *Runner) error { + e := db.GetEngine(ctx) + _, err := e.Delete(r) + return err +} + // FindRunnersByRepoID returns all workers for the repository func FindRunnersByRepoID(repoID int64) ([]*Runner, error) { var runners []*Runner diff --git a/routers/api/bots/runner/unary.go b/routers/api/bots/runner/unary.go index f644a90fe173e..70e8de98b23f5 100644 --- a/routers/api/bots/runner/unary.go +++ b/routers/api/bots/runner/unary.go @@ -28,7 +28,7 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar token := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID runner, err := bots_model.GetRunnerByToken(token) if err != nil { - if _, ok := err.(*bots_model.ErrRunnerNotExist); ok { + if _, ok := err.(bots_model.ErrRunnerNotExist); ok { return nil, status.Error(codes.Unauthenticated, "unregistered runner") } return nil, status.Error(codes.Internal, err.Error()) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index c44a425973361..cf7bddd291fef 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -42,8 +42,9 @@ func Runners(ctx *context.Context) { Page: page, PageSize: 100, }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + WithDeleted: false, } count, err := bots_model.CountRunners(opts) @@ -122,11 +123,26 @@ func EditRunnerPost(ctx *context.Context) { } // DeleteRunner response for deleting a runner -func DeleteRunner(ctx *context.Context) { +func DeleteRunnerPost(ctx *context.Context) { + runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid")) + if err != nil { + log.Warn("DeleteRunnerPost.GetRunnerByID failed: %v, url: %s", err, ctx.Req.URL) + ctx.ServerError("DeleteRunnerPost.GetRunnerByID", err) + return + } + + err = bots_model.DeleteRunner(ctx, runner) + if err != nil { + log.Warn("DeleteRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL) + ctx.Flash.Warning(ctx.Tr("admin.runners.delete_failed")) + ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) + return + } + + log.Info("DeleteRunnerPost success: %s", ctx.Req.URL) + ctx.Flash.Success(ctx.Tr("admin.runners.deletion_success")) - ctx.JSON(http.StatusOK, map[string]interface{}{ - "redirect": setting.AppSubURL + "/admin/runners", - }) + ctx.Redirect(setting.AppSubURL + "/admin/runners/") } /** diff --git a/routers/web/web.go b/routers/web/web.go index ecd8e856f6a26..08252e3c15ad9 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -629,7 +629,7 @@ func RegisterRoutes(m *web.Route) { m.Group("/runners", func() { m.Get("", admin.Runners) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost) - m.Post("/{runnerid}/delete", admin.DeleteRunner) + m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) }) }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl index b12b53101cb1d..023114185de1c 100644 --- a/templates/admin/runner/edit.tmpl +++ b/templates/admin/runner/edit.tmpl @@ -48,9 +48,9 @@
    - -
    - {{.locale.Tr "admin.runners.delete_runner"}}
    + +
    @@ -64,14 +64,22 @@
    -
    -
    - {{svg "octicon-trash"}} - {{.locale.Tr "settings.delete_account_title"}} + {{template "base/footer" .}} diff --git a/templates/admin/runner/list.tmpl b/templates/admin/runner/list.tmpl index d0167fb91028e..0752cf65065d4 100644 --- a/templates/admin/runner/list.tmpl +++ b/templates/admin/runner/list.tmpl @@ -51,7 +51,7 @@ {{TimeSinceUnix .LastOnline $.locale}} {{svg "octicon-pencil"}} - {{svg "octicon-x-circle"}} + {{end}} From 7be1d90a5ada176430c3dd08dbc706eec0a4e447 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 13 Oct 2022 12:10:36 +0800 Subject: [PATCH 059/408] fix: ack right index --- models/bots/task_log.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/bots/task_log.go b/models/bots/task_log.go index 072108fdaca70..9603be6ac217f 100644 --- a/models/bots/task_log.go +++ b/models/bots/task_log.go @@ -65,7 +65,7 @@ func InsertTaskLogs(taskID int64, logs []*TaskLog) (int64, error) { if len(logs) == 0 { return 0, fmt.Errorf("no logs") } - ack := logs[0].ID - 1 + ack := logs[0].ID sess := db.GetEngine(db.DefaultContext) for _, v := range logs { @@ -74,7 +74,7 @@ func InsertTaskLogs(taskID int64, logs []*TaskLog) (int64, error) { log.Error("insert log %d of task %d: %v", v.ID, taskID, err) break } - ack = v.ID + ack = v.ID + 1 } return ack, nil From e68295fb7cd22f9679db59c1566488b1454b7e8a Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 13 Oct 2022 16:52:43 +0800 Subject: [PATCH 060/408] chore(dep): upgrade proto-go --- go.mod | 2 +- go.sum | 4 ++-- models/bots/run.go | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index e55905aaa19bc..1e2cd669a989f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 + gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 3467e1ffc629f..8f79fe488cc62 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725 h1:H5lZ5fqSXAZ082wBKfqaME070sw5DeNwT8Bwyfa5mcc= gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9 h1:roFxcMnXJrjZvHBfba5Py6Jin9VTTute0WwzRXhJnQs= -gitea.com/gitea/proto-go v0.0.0-20221010094818-eedee304e2b9/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a h1:WHNPcbDR2vw2a17Ml06+n4MC0UwsyD/F3WeVteaXWMI= +gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/bots/run.go b/models/bots/run.go index 7685b971080cb..2f689f12aeb17 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -125,11 +125,7 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { return err } - if err := commiter.Commit(); err != nil { - return err - } - - return nil + return commiter.Commit() } // ErrRunNotExist represents an error for bot run not exist From b7aaa3ba774173b2a791e840cdc6a507fe5cc37f Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 13 Oct 2022 17:22:39 +0800 Subject: [PATCH 061/408] chore(runner): support update runner status. --- routers/api/bots/runner/runner.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index b6533d9918581..de43156e53a33 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -36,6 +36,27 @@ type Service struct { runnerv1connect.UnimplementedRunnerServiceHandler } +// UpdateRunner update runner status or other data. +func (s *Service) UpdateRunner( + ctx context.Context, + req *connect.Request[runnerv1.UpdateRunnerRequest], +) (*connect.Response[runnerv1.UpdateRunnerResponse], error) { + runner := GetRunner(ctx) + + // check status + if runner.Status == req.Msg.Status { + return connect.NewResponse(&runnerv1.UpdateRunnerResponse{}), nil + } + + // update status + runner.Status = req.Msg.Status + if err := bots_model.UpdateRunner(ctx, runner, "status"); err != nil { + return nil, connect.NewError(connect.CodeInternal, err) + } + + return connect.NewResponse(&runnerv1.UpdateRunnerResponse{}), nil +} + // Register for new runner. func (s *Service) Register( ctx context.Context, From 027d748fe2db056a7bf59e4b115d62a1548b82e0 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 13 Oct 2022 17:38:47 +0800 Subject: [PATCH 062/408] feat: api for fetch job state --- models/bots/run_job.go | 8 +++ models/bots/task.go | 23 +++++++ routers/web/repo/builds/builds.go | 100 ++++++++++++++++++++++++++++++ routers/web/web.go | 6 +- 4 files changed, 135 insertions(+), 2 deletions(-) diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 91e32aaf0418f..01b190de832db 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -80,3 +80,11 @@ func GetRunJobByID(ctx context.Context, id int64) (*RunJob, error) { return &job, nil } + +func GetRunJobsByRunID(ctx context.Context, runID int64) ([]*RunJob, error) { + var jobs []*RunJob + if err := db.GetEngine(ctx).Where("run_id=?", runID).Find(&jobs); err != nil { + return nil, err + } + return jobs, nil +} diff --git a/models/bots/task.go b/models/bots/task.go index 3420c8a811b99..144381f99cb76 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -69,6 +69,29 @@ func (task *Task) LoadAttributes(ctx context.Context) error { return nil } +// ErrTaskNotExist represents an error for bot task not exist +type ErrTaskNotExist struct { + ID int64 +} + +func (err ErrTaskNotExist) Error() string { + return fmt.Sprintf("task [%d] is not exist", err.ID) +} + +func GetTaskByID(ctx context.Context, id int64) (*Task, error) { + var task Task + has, err := db.GetEngine(ctx).Where("id=?", id).Get(&task) + if err != nil { + return nil, err + } else if !has { + return nil, ErrTaskNotExist{ + ID: id, + } + } + + return &task, nil +} + func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { ctx, commiter, err := db.TxContext() if err != nil { diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index 7058661dba3fa..55507fe9affce 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -8,6 +8,7 @@ import ( "fmt" "net/http" + "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" @@ -147,3 +148,102 @@ LOOP_WORKFLOWS: ctx.JSON(http.StatusOK, logs) } + +type RunState struct { + Title string `json:"title"` + Jobs []*RunStateJob `json:"jobs"` + CurrentJobInfo *RunStateJobInfo `json:"current_job_info"` + CurrentJobSteps []*RunStateJobSteps `json:"current_job_steps"` +} + +type RunStateJob struct { + ID int64 `json:"id"` + Name string `json:"name"` + Status core.BuildStatus `json:"status"` +} + +type RunStateJobInfo struct { + Title string `json:"title"` + Detail string `json:"detail"` +} + +type RunStateJobSteps struct { + Summary string `json:"summary"` + Status core.BuildStatus `json:"status"` + Duration int64 `json:"duration"` // seconds +} + +func GetRunState(ctx *context.Context) { + runID := ctx.ParamsInt64("index") + currentJobID := ctx.ParamsInt64("jobid") + + run, err := bots_model.GetRunByID(ctx, runID) + if err != nil { + if _, ok := err.(bots_model.ErrRunNotExist); ok { + ctx.Error(http.StatusNotFound, err.Error()) + return + } + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + jobs, err := bots_model.GetRunJobsByRunID(ctx, run.ID) + if err != nil { + if _, ok := err.(bots_model.ErrRunJobNotExist); ok { + ctx.Error(http.StatusNotFound, err.Error()) + return + } + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + state := &RunState{ + Title: run.Name, + Jobs: make([]*RunStateJob, len(jobs)), + } + for i, v := range jobs { + state.Jobs[i] = &RunStateJob{ + ID: v.ID, + Name: v.Name, + Status: v.Status, + } + } + if currentJobID != 0 { + for _, job := range jobs { + if job.ID == currentJobID { + state.CurrentJobInfo = &RunStateJobInfo{ + Title: job.Name, + } + if job.TaskID == 0 { + state.CurrentJobInfo.Detail = "wait to be pick up by a runner" + } + state.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info, need to be internationalized + + task, err := bots_model.GetTaskByID(ctx, job.TaskID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + task.Job = job + if err := task.LoadAttributes(ctx); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + state.CurrentJobSteps = make([]*RunStateJobSteps, 0, len(task.Steps)+2) + // TODO: add steps "Set up job" and "Complete job" + for _, step := range task.Steps { + state.CurrentJobSteps = append(state.CurrentJobSteps, &RunStateJobSteps{ + Summary: step.Name, + Status: core.StatusRunning, // TODO: add status to step + Duration: int64(step.Stopped - step.Started), + }) + } + } + } + } + + ctx.JSON(http.StatusOK, state) +} + +func GetRunLog(ctx *context.Context) { + // TODO +} diff --git a/routers/web/web.go b/routers/web/web.go index 08252e3c15ad9..dc0194b6686e3 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1185,8 +1185,10 @@ func RegisterRoutes(m *web.Route) { m.Group("/builds", func() { m.Get("", builds.List) m.Group("/{index}", func() { - m.Get("", builds.ViewBuild) - m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) + //m.Get("", builds.ViewBuild) + //m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) + m.Get("", builds.GetRunState) + m.Get("/job/{jobid}", builds.GetRunState) }) }, reqRepoBuildsReader, builds.MustEnableBuilds) From d320eb66f4ff9f4a6f7ce268aa51c5e13b270878 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 14 Oct 2022 16:18:14 +0800 Subject: [PATCH 063/408] feat: fetch job data --- models/bots/run_job.go | 2 +- models/bots/task_log.go | 6 +- routers/web/dev/buildview.go | 191 ++++++++++++++++++++++++ routers/web/repo/builds/builds.go | 100 ------------- routers/web/web.go | 8 +- web_src/js/components/RepoBuildView.vue | 12 +- 6 files changed, 208 insertions(+), 111 deletions(-) diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 01b190de832db..04de1f1a1bb89 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -73,7 +73,7 @@ func GetRunJobByID(ctx context.Context, id int64) (*RunJob, error) { if err != nil { return nil, err } else if !has { - return nil, ErrRunNotExist{ + return nil, ErrRunJobNotExist{ ID: id, } } diff --git a/models/bots/task_log.go b/models/bots/task_log.go index 9603be6ac217f..5bdd11ec32ead 100644 --- a/models/bots/task_log.go +++ b/models/bots/task_log.go @@ -14,7 +14,7 @@ import ( // TaskLog represents a task's log, every task has a standalone table type TaskLog struct { - ID int64 + ID int64 `xorm:"pk"` Timestamp timeutil.TimeStamp Content string `xorm:"LONGTEXT"` } @@ -35,10 +35,10 @@ func CreateTaskLog(taskID int64) error { } func GetTaskLogs(taskID, index, length int64) (logs []*TaskLog, err error) { - sess := db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(taskID)). + sess := db.GetEngine(db.DefaultContext).Table(GetTaskLogTableName(taskID)). Where("id>=?", index).OrderBy("id") - if length > 0 { + if length >= 0 { sess.Limit(int(length)) } diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go index a4361c848e07c..cf1fbbfd87c1e 100644 --- a/routers/web/dev/buildview.go +++ b/routers/web/dev/buildview.go @@ -1,7 +1,11 @@ package dev import ( + "code.gitea.io/gitea/core" + bots_model "code.gitea.io/gitea/models/bots" + "code.gitea.io/gitea/modules/web" "net/http" + "strconv" "code.gitea.io/gitea/modules/context" ) @@ -9,3 +13,190 @@ import ( func BuildView(ctx *context.Context) { ctx.HTML(http.StatusOK, "dev/buildview") } + +type BuildViewRequest struct { + StepLogCursors []struct { + StepIndex int `json:"stepIndex"` + Cursor int64 `json:"cursor"` + Expanded bool `json:"expanded"` + } `json:"stepLogCursors"` +} + +type BuildViewResponse struct { + StateData struct { + BuildInfo struct { + Title string `json:"title"` + } `json:"buildInfo"` + AllJobGroups []BuildViewGroup `json:"allJobGroups"` + CurrentJobInfo struct { + Title string `json:"title"` + Detail string `json:"detail"` + } `json:"currentJobInfo"` + CurrentJobSteps []BuildViewJobStep `json:"currentJobSteps"` + } `json:"stateData"` + LogsData struct { + StreamingLogs []BuildViewStepLog `json:"streamingLogs"` + } `json:"logsData"` +} + +type BuildViewGroup struct { + Summary string `json:"summary"` + Jobs []*BuildViewJob `json:"jobs"` +} + +type BuildViewJob struct { + Id int64 `json:"id"` + Name string `json:"name"` + Status core.BuildStatus `json:"status"` +} + +type BuildViewJobStep struct { + Summary string `json:"summary"` + Duration float64 `json:"duration"` + Status core.BuildStatus `json:"status"` +} + +type BuildViewStepLog struct { + StepIndex int `json:"stepIndex"` + Cursor int64 `json:"cursor"` + Lines []BuildViewStepLogLine `json:"lines"` +} + +type BuildViewStepLogLine struct { + Ln int `json:"ln"` + M string `json:"m"` + T float64 `json:"t"` +} + +func BuildViewPost(ctx *context.Context) { + req := web.GetForm(ctx).(*BuildViewRequest) + currentJobID, _ := strconv.ParseInt(ctx.Req.URL.Query().Get("job_id"), 10, 64) + + job, err := bots_model.GetRunJobByID(ctx, currentJobID) + if err != nil { + if _, ok := err.(bots_model.ErrRunJobNotExist); ok { + ctx.Error(http.StatusNotFound, err.Error()) + return + } + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + if err := job.LoadAttributes(ctx); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + run := job.Run + jobs, err := bots_model.GetRunJobsByRunID(ctx, run.ID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + var task *bots_model.Task + if job.TaskID > 0 { + task, err = bots_model.GetTaskByID(ctx, job.TaskID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + task.Job = job + if err := task.LoadAttributes(ctx); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + } + + resp := &BuildViewResponse{} + resp.StateData.BuildInfo.Title = run.Name + + respJobs := make([]*BuildViewJob, len(jobs)) + for i, v := range jobs { + respJobs[i] = &BuildViewJob{ + Id: v.ID, + Name: v.Name, + Status: v.Status, + } + } + + resp.StateData.AllJobGroups = []BuildViewGroup{ + { + Summary: "Only One Group", // TODO: maybe we don't need job group + Jobs: respJobs, + }, + } + + resp.StateData.CurrentJobInfo.Title = job.Name + resp.LogsData.StreamingLogs = make([]BuildViewStepLog, 0, len(req.StepLogCursors)) + if job.TaskID == 0 { + resp.StateData.CurrentJobInfo.Detail = "wait to be pick up by a runner" + } else { + resp.StateData.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info + + var firstStep, lastStep *bots_model.TaskStep + if l := len(task.Steps); l > 0 { + firstStep = task.Steps[0] + lastStep = task.Steps[l-1] + } + headStep := &bots_model.TaskStep{ + Name: "Set up job", + LogIndex: 0, + LogLength: -1, // no limit + Started: task.Started, + } + if firstStep != nil { + headStep.LogLength = firstStep.LogIndex + headStep.Stopped = firstStep.Started + } + tailStep := &bots_model.TaskStep{ + Name: "Complete job", + Stopped: task.Stopped, + } + if lastStep != nil { + tailStep.LogIndex = lastStep.LogIndex + lastStep.LogLength + tailStep.LogLength = -1 // no limit + tailStep.Started = lastStep.Stopped + } + steps := make([]*bots_model.TaskStep, 0, len(task.Steps)+2) + steps = append(steps, headStep) + steps = append(steps, task.Steps...) + steps = append(steps, tailStep) + + resp.StateData.CurrentJobSteps = make([]BuildViewJobStep, len(steps)) + for i, v := range steps { + resp.StateData.CurrentJobSteps[i] = BuildViewJobStep{ + Summary: v.Name, + Duration: float64(v.Stopped - v.Started), + Status: core.StatusRunning, // TODO: add status to step, + } + } + + for _, cursor := range req.StepLogCursors { + if cursor.Expanded { + step := steps[cursor.StepIndex] + var logRows []*bots_model.TaskLog + if cursor.Cursor < step.LogLength || step.LogLength < 0 { + logRows, err = bots_model.GetTaskLogs(task.ID, step.LogIndex+cursor.Cursor, step.LogLength-cursor.Cursor) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + } + logLines := make([]BuildViewStepLogLine, len(logRows)) + for i, row := range logRows { + logLines[i] = BuildViewStepLogLine{ + Ln: i, + M: row.Content, + T: float64(row.Timestamp), + } + } + resp.LogsData.StreamingLogs = append(resp.LogsData.StreamingLogs, BuildViewStepLog{ + StepIndex: cursor.StepIndex, + Cursor: cursor.Cursor + int64(len(logLines)), + Lines: logLines, + }) + } + } + } + + ctx.JSON(http.StatusOK, resp) +} diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index 55507fe9affce..7058661dba3fa 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -8,7 +8,6 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" @@ -148,102 +147,3 @@ LOOP_WORKFLOWS: ctx.JSON(http.StatusOK, logs) } - -type RunState struct { - Title string `json:"title"` - Jobs []*RunStateJob `json:"jobs"` - CurrentJobInfo *RunStateJobInfo `json:"current_job_info"` - CurrentJobSteps []*RunStateJobSteps `json:"current_job_steps"` -} - -type RunStateJob struct { - ID int64 `json:"id"` - Name string `json:"name"` - Status core.BuildStatus `json:"status"` -} - -type RunStateJobInfo struct { - Title string `json:"title"` - Detail string `json:"detail"` -} - -type RunStateJobSteps struct { - Summary string `json:"summary"` - Status core.BuildStatus `json:"status"` - Duration int64 `json:"duration"` // seconds -} - -func GetRunState(ctx *context.Context) { - runID := ctx.ParamsInt64("index") - currentJobID := ctx.ParamsInt64("jobid") - - run, err := bots_model.GetRunByID(ctx, runID) - if err != nil { - if _, ok := err.(bots_model.ErrRunNotExist); ok { - ctx.Error(http.StatusNotFound, err.Error()) - return - } - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - jobs, err := bots_model.GetRunJobsByRunID(ctx, run.ID) - if err != nil { - if _, ok := err.(bots_model.ErrRunJobNotExist); ok { - ctx.Error(http.StatusNotFound, err.Error()) - return - } - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - state := &RunState{ - Title: run.Name, - Jobs: make([]*RunStateJob, len(jobs)), - } - for i, v := range jobs { - state.Jobs[i] = &RunStateJob{ - ID: v.ID, - Name: v.Name, - Status: v.Status, - } - } - if currentJobID != 0 { - for _, job := range jobs { - if job.ID == currentJobID { - state.CurrentJobInfo = &RunStateJobInfo{ - Title: job.Name, - } - if job.TaskID == 0 { - state.CurrentJobInfo.Detail = "wait to be pick up by a runner" - } - state.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info, need to be internationalized - - task, err := bots_model.GetTaskByID(ctx, job.TaskID) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - task.Job = job - if err := task.LoadAttributes(ctx); err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - state.CurrentJobSteps = make([]*RunStateJobSteps, 0, len(task.Steps)+2) - // TODO: add steps "Set up job" and "Complete job" - for _, step := range task.Steps { - state.CurrentJobSteps = append(state.CurrentJobSteps, &RunStateJobSteps{ - Summary: step.Name, - Status: core.StatusRunning, // TODO: add status to step - Duration: int64(step.Stopped - step.Started), - }) - } - } - } - } - - ctx.JSON(http.StatusOK, state) -} - -func GetRunLog(ctx *context.Context) { - // TODO -} diff --git a/routers/web/web.go b/routers/web/web.go index dc0194b6686e3..1c284f9df07cb 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -660,7 +660,9 @@ func RegisterRoutes(m *web.Route) { m.Post("/{username}", reqSignIn, context_service.UserAssignmentWeb(), user.Action) if !setting.IsProd { + m.Any("/dev/termdemo", dev.TermDemo) m.Get("/dev/buildview", dev.BuildView) + m.Post("/dev/buildview", bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) } reqRepoAdmin := context.RequireRepoAdmin() @@ -1185,10 +1187,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/builds", func() { m.Get("", builds.List) m.Group("/{index}", func() { - //m.Get("", builds.ViewBuild) - //m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) - m.Get("", builds.GetRunState) - m.Get("/job/{jobid}", builds.GetRunState) + m.Get("", builds.ViewBuild) + m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) }) }, reqRepoBuildsReader, builds.MustEnableBuilds) diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index d35a4c471527a..90737790ddd59 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -80,6 +80,8 @@ const sfc = { data() { return { + jobId: 120, // TODO: read job id + // internal state loading: false, currentJobStepsStates: [], @@ -248,7 +250,11 @@ const sfc = { }, async fetchJobData(reqData) { - const resp = await fetch(`?job_id=${this.jobId}`, {method: 'POST', body: JSON.stringify(reqData)}); + const resp = await fetch(`?job_id=${this.jobId}`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(reqData), + }); return await resp.json(); }, @@ -265,8 +271,8 @@ const sfc = { }); const reqData = {stepLogCursors}; - // const respData = await this.fetchJobData(); - const respData = this.fetchMockData(reqData); + const respData = await this.fetchJobData(reqData); + // const respData = this.fetchMockData(reqData); // console.log('loadJobData by request', reqData, ', get response ', respData); From 1cba52376aa7ec7e4f0c01f1db845f162816d698 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 14 Oct 2022 18:30:00 +0800 Subject: [PATCH 064/408] feat: use run id and job id in page view --- models/bots/task.go | 34 +++++ routers/web/dev/buildview.go | 158 +++++++++++------------- routers/web/web.go | 11 +- templates/dev/buildview.tmpl | 2 +- web_src/js/components/RepoBuildView.vue | 17 ++- 5 files changed, 126 insertions(+), 96 deletions(-) diff --git a/models/bots/task.go b/models/bots/task.go index 144381f99cb76..58849d4086573 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -69,6 +69,40 @@ func (task *Task) LoadAttributes(ctx context.Context) error { return nil } +// FullSteps returns steps with "Set up job" and "Complete job" +func (task *Task) FullSteps() []*TaskStep { + var firstStep, lastStep *TaskStep + if l := len(task.Steps); l > 0 { + firstStep = task.Steps[0] + lastStep = task.Steps[l-1] + } + headStep := &TaskStep{ + Name: "Set up job", + LogIndex: 0, + LogLength: -1, // no limit + Started: task.Started, + } + if firstStep != nil { + headStep.LogLength = firstStep.LogIndex + headStep.Stopped = firstStep.Started + } + tailStep := &TaskStep{ + Name: "Complete job", + Stopped: task.Stopped, + } + if lastStep != nil { + tailStep.LogIndex = lastStep.LogIndex + lastStep.LogLength + tailStep.LogLength = -1 // no limit + tailStep.Started = lastStep.Stopped + } + steps := make([]*TaskStep, 0, len(task.Steps)+2) + steps = append(steps, headStep) + steps = append(steps, task.Steps...) + steps = append(steps, tailStep) + + return steps +} + // ErrTaskNotExist represents an error for bot task not exist type ErrTaskNotExist struct { ID int64 diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go index cf1fbbfd87c1e..4c31724a27512 100644 --- a/routers/web/dev/buildview.go +++ b/routers/web/dev/buildview.go @@ -1,16 +1,19 @@ package dev import ( - "code.gitea.io/gitea/core" - bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/modules/web" + "fmt" "net/http" - "strconv" + "code.gitea.io/gitea/core" + bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/web" ) func BuildView(ctx *context.Context) { + ctx.Data["RunID"] = ctx.Params("runid") + ctx.Data["JobID"] = ctx.Params("jobid") + ctx.HTML(http.StatusOK, "dev/buildview") } @@ -70,38 +73,34 @@ type BuildViewStepLogLine struct { func BuildViewPost(ctx *context.Context) { req := web.GetForm(ctx).(*BuildViewRequest) - currentJobID, _ := strconv.ParseInt(ctx.Req.URL.Query().Get("job_id"), 10, 64) + runID := ctx.ParamsInt64("runid") + jobID := ctx.ParamsInt64("jobid") - job, err := bots_model.GetRunJobByID(ctx, currentJobID) + run, err := bots_model.GetRunByID(ctx, runID) if err != nil { - if _, ok := err.(bots_model.ErrRunJobNotExist); ok { + if _, ok := err.(bots_model.ErrRunNotExist); ok { ctx.Error(http.StatusNotFound, err.Error()) return } ctx.Error(http.StatusInternalServerError, err.Error()) return } - if err := job.LoadAttributes(ctx); err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - run := job.Run jobs, err := bots_model.GetRunJobsByRunID(ctx, run.ID) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - var task *bots_model.Task - if job.TaskID > 0 { - task, err = bots_model.GetTaskByID(ctx, job.TaskID) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return + + var job *bots_model.RunJob + if jobID != 0 { + for _, v := range jobs { + if v.ID == jobID { + job = v + break + } } - task.Job = job - if err := task.LoadAttributes(ctx); err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) + if job == nil { + ctx.Error(http.StatusNotFound, fmt.Sprintf("run %v has no job %v", runID, jobID)) return } } @@ -125,75 +124,64 @@ func BuildViewPost(ctx *context.Context) { }, } - resp.StateData.CurrentJobInfo.Title = job.Name - resp.LogsData.StreamingLogs = make([]BuildViewStepLog, 0, len(req.StepLogCursors)) - if job.TaskID == 0 { - resp.StateData.CurrentJobInfo.Detail = "wait to be pick up by a runner" - } else { - resp.StateData.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info - - var firstStep, lastStep *bots_model.TaskStep - if l := len(task.Steps); l > 0 { - firstStep = task.Steps[0] - lastStep = task.Steps[l-1] - } - headStep := &bots_model.TaskStep{ - Name: "Set up job", - LogIndex: 0, - LogLength: -1, // no limit - Started: task.Started, - } - if firstStep != nil { - headStep.LogLength = firstStep.LogIndex - headStep.Stopped = firstStep.Started - } - tailStep := &bots_model.TaskStep{ - Name: "Complete job", - Stopped: task.Stopped, - } - if lastStep != nil { - tailStep.LogIndex = lastStep.LogIndex + lastStep.LogLength - tailStep.LogLength = -1 // no limit - tailStep.Started = lastStep.Stopped - } - steps := make([]*bots_model.TaskStep, 0, len(task.Steps)+2) - steps = append(steps, headStep) - steps = append(steps, task.Steps...) - steps = append(steps, tailStep) - - resp.StateData.CurrentJobSteps = make([]BuildViewJobStep, len(steps)) - for i, v := range steps { - resp.StateData.CurrentJobSteps[i] = BuildViewJobStep{ - Summary: v.Name, - Duration: float64(v.Stopped - v.Started), - Status: core.StatusRunning, // TODO: add status to step, + if job != nil { + var task *bots_model.Task + if job.TaskID > 0 { + task, err = bots_model.GetTaskByID(ctx, job.TaskID) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + task.Job = job + if err := task.LoadAttributes(ctx); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return } } - for _, cursor := range req.StepLogCursors { - if cursor.Expanded { - step := steps[cursor.StepIndex] - var logRows []*bots_model.TaskLog - if cursor.Cursor < step.LogLength || step.LogLength < 0 { - logRows, err = bots_model.GetTaskLogs(task.ID, step.LogIndex+cursor.Cursor, step.LogLength-cursor.Cursor) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } + resp.StateData.CurrentJobInfo.Title = job.Name + resp.LogsData.StreamingLogs = make([]BuildViewStepLog, 0, len(req.StepLogCursors)) + if job.TaskID == 0 { + resp.StateData.CurrentJobInfo.Detail = "wait to be pick up by a runner" + } else { + resp.StateData.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info + + steps := task.FullSteps() + + resp.StateData.CurrentJobSteps = make([]BuildViewJobStep, len(steps)) + for i, v := range steps { + resp.StateData.CurrentJobSteps[i] = BuildViewJobStep{ + Summary: v.Name, + Duration: float64(v.Stopped - v.Started), + Status: core.StatusRunning, // TODO: add status to step, } - logLines := make([]BuildViewStepLogLine, len(logRows)) - for i, row := range logRows { - logLines[i] = BuildViewStepLogLine{ - Ln: i, - M: row.Content, - T: float64(row.Timestamp), + } + + for _, cursor := range req.StepLogCursors { + if cursor.Expanded { + step := steps[cursor.StepIndex] + var logRows []*bots_model.TaskLog + if cursor.Cursor < step.LogLength || step.LogLength < 0 { + logRows, err = bots_model.GetTaskLogs(task.ID, step.LogIndex+cursor.Cursor, step.LogLength-cursor.Cursor) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + } + logLines := make([]BuildViewStepLogLine, len(logRows)) + for i, row := range logRows { + logLines[i] = BuildViewStepLogLine{ + Ln: i, + M: row.Content, + T: float64(row.Timestamp), + } } + resp.LogsData.StreamingLogs = append(resp.LogsData.StreamingLogs, BuildViewStepLog{ + StepIndex: cursor.StepIndex, + Cursor: cursor.Cursor + int64(len(logLines)), + Lines: logLines, + }) } - resp.LogsData.StreamingLogs = append(resp.LogsData.StreamingLogs, BuildViewStepLog{ - StepIndex: cursor.StepIndex, - Cursor: cursor.Cursor + int64(len(logLines)), - Lines: logLines, - }) } } } diff --git a/routers/web/web.go b/routers/web/web.go index 1c284f9df07cb..9ed94099e25ae 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/public" + _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/structs" @@ -45,8 +46,6 @@ import ( "code.gitea.io/gitea/services/forms" "code.gitea.io/gitea/services/lfs" - _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters - "gitea.com/go-chi/captcha" "gitea.com/go-chi/session" "github.com/NYTimes/gziphandler" @@ -661,8 +660,12 @@ func RegisterRoutes(m *web.Route) { if !setting.IsProd { m.Any("/dev/termdemo", dev.TermDemo) - m.Get("/dev/buildview", dev.BuildView) - m.Post("/dev/buildview", bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) + m.Combo("/dev/buildview/runs/{runid}"). + Get(dev.BuildView). + Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) + m.Combo("/dev/buildview/runs/{runid}/jobs/{jobid}"). + Get(dev.BuildView). + Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) } reqRepoAdmin := context.RequireRepoAdmin() diff --git a/templates/dev/buildview.tmpl b/templates/dev/buildview.tmpl index bd5ef151ba0bd..044adff7c06a9 100644 --- a/templates/dev/buildview.tmpl +++ b/templates/dev/buildview.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} -
    +
    diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index 90737790ddd59..f2b963eba3152 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -10,7 +10,7 @@ {{ jobGroup.summary }}
    - + @@ -77,11 +77,13 @@ const sfc = { components: { SvgIcon, }, + props: { + runId: Number, + jobId: Number, + }, data() { return { - jobId: 120, // TODO: read job id - // internal state loading: false, currentJobStepsStates: [], @@ -138,7 +140,7 @@ const sfc = { toggleStepLogs(idx) { this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; if (this.currentJobStepsStates[idx].expanded) { - this.loadJobData(); + // this.loadJobData(); // FIXME: cannot call loadJobData more than once } }, @@ -250,7 +252,7 @@ const sfc = { }, async fetchJobData(reqData) { - const resp = await fetch(`?job_id=${this.jobId}`, { + const resp = await fetch(`/dev/buildview/runs/${this.runId}/jobs/${this.jobId}`, { // FIXME: hard code path method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(reqData), @@ -307,7 +309,10 @@ export function initRepositoryBuildView() { const el = document.getElementById('repo-build-view'); if (!el) return; - const view = createApp(sfc); + const view = createApp(sfc, { + jobId: el.getAttribute("job-id"), + runId: el.getAttribute("run-id"), + }); view.mount(el); } From bc6a2b2374c822e1d36a9a07feee9c56f7ef6c52 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 14 Oct 2022 20:56:46 +0800 Subject: [PATCH 065/408] fix RepoBuildView loadJobData --- web_src/js/components/RepoBuildView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index f2b963eba3152..930d039ef8358 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -140,7 +140,7 @@ const sfc = { toggleStepLogs(idx) { this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; if (this.currentJobStepsStates[idx].expanded) { - // this.loadJobData(); // FIXME: cannot call loadJobData more than once + this.loadJobData(); } }, @@ -261,8 +261,8 @@ const sfc = { }, async loadJobData() { + if (this.loading) return; try { - if (this.loading) return; this.loading = true; const stepLogCursors = this.currentJobStepsStates.map((it, idx) => { From eeaac2c9f78969f785c52154d1345631fb1f113d Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 15 Oct 2022 16:10:25 +0800 Subject: [PATCH 066/408] chore(runner): remove url checker from register Signed-off-by: Bo-Yi.Wu --- routers/api/bots/runner/runner.go | 46 ++----------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index de43156e53a33..46b6bc429c6c8 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -8,14 +8,10 @@ import ( "context" "errors" "fmt" - "net/url" - "strings" "time" "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" @@ -62,10 +58,8 @@ func (s *Service) Register( ctx context.Context, req *connect.Request[runnerv1.RegisterRequest], ) (*connect.Response[runnerv1.RegisterResponse], error) { - token := req.Header().Get("X-Runner-Token") - - if token == "" || req.Msg.Name == "" || req.Msg.Url == "" { - return nil, errors.New("missing runner token, name or URL") + if req.Msg.Token == "" || req.Msg.Name == "" { + return nil, errors.New("missing runner token, name") } runnerToken, err := bots_model.GetRunnerToken(req.Msg.Token) @@ -77,41 +71,6 @@ func (s *Service) Register( return nil, errors.New("runner token has already activated") } - // valiate user data - u, err := url.Parse(req.Msg.Url) - if err != nil { - return nil, errors.New("can't parse url: " + req.Msg.Url) - } - - urls := strings.Split(u.Path, "/") - if runnerToken.OwnerID != 0 { - if len(urls) < 2 { - return nil, errors.New("can't parse owner name") - } - owner, err := user.GetUserByID(runnerToken.OwnerID) - if err != nil { - return nil, errors.New("can't get owner name") - } - if owner.LowerName != strings.ToLower(urls[1]) { - return nil, errors.New("wrong owner name") - } - } - - if runnerToken.RepoID != 0 { - if len(urls) < 3 { - return nil, errors.New("can't parse repo name") - } - - r, err := repo.GetRepositoryByIDCtx(ctx, runnerToken.RepoID) - if err != nil { - return nil, errors.New("can't get repo name") - } - - if r.LowerName != strings.ToLower(urls[2]) { - return nil, errors.New("wrong repo name") - } - } - // create new runner runner := &bots_model.Runner{ UUID: gouuid.New().String(), @@ -137,6 +96,7 @@ func (s *Service) Register( res := connect.NewResponse(&runnerv1.RegisterResponse{ Runner: &runnerv1.Runner{ + Id: runner.ID, Uuid: runner.UUID, Token: runner.Token, Name: runner.Name, From 4c2d976629d1c5613e441f8f23f5ef83974c406b Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 15 Oct 2022 20:04:39 +0800 Subject: [PATCH 067/408] chore(runner): get runner by uuid from header Signed-off-by: Bo-Yi.Wu --- go.mod | 3 ++- go.sum | 6 ++++-- routers/api/bots/runner/unary.go | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 1e2cd669a989f..bf5f94136385c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,8 @@ require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 - gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a + gitea.com/gitea/act_runner v0.0.0-20221015084035-e63e22e8c81d + gitea.com/gitea/proto-go v0.0.0-20221014123629-9116865c883b gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 8f79fe488cc62..b341c59a531d0 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,10 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725 h1:H5lZ5fqSXAZ082wBKfqaME070sw5DeNwT8Bwyfa5mcc= gitea.com/gitea/act v0.0.0-20221012054755-c2c76e19a725/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a h1:WHNPcbDR2vw2a17Ml06+n4MC0UwsyD/F3WeVteaXWMI= -gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= +gitea.com/gitea/act_runner v0.0.0-20221015084035-e63e22e8c81d h1:WdZqNKX1TB0vH1nOFZhoYdesEGFwvwpKGkwjGaGCmgo= +gitea.com/gitea/act_runner v0.0.0-20221015084035-e63e22e8c81d/go.mod h1:ZDTf3CZrtttQj0EzduNKPRUBPIrPOK6cdx/LFFVX+EE= +gitea.com/gitea/proto-go v0.0.0-20221014123629-9116865c883b h1:TSz7VRHfnM/5JwGPgIAjSlDIvcr4pTGfuRMtgMxttmg= +gitea.com/gitea/proto-go v0.0.0-20221014123629-9116865c883b/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/routers/api/bots/runner/unary.go b/routers/api/bots/runner/unary.go index 70e8de98b23f5..2836641c8291e 100644 --- a/routers/api/bots/runner/unary.go +++ b/routers/api/bots/runner/unary.go @@ -11,6 +11,7 @@ import ( bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" + "gitea.com/gitea/act_runner/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/bufbuild/connect-go" @@ -25,8 +26,8 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar if methodName(request) == "Register" { return unaryFunc(ctx, request) } - token := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID - runner, err := bots_model.GetRunnerByToken(token) + uuid := request.Header().Get(core.UUIDHeader) + runner, err := bots_model.GetRunnerByUUID(uuid) if err != nil { if _, ok := err.(bots_model.ErrRunnerNotExist); ok { return nil, status.Error(codes.Unauthenticated, "unregistered runner") From 482832da7643205ce6c35153f600f25610b41105 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Oct 2022 23:11:28 +0800 Subject: [PATCH 068/408] delete unused structs --- models/bots/build.go | 284 --------------------- models/bots/build_log.go | 42 --- models/bots/build_stage.go | 115 --------- models/bots/build_stage_list.go | 7 - models/bots/run.go | 37 +++ models/bots/run_job.go | 4 +- models/bots/{build_list.go => run_list.go} | 39 ++- models/bots/task.go | 2 + models/bots/task_log.go | 4 - models/migrations/v-dev.go | 115 +++++++-- modules/notification/bots/bots.go | 2 +- routers/api/bots/bots.go | 3 - routers/api/bots/runner/runner.go | 2 + routers/api/bots/scheduler/queue/queue.go | 5 +- routers/api/bots/socket.go | 207 --------------- routers/init.go | 2 - routers/web/repo/builds/builds.go | 75 +----- routers/web/web.go | 12 +- services/bots/bots.go | 13 +- 19 files changed, 189 insertions(+), 781 deletions(-) delete mode 100644 models/bots/build.go delete mode 100644 models/bots/build_log.go delete mode 100644 models/bots/build_stage.go delete mode 100644 models/bots/build_stage_list.go rename models/bots/{build_list.go => run_list.go} (51%) delete mode 100644 routers/api/bots/socket.go diff --git a/models/bots/build.go b/models/bots/build.go deleted file mode 100644 index e10f8725bf2c1..0000000000000 --- a/models/bots/build.go +++ /dev/null @@ -1,284 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "context" - "errors" - "fmt" - "strconv" - - "code.gitea.io/gitea/core" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - - "github.com/google/uuid" - "xorm.io/builder" -) - -func init() { - db.RegisterModel(new(Build)) - db.RegisterModel(new(BuildIndex)) -} - -// Build represnets bot build task -type Build struct { - ID int64 - Name string - UUID string `xorm:"CHAR(36)"` - Index int64 `xorm:"index unique(repo_index)"` - RepoID int64 `xorm:"index unique(repo_index)"` - TriggerUserID int64 - TriggerUser *user_model.User `xorm:"-"` - Ref string - CommitSHA string - Event webhook.HookEventType - Token string // token for this task - Grant string // permissions for this task - EventPayload string `xorm:"LONGTEXT"` - RunnerID int64 `xorm:"index"` - Status core.BuildStatus `xorm:"index"` - Created timeutil.TimeStamp `xorm:"created"` - StartTime timeutil.TimeStamp - EndTime timeutil.TimeStamp - Updated timeutil.TimeStamp `xorm:"updated"` -} - -// TableName represents a bot build -func (Build) TableName() string { - return "bots_build" -} - -func (t *Build) HTMLURL() string { - return "" -} - -func updateRepoBuildsNumbers(ctx context.Context, repo *repo_model.Repository) error { - _, err := db.GetEngine(ctx).ID(repo.ID). - SetExpr("num_builds", - builder.Select("count(*)").From("bots_build"). - Where(builder.Eq{"repo_id": repo.ID}), - ). - SetExpr("num_closed_builds", - builder.Select("count(*)").From("bots_build"). - Where(builder.Eq{ - "repo_id": repo.ID, - }.And( - builder.In("status", core.StatusFailing, core.StatusKilled, core.StatusPassing), - ), - ), - ). - Update(repo) - return err -} - -// InsertBuild inserts a bot build task -func InsertBuild(t *Build, workflowsStatuses map[string]map[string]core.BuildStatus) error { - if t.UUID == "" { - t.UUID = uuid.New().String() - } - index, err := db.GetNextResourceIndex("bots_build_index", t.RepoID) - if err != nil { - return err - } - t.Index = index - - ctx, commiter, err := db.TxContext() - if err != nil { - return err - } - defer commiter.Close() - - if err := db.Insert(ctx, t); err != nil { - return err - } - - if err := updateRepoBuildsNumbers(ctx, &repo_model.Repository{ID: t.RepoID}); err != nil { - return err - } - - var buildStages []BuildStage - for filename, workflow := range workflowsStatuses { - for job, status := range workflow { - buildStages = append(buildStages, BuildStage{ - BuildID: t.ID, - Filename: filename, - Name: job, - Status: status, - }) - } - } - if err := db.Insert(ctx, buildStages); err != nil { - return err - } - - if err := commiter.Commit(); err != nil { - return err - } - - if err := CreateBuildLog(t.ID); err != nil { - log.Error("create build log for %d table failed, will try it again when received logs", t.ID) - } - return nil -} - -// UpdateBuild updates bot build -func UpdateBuild(t *Build, cols ...string) error { - _, err := db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) - return err -} - -// ErrBuildNotExist represents an error for bot build not exist -type ErrBuildNotExist struct { - RepoID int64 - Index int64 - ID int64 - UUID string -} - -func (err ErrBuildNotExist) Error() string { - uuid := "" - if err.UUID != "" { - uuid = err.UUID - } - - if err.ID != 0 { - uuid = strconv.FormatInt(err.ID, 10) - } - return fmt.Sprintf("build [%s] is not exist", uuid) -} - -// GetBuildByUUID gets bot build by uuid -func GetBuildByUUID(buildUUID string) (*Build, error) { - var build Build - has, err := db.GetEngine(db.DefaultContext).Where("uuid=?", buildUUID).Get(&build) - if err != nil { - return nil, err - } else if !has { - return nil, ErrBuildNotExist{ - UUID: buildUUID, - } - } - return &build, nil -} - -func GetBuildByID(id int64) (*Build, error) { - var build Build - has, err := db.GetEngine(db.DefaultContext).Where("id=?", id).Get(&build) - if err != nil { - return nil, err - } else if !has { - return nil, ErrBuildNotExist{ - ID: id, - } - } - - return &build, nil -} - -// GetCurBuildByID return the build for the bot -func GetCurBuildByID(runnerID int64) (*Build, error) { - var builds []Build - err := db.GetEngine(db.DefaultContext). - Where("runner_id=?", runnerID). - And("status=?", core.StatusPending). - Asc("created"). - Find(&builds) - if err != nil { - return nil, err - } - if len(builds) == 0 { - return nil, nil - } - return &builds[0], err -} - -// GetCurBuildByUUID return the task for the bot -func GetCurBuildByUUID(runnerUUID string) (*Build, error) { - runner, err := GetRunnerByUUID(runnerUUID) - if err != nil { - return nil, err - } - return GetCurBuildByID(runner.ID) -} - -func GetBuildByRepoAndIndex(repoID, index int64) (*Build, error) { - var build Build - has, err := db.GetEngine(db.DefaultContext).Where("repo_id=?", repoID). - And("`index` = ?", index). - Get(&build) - if err != nil { - return nil, err - } else if !has { - return nil, ErrBuildNotExist{ - RepoID: repoID, - Index: index, - } - } - return &build, nil -} - -// AssignBuildToRunner assign a build to a runner -func AssignBuildToRunner(buildID, runnerID int64) error { - cnt, err := db.GetEngine(db.DefaultContext). - Where("runner_id=0"). - And("id=?", buildID). - Cols("runner_id"). - Update(&Build{ - RunnerID: runnerID, - }) - if err != nil { - return err - } - if cnt != 1 { - return errors.New("assign faild") - } - return nil -} - -type FindBuildOptions struct { - db.ListOptions - RepoID int64 - IsClosed util.OptionalBool -} - -func (opts FindBuildOptions) toConds() builder.Cond { - cond := builder.NewCond() - if opts.RepoID > 0 { - cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) - } - if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing)) - } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusWaiting, core.StatusPending, core.StatusRunning)) - } - return cond -} - -func FindBuilds(opts FindBuildOptions) (BuildList, error) { - sess := db.GetEngine(db.DefaultContext).Where(opts.toConds()) - if opts.ListOptions.PageSize > 0 { - skip, take := opts.GetSkipTake() - sess.Limit(take, skip) - } - var builds []*Build - return builds, sess.Find(&builds) -} - -func CountBuilds(opts FindBuildOptions) (int64, error) { - return db.GetEngine(db.DefaultContext).Table("bots_build").Where(opts.toConds()).Count() -} - -type BuildIndex db.ResourceIndex - -// TableName represents a bot build index -func (BuildIndex) TableName() string { - return "bots_build_index" -} diff --git a/models/bots/build_log.go b/models/bots/build_log.go deleted file mode 100644 index 7b1e22313fd4b..0000000000000 --- a/models/bots/build_log.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "fmt" - - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" -) - -// BuildLog represents a build's log, every build has a standalone table -type BuildLog struct { - ID int64 - StepID int64 `xorm:"index"` - Content string `xorm:"BINARY"` - Created timeutil.TimeStamp `xorm:"created"` -} - -func init() { - db.RegisterModel(new(BuildLog)) -} - -func GetBuildLogTableName(buildID int64) string { - return fmt.Sprintf("bots_build_log_%d", buildID) -} - -// CreateBuildLog table for a build -func CreateBuildLog(buildID int64) error { - return db.GetEngine(db.DefaultContext). - Table(GetBuildLogTableName(buildID)). - Sync2(new(BuildLog)) -} - -func GetBuildLogs(buildID, jobID int64) (logs []BuildLog, err error) { - err = db.GetEngine(db.DefaultContext).Table(GetBuildLogTableName(buildID)). - Where("build_step_id=?", jobID). - Find(&logs) - return -} diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go deleted file mode 100644 index d0c5827436161..0000000000000 --- a/models/bots/build_stage.go +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "context" - "fmt" - - "code.gitea.io/gitea/core" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "xorm.io/builder" -) - -type BuildStage struct { - ID int64 - BuildID int64 `xorm:"index"` - Number int64 - Name string - Kind string - Type string - Machine string - OS string - Arch string - Filename string - Status core.BuildStatus - Started timeutil.TimeStamp - Stopped timeutil.TimeStamp - LogToFile bool // read log from database or from storage - Version int `xorm:"version"` - Created timeutil.TimeStamp `xorm:"created"` - Updated timeutil.TimeStamp `xorm:"updated"` -} - -func (bj BuildStage) TableName() string { - return "bots_build_stage" -} - -func init() { - db.RegisterModel(new(BuildStage)) -} - -type FindStageOptions struct { - db.ListOptions - BuildID int64 - IsClosed util.OptionalBool -} - -func (opts FindStageOptions) toConds() builder.Cond { - cond := builder.NewCond() - if opts.BuildID > 0 { - cond = cond.And(builder.Eq{"build_id": opts.BuildID}) - } - if opts.IsClosed.IsTrue() { - cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing, core.StatusKilled)) - } else if opts.IsClosed.IsFalse() { - cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning)) - } - return cond -} - -func FindStages(ctx context.Context, opts FindStageOptions) (BuildStageList, error) { - sess := db.GetEngine(ctx).Where(opts.toConds()) - if opts.ListOptions.PageSize > 0 { - skip, take := opts.GetSkipTake() - sess.Limit(take, skip) - } - var rows []*BuildStage - return rows, sess.Find(&rows) -} - -// GetStageByID gets build stage by id -func GetStageByID(id int64) (*BuildStage, error) { - var build BuildStage - has, err := db.GetEngine(db.DefaultContext).Where("id=?", id).Get(&build) - if err != nil { - return nil, err - } else if !has { - return nil, ErrBuildStageNotExist{ - ID: id, - } - } - return &build, nil -} - -// ErrBuildNotExist represents an error for bot build not exist -type ErrBuildStageNotExist struct { - ID int64 -} - -func (err ErrBuildStageNotExist) Error() string { - return fmt.Sprintf("build stage [%d] is not exist", err.ID) -} - -// UpdateBuildStage updates build stage -func UpdateBuildStage(t *BuildStage, cols ...string) (int64, error) { - return db.GetEngine(db.DefaultContext).ID(t.ID).Cols(cols...).Update(t) -} - -func GetBuildWorkflows(buildID int64) (map[string]map[string]*BuildStage, error) { - jobs := make(map[string]map[string]*BuildStage) - err := db.GetEngine(db.DefaultContext).Iterate(new(BuildStage), func(idx int, bean interface{}) error { - job := bean.(*BuildStage) - _, ok := jobs[job.Filename] - if !ok { - jobs[job.Filename] = make(map[string]*BuildStage) - } - jobs[job.Filename][job.Name] = job - return nil - }) - return jobs, err -} diff --git a/models/bots/build_stage_list.go b/models/bots/build_stage_list.go deleted file mode 100644 index 4137e63725b6c..0000000000000 --- a/models/bots/build_stage_list.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -type BuildStageList []*BuildStage diff --git a/models/bots/run.go b/models/bots/run.go index 2f689f12aeb17..bc607b35bafb7 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -15,6 +15,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/timeutil" + "xorm.io/builder" "github.com/nektos/act/pkg/jobparser" ) @@ -79,6 +80,30 @@ func (r *Run) LoadAttributes(ctx context.Context) error { return nil } +func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) error { + _, err := db.GetEngine(ctx).ID(repo.ID). + SetExpr("num_runs", + builder.Select("count(*)").From("bots_run"). + Where(builder.Eq{"repo_id": repo.ID}), + ). + SetExpr("num_closed_runs", + builder.Select("count(*)").From("bots_run"). + Where(builder.Eq{ + "repo_id": repo.ID, + }.And( + builder.In("status", + core.StatusFailing, + core.StatusKilled, + core.StatusPassing, + core.StatusError, + ), + ), + ), + ). + Update(repo) + return err +} + // InsertRun inserts a bot run func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { var groupID int64 @@ -105,6 +130,18 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error { return err } + if run.Repo == nil { + repo, err := repo_model.GetRepositoryByIDCtx(ctx, run.RepoID) + if err != nil { + return err + } + run.Repo = repo + } + + if err := updateRepoRunsNumbers(ctx, run.Repo); err != nil { + return err + } + runJobs := make([]*RunJob, 0, len(jobs)) for _, v := range jobs { id, job := v.Job() diff --git a/models/bots/run_job.go b/models/bots/run_job.go index 04de1f1a1bb89..d4b7d6091400c 100644 --- a/models/bots/run_job.go +++ b/models/bots/run_job.go @@ -16,8 +16,8 @@ import ( // RunJob represents a job of a run type RunJob struct { ID int64 - RunID int64 - Run *Run `xorm:"-"` + RunID int64 `xorm:"index"` + Run *Run `xorm:"-"` Name string Ready bool // ready to be executed Attempt int64 diff --git a/models/bots/build_list.go b/models/bots/run_list.go similarity index 51% rename from models/bots/build_list.go rename to models/bots/run_list.go index fdc6ef66f004b..2f63261996f36 100644 --- a/models/bots/build_list.go +++ b/models/bots/run_list.go @@ -5,14 +5,18 @@ package bots import ( + "context" + "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/util" + "xorm.io/builder" ) -type BuildList []*Build +type RunList []*Run // GetUserIDs returns a slice of user's id -func (builds BuildList) GetUserIDs() []int64 { +func (builds RunList) GetUserIDs() []int64 { userIDsMap := make(map[int64]struct{}) for _, build := range builds { userIDsMap[build.TriggerUserID] = struct{}{} @@ -24,7 +28,7 @@ func (builds BuildList) GetUserIDs() []int64 { return userIDs } -func (builds BuildList) LoadTriggerUser() error { +func (builds RunList) LoadTriggerUser() error { userIDs := builds.GetUserIDs() users := make(map[int64]*user_model.User, len(userIDs)) if err := db.GetEngine(db.DefaultContext).In("id", userIDs).Find(&users); err != nil { @@ -35,3 +39,32 @@ func (builds BuildList) LoadTriggerUser() error { } return nil } + +type FindRunOptions struct { + db.ListOptions + RepoID int64 + IsClosed util.OptionalBool +} + +func (opts FindRunOptions) toConds() builder.Cond { + cond := builder.NewCond() + if opts.RepoID > 0 { + cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + } + if opts.IsClosed.IsFalse() { + + } else if opts.IsClosed.IsTrue() { + + } + return cond +} + +func FindRuns(ctx context.Context, opts FindRunOptions) (RunList, int64, error) { + e := db.GetEngine(ctx).Where(opts.toConds()) + if opts.PageSize>0&&opts.Page >=1 { + e.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) + } + var runs RunList + total, err := e.FindAndCount(&runs) + return runs, total, err +} diff --git a/models/bots/task.go b/models/bots/task.go index 58849d4086573..7a883f3c13862 100644 --- a/models/bots/task.go +++ b/models/bots/task.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" @@ -141,6 +142,7 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { // TODO: a more efficient way to filter labels var job *RunJob labels := append(runner.AgentLabels, runner.CustomLabels...) + log.Trace("runner labels: %v", labels) for _, v := range jobs { if isSubset(labels, v.RunsOn) { job = v diff --git a/models/bots/task_log.go b/models/bots/task_log.go index 5bdd11ec32ead..adfa17aa9ceba 100644 --- a/models/bots/task_log.go +++ b/models/bots/task_log.go @@ -19,10 +19,6 @@ type TaskLog struct { Content string `xorm:"LONGTEXT"` } -func init() { - db.RegisterModel(new(TaskLog)) -} - func GetTaskLogTableName(taskID int64) string { return fmt.Sprintf("bots_task_log_%d", taskID) } diff --git a/models/migrations/v-dev.go b/models/migrations/v-dev.go index 23695cf5e412c..2facf0d0ebfee 100644 --- a/models/migrations/v-dev.go +++ b/models/migrations/v-dev.go @@ -16,46 +16,119 @@ func addBotTables(x *xorm.Engine) error { ID int64 UUID string `xorm:"CHAR(36) UNIQUE"` Name string `xorm:"VARCHAR(32) UNIQUE"` - OS string `xorm:"VARCHAR(16) index"` // the runner running os - Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture - Type string `xorm:"VARCHAR(16)"` OwnerID int64 `xorm:"index"` // org level runner, 0 means system RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global Description string `xorm:"TEXT"` Base int // 0 native 1 docker 2 virtual machine RepoRange string // glob match which repositories could use this runner - Token string - LastOnline timeutil.TimeStamp `xorm:"index"` - Created timeutil.TimeStamp `xorm:"created"` + Token string `xorm:"CHAR(36) UNIQUE"` + + // instance status (idle, active, offline) + Status int32 + // Store OS and Artch. + AgentLabels []string + // Store custom labes use defined. + CustomLabels []string + + LastOnline timeutil.TimeStamp `xorm:"index"` + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + Deleted timeutil.TimeStamp `xorm:"deleted"` } - type BotsBuild struct { + type BotsRunnerToken struct { + ID int64 + Token string `xorm:"CHAR(36) UNIQUE"` + OwnerID int64 `xorm:"index"` // org level runner, 0 means system + RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global + IsActive bool + + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + Deleted timeutil.TimeStamp `xorm:"deleted"` + } + + type BotsRun struct { ID int64 - Title string - UUID string `xorm:"CHAR(36)"` - Index int64 `xorm:"index unique(repo_index)"` - RepoID int64 `xorm:"index unique(repo_index)"` + Name string + RepoID int64 `xorm:"index unique(repo_workflow_index)"` + WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file + Index int64 `xorm:"index unique(repo_workflow_index)"` // a unique number for each run of a particular workflow in a repository TriggerUserID int64 Ref string CommitSHA string Event string - Token string // token for this task - Grant string // permissions for this task - EventPayload string `xorm:"LONGTEXT"` - RunnerID int64 `xorm:"index"` - Status int `xorm:"index"` - Created timeutil.TimeStamp `xorm:"created"` + Token string // token for this task + Grant string // permissions for this task + EventPayload string `xorm:"LONGTEXT"` + Status int32 `xorm:"index"` StartTime timeutil.TimeStamp EndTime timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` Updated timeutil.TimeStamp `xorm:"updated"` } + type BotsRunJob struct { + ID int64 + RunID int64 `xorm:"index"` + Name string + Ready bool // ready to be executed + Attempt int64 + WorkflowPayload []byte + JobID string // job id in workflow, not job's id + Needs []int64 `xorm:"JSON TEXT"` + RunsOn []string `xorm:"JSON TEXT"` + TaskID int64 // the latest task of the job + Status int32 `xorm:"index"` + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + } + type Repository struct { - NumBuilds int `xorm:"NOT NULL DEFAULT 0"` - NumClosedBuilds int `xorm:"NOT NULL DEFAULT 0"` + NumRuns int `xorm:"NOT NULL DEFAULT 0"` + NumClosedRuns int `xorm:"NOT NULL DEFAULT 0"` + } + + type BotsRunIndex db.ResourceIndex + + type BotsTask struct { + ID int64 + JobID int64 + Attempt int64 + RunnerID int64 `xorm:"index"` + LogToFile bool // read log from database or from storage + LogURL string // url of the log file in storage + Result int32 + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` } - type BotsBuildIndex db.ResourceIndex + type BotsTaskStep struct { + ID int64 + Name string + TaskID int64 `xorm:"index unique(task_number)"` + Number int64 `xorm:"index unique(task_number)"` + Result int32 + LogIndex int64 + LogLength int64 + Started timeutil.TimeStamp + Stopped timeutil.TimeStamp + Created timeutil.TimeStamp `xorm:"created"` + Updated timeutil.TimeStamp `xorm:"updated"` + } - return x.Sync2(new(BotsRunner), new(BotsBuild), new(Repository), new(BotsBuildIndex)) + return x.Sync2( + new(BotsRunner), + new(BotsRunnerToken), + new(BotsRun), + new(BotsRunJob), + new(Repository), + new(BotsRunIndex), + new(BotsTask), + new(BotsTaskStep), + ) } diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 0a1032648af03..f877e72708abb 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -102,7 +102,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str continue } if err := bots_model.InsertRun(&run, jobs); err != nil { - log.Error("InsertBotTask: %v", err) + log.Error("InsertRun: %v", err) } } } diff --git a/routers/api/bots/bots.go b/routers/api/bots/bots.go index bddd4c92eb15f..2d28d0761c1df 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/bots/bots.go @@ -25,9 +25,6 @@ func gRPCRouter(r *web.Route, fn grpc.RouteFn) { } func Routes(r *web.Route) *web.Route { - // socket connection - r.Get("/socket", socketServe) - gRPCRouter(r, grpc.V1Route) gRPCRouter(r, grpc.V1AlphaRoute) gRPCRouter(r, grpc.HealthRoute) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 46b6bc429c6c8..d6274834b5e46 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" @@ -118,6 +119,7 @@ func (s *Service) FetchTask( var task *runnerv1.Task if t, ok, err := s.pickTask(ctx, runner); err != nil { + log.Error("pick task failed: %v", err) return nil, status.Errorf(codes.Internal, "pick task: %v", err) } else if ok { task = t diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go index 95495be1463e3..cb3bc916b4a4a 100644 --- a/routers/api/bots/scheduler/queue/queue.go +++ b/routers/api/bots/scheduler/queue/queue.go @@ -10,7 +10,6 @@ import ( "time" "code.gitea.io/gitea/core" - "code.gitea.io/gitea/models/bots" runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) @@ -92,7 +91,7 @@ func (q *queue) signal(ctx context.Context) error { if count == 0 { return nil } - items, err := bots.FindStages(ctx, bots.FindStageOptions{}) + /*items, err := bots.FindStages(ctx, bots.FindStageOptions{}) if err != nil { return err } @@ -138,7 +137,7 @@ func (q *queue) signal(ctx context.Context) error { delete(q.workers, w) break loop } - } + }*/ return nil } diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go deleted file mode 100644 index 370b39fb1fff8..0000000000000 --- a/routers/api/bots/socket.go +++ /dev/null @@ -1,207 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package bots - -import ( - "errors" - "fmt" - "net/http" - "strings" - "time" - - "code.gitea.io/gitea/core" - bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - - "github.com/gorilla/websocket" -) - -var upgrader = websocket.Upgrader{ - ReadBufferSize: 4096, - WriteBufferSize: 4096, - EnableCompression: true, - CheckOrigin: func(r *http.Request) bool { - return true - }, -} - -var pongWait = 60 * time.Second - -type Message struct { - Version int // - Type int // message type, 1 register 2 error 3 task 4 no task - RunnerUUID string // runner uuid - BuildUUID string // build uuid - ErrCode int // error code - ErrContent string // errors message - EventName string - EventPayload string - JobID string // only run the special job, empty means run all the jobs -} - -const ( - version1 = 1 -) - -const ( - MsgTypeRegister = iota + 1 // register - MsgTypeError // error - MsgTypeRequestBuild // request build task - MsgTypeIdle // no task - MsgTypeBuildResult // build result - MsgTypeBuildJobResult // build job result -) - -func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error { - switch msg.Type { - case MsgTypeRegister: - log.Info("websocket[%s] registered", r.RemoteAddr) - runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID) - if err != nil { - if !errors.Is(err, bots_model.ErrRunnerNotExist{}) { - return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) - } - err = c.WriteMessage(mt, message) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } else { - fmt.Printf("-----%v\n", runner) - // TODO: handle read message - err = c.WriteMessage(mt, message) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - case MsgTypeRequestBuild: - // TODO: find new task and send to client - build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID) - if err != nil { - return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err) - } - var returnMsg *Message - if build == nil { - time.Sleep(3 * time.Second) - returnMsg = &Message{ - Version: version1, - Type: MsgTypeIdle, - RunnerUUID: msg.RunnerUUID, - } - } else { - returnMsg = &Message{ - Version: version1, - Type: MsgTypeRequestBuild, - RunnerUUID: msg.RunnerUUID, - BuildUUID: build.UUID, - EventName: build.Event.Event(), - EventPayload: build.EventPayload, - } - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } - err = c.WriteMessage(mt, bs) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - case MsgTypeBuildResult: - log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg) - build, err := bots_model.GetBuildByUUID(msg.BuildUUID) - if err != nil { - return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err) - } - cols := []string{"status", "end_time"} - if msg.ErrCode == 0 { - build.Status = core.StatusPassing - } else { - build.Status = core.StatusFailing - } - build.EndTime = timeutil.TimeStampNow() - if err := bots_model.UpdateBuild(build, cols...); err != nil { - log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err) - } - default: - returnMsg := Message{ - Version: version1, - Type: MsgTypeError, - ErrCode: 1, - ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type), - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } - err = c.WriteMessage(mt, bs) - if err != nil { - return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - return nil -} - -func socketServe(w http.ResponseWriter, r *http.Request) { - log.Trace("websocket init request begin from %s", r.RemoteAddr) - c, err := upgrader.Upgrade(w, r, nil) - if err != nil { - log.Error("websocket upgrade failed: %v", err) - return - } - defer c.Close() - log.Trace("websocket upgrade from %s successfully", r.RemoteAddr) - - _ = c.SetReadDeadline(time.Now().Add(pongWait)) - c.SetPongHandler(func(string) error { - return c.SetReadDeadline(time.Now().Add(pongWait)) - }) - - for { - // read message from client - mt, message, err := c.ReadMessage() - if err != nil { - if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) || - websocket.IsCloseError(err, websocket.CloseNormalClosure) { - c.Close() - } else if !strings.Contains(err.Error(), "i/o timeout") { - log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err) - } - break - } - - log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message)) - - // read message first - var msg Message - if err = json.Unmarshal(message, &msg); err != nil { - log.Error("websocket[%s] unmarshal failed: %#v", r.RemoteAddr, err) - break - } - - switch msg.Version { - case 1: - if err := handleVersion1(r, c, mt, message, &msg); err != nil { - log.Error("%v", err) - } - default: - returnMsg := Message{ - Version: 1, - Type: MsgTypeError, - ErrCode: 1, - ErrContent: "version is not supported", - } - bs, err := json.Marshal(&returnMsg) - if err != nil { - log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err) - } else { - err = c.WriteMessage(mt, bs) - if err != nil { - log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err) - } - } - } - } -} diff --git a/routers/init.go b/routers/init.go index 65bf7b55d8af2..5d700792b4c8f 100644 --- a/routers/init.go +++ b/routers/init.go @@ -40,7 +40,6 @@ import ( "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/oauth2" "code.gitea.io/gitea/services/automerge" - bots_service "code.gitea.io/gitea/services/bots" "code.gitea.io/gitea/services/cron" "code.gitea.io/gitea/services/mailer" markup_service "code.gitea.io/gitea/services/markup" @@ -162,7 +161,6 @@ func GlobalInitInstalled(ctx context.Context) { mustInit(pull_service.Init) mustInit(automerge.Init) mustInit(task.Init) - mustInit(bots_service.Init) mustInit(repo_migrations.Init) eventsource.GetManager().Init() diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index 7058661dba3fa..ce5d3904df964 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -5,7 +5,6 @@ package builds import ( - "fmt" "net/http" bots_model "code.gitea.io/gitea/models/bots" @@ -46,7 +45,7 @@ func List(ctx *context.Context) { page = 1 } - opts := bots_model.FindBuildOptions{ + opts := bots_model.FindRunOptions{ ListOptions: db.ListOptions{ Page: page, PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")), @@ -58,7 +57,7 @@ func List(ctx *context.Context) { } else { opts.IsClosed = util.OptionalBoolFalse } - builds, err := bots_model.FindBuilds(opts) + builds, total, err := bots_model.FindRuns(ctx, opts) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return @@ -69,12 +68,6 @@ func List(ctx *context.Context) { return } - total, err := bots_model.CountBuilds(opts) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - ctx.Data["Builds"] = builds pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) @@ -83,67 +76,3 @@ func List(ctx *context.Context) { ctx.HTML(http.StatusOK, tplListBuilds) } - -func ViewBuild(ctx *context.Context) { - index := ctx.ParamsInt64("index") - build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - ctx.Data["Name"] = build.Name + " - " + ctx.Tr("repo.builds") - ctx.Data["PageIsBuildList"] = true - ctx.Data["Build"] = build - statuses, err := bots_model.GetBuildWorkflows(build.ID) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - ctx.Data["WorkflowsStatuses"] = statuses - - ctx.HTML(http.StatusOK, tplViewBuild) -} - -func GetBuildJobLogs(ctx *context.Context) { - index := ctx.ParamsInt64("index") - build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - workflows, err := bots_model.GetBuildWorkflows(build.ID) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - var buildJob *bots_model.BuildStage - wf := ctx.Params("workflow") - jobname := ctx.Params("jobname") -LOOP_WORKFLOWS: - for workflow, jobs := range workflows { - if workflow == wf { - for _, job := range jobs { - if jobname == job.Name { - buildJob = job - break LOOP_WORKFLOWS - } - } - } - } - if buildJob == nil { - ctx.Error(http.StatusNotFound, fmt.Sprintf("workflow %s job %s not exist", wf, jobname)) - return - } - - // TODO: if buildJob.LogToFile is true, read the logs from the file - - logs, err := bots_model.GetBuildLogs(build.ID, buildJob.ID) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - ctx.JSON(http.StatusOK, logs) -} diff --git a/routers/web/web.go b/routers/web/web.go index 9ed94099e25ae..b8e72d14ebc84 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1189,10 +1189,14 @@ func RegisterRoutes(m *web.Route) { m.Group("/builds", func() { m.Get("", builds.List) - m.Group("/{index}", func() { - m.Get("", builds.ViewBuild) - m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs) - }) + + m.Combo("/run/{runid}"). + Get(dev.BuildView). + Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) + + m.Combo("/run/{runid}/jobs/{jobid}"). + Get(dev.BuildView). + Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost) }, reqRepoBuildsReader, builds.MustEnableBuilds) m.Group("/wiki", func() { diff --git a/services/bots/bots.go b/services/bots/bots.go index f894a678ea18c..64d151ea196b6 100644 --- a/services/bots/bots.go +++ b/services/bots/bots.go @@ -4,16 +4,9 @@ package bots -import ( - "fmt" - - bots_model "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - //"code.gitea.io/gitea/modules/json" -) +//"code.gitea.io/gitea/modules/json" +/* // buildQueue is a global queue of bot build var buildQueue queue.Queue @@ -59,4 +52,4 @@ func handle(data ...queue.Data) []queue.Data { } } return unhandled -} +}*/ From f75a4abc5d571c192c312781bf12ee4df4c1f265 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Oct 2022 23:23:47 +0800 Subject: [PATCH 069/408] build UI --- models/bots/run.go | 6 +++++- models/bots/run_list.go | 18 ++++++++---------- models/migrations/v-dev.go | 2 +- modules/notification/bots/bots.go | 5 ++++- routers/web/dev/buildview.go | 2 +- routers/web/repo/builds/builds.go | 10 +++++++--- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/models/bots/run.go b/models/bots/run.go index bc607b35bafb7..ed8bfdd711dbd 100644 --- a/models/bots/run.go +++ b/models/bots/run.go @@ -23,7 +23,7 @@ import ( // Run represents a run of a workflow file type Run struct { ID int64 - Name string + Title string RepoID int64 `xorm:"index unique(repo_workflow_index)"` Repo *repo_model.Repository `xorm:"-"` WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file @@ -52,6 +52,10 @@ func (Run) TableName() string { return "bots_run" } +func (run *Run) HTMLURL() string { + return fmt.Sprintf("%s/builds/run/%d", run.Repo.HTMLURL(), run.Index) +} + // LoadAttributes load Repo TriggerUser if not loaded func (r *Run) LoadAttributes(ctx context.Context) error { if r == nil { diff --git a/models/bots/run_list.go b/models/bots/run_list.go index 2f63261996f36..e2c5b33607811 100644 --- a/models/bots/run_list.go +++ b/models/bots/run_list.go @@ -16,10 +16,10 @@ import ( type RunList []*Run // GetUserIDs returns a slice of user's id -func (builds RunList) GetUserIDs() []int64 { +func (runs RunList) GetUserIDs() []int64 { userIDsMap := make(map[int64]struct{}) - for _, build := range builds { - userIDsMap[build.TriggerUserID] = struct{}{} + for _, run := range runs { + userIDsMap[run.TriggerUserID] = struct{}{} } userIDs := make([]int64, 0, len(userIDsMap)) for userID := range userIDsMap { @@ -28,14 +28,14 @@ func (builds RunList) GetUserIDs() []int64 { return userIDs } -func (builds RunList) LoadTriggerUser() error { - userIDs := builds.GetUserIDs() +func (runs RunList) LoadTriggerUser() error { + userIDs := runs.GetUserIDs() users := make(map[int64]*user_model.User, len(userIDs)) if err := db.GetEngine(db.DefaultContext).In("id", userIDs).Find(&users); err != nil { return err } - for _, task := range builds { - task.TriggerUser = users[task.TriggerUserID] + for _, run := range runs { + run.TriggerUser = users[run.TriggerUserID] } return nil } @@ -52,16 +52,14 @@ func (opts FindRunOptions) toConds() builder.Cond { cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) } if opts.IsClosed.IsFalse() { - } else if opts.IsClosed.IsTrue() { - } return cond } func FindRuns(ctx context.Context, opts FindRunOptions) (RunList, int64, error) { e := db.GetEngine(ctx).Where(opts.toConds()) - if opts.PageSize>0&&opts.Page >=1 { + if opts.PageSize > 0 && opts.Page >= 1 { e.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) } var runs RunList diff --git a/models/migrations/v-dev.go b/models/migrations/v-dev.go index 2facf0d0ebfee..bf56d69c52279 100644 --- a/models/migrations/v-dev.go +++ b/models/migrations/v-dev.go @@ -50,7 +50,7 @@ func addBotTables(x *xorm.Engine) error { type BotsRun struct { ID int64 - Name string + Title string RepoID int64 `xorm:"index unique(repo_workflow_index)"` WorkflowID string `xorm:"index unique(repo_workflow_index)"` // the name of workflow file Index int64 `xorm:"index unique(repo_workflow_index)"` // a unique number for each run of a particular workflow in a repository diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index f877e72708abb..45db27ca66ceb 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -86,7 +86,7 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str for id, content := range workflows { run := bots_model.Run{ - Name: commit.Message(), + Title: commit.Message(), RepoID: repo.ID, WorkflowID: id, TriggerUserID: doer.ID, @@ -96,6 +96,9 @@ func notify(repo *repo_model.Repository, doer *user_model.User, payload, ref str EventPayload: payload, Status: core.StatusPending, } + if len(run.Title) > 255 { + run.Title = run.Title[:255] + } jobs, err := jobparser.Parse(content) // TODO: parse with options if err != nil { log.Error("jobparser.Parse: %v", err) diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go index 4c31724a27512..18c14422ea78d 100644 --- a/routers/web/dev/buildview.go +++ b/routers/web/dev/buildview.go @@ -106,7 +106,7 @@ func BuildViewPost(ctx *context.Context) { } resp := &BuildViewResponse{} - resp.StateData.BuildInfo.Title = run.Name + resp.StateData.BuildInfo.Title = run.Title respJobs := make([]*BuildViewJob, len(jobs)) for i, v := range jobs { diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index ce5d3904df964..d373393691ae4 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -57,18 +57,22 @@ func List(ctx *context.Context) { } else { opts.IsClosed = util.OptionalBoolFalse } - builds, total, err := bots_model.FindRuns(ctx, opts) + runs, total, err := bots_model.FindRuns(ctx, opts) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - if err := builds.LoadTriggerUser(); err != nil { + for _, run := range runs { + run.Repo = ctx.Repo.Repository + } + + if err := runs.LoadTriggerUser(); err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } - ctx.Data["Builds"] = builds + ctx.Data["Builds"] = runs pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) From 243c1e5134639c81c45df0e9439b6162bef71d0a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 17 Oct 2022 00:32:00 +0800 Subject: [PATCH 070/408] Add workflow --- routers/web/dev/buildview.go | 16 ++++++++++++++-- routers/web/repo/builds/builds.go | 20 ++++++++++++++++++++ templates/repo/builds/list.tmpl | 5 +++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go index 18c14422ea78d..dc4ff7cbda6e8 100644 --- a/routers/web/dev/buildview.go +++ b/routers/web/dev/buildview.go @@ -11,8 +11,20 @@ import ( ) func BuildView(ctx *context.Context) { - ctx.Data["RunID"] = ctx.Params("runid") - ctx.Data["JobID"] = ctx.Params("jobid") + runID := ctx.ParamsInt64("runid") + ctx.Data["RunID"] = runID + jobID := ctx.ParamsInt64("jobid") + if jobID <= 0 { + runJobs, err := bots_model.GetRunJobsByRunID(ctx, runID) + if err != nil { + return + } + if len(runJobs) <= 0 { + return + } + jobID = runJobs[0].ID + } + ctx.Data["JobID"] = jobID ctx.HTML(http.StatusOK, "dev/buildview") } diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index d373393691ae4..7db75ff8c8860 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/bots" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/util" @@ -40,6 +41,25 @@ func List(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.builds") ctx.Data["PageIsBuildList"] = true + defaultBranch, err := ctx.Repo.GitRepo.GetDefaultBranch() + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + commit, err := ctx.Repo.GitRepo.GetBranchCommit(defaultBranch) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + workflows, err := bots.ListWorkflows(commit) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["workflows"] = workflows + page := ctx.FormInt("page") if page <= 0 { page = 1 diff --git a/templates/repo/builds/list.tmpl b/templates/repo/builds/list.tmpl index 04fa020e0029b..c0de57e7b391a 100644 --- a/templates/repo/builds/list.tmpl +++ b/templates/repo/builds/list.tmpl @@ -1,6 +1,11 @@ {{template "base/head" .}}
    {{template "repo/header" .}} +
    + {{range .workflows}} +
  • {{.Name}}
    • + {{end}} +
    From f633ec97041c1c29e6ce39dc6bd5b2ee27e2e7ff Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Mon, 17 Oct 2022 21:21:43 +0800 Subject: [PATCH 071/408] feat(runner): create new token for creating new runner --- models/bots/runner_token.go | 32 +++++++++++++++++++++------ options/locale/locale_en-US.ini | 26 ++++++++++++++++++++++ routers/web/admin/runners.go | 38 +++++++++++++++++++++++++++----- routers/web/web.go | 1 + templates/admin/runner/edit.tmpl | 10 ++++----- templates/admin/runner/list.tmpl | 33 +++++++++++++++++++++++---- web_src/less/_runner.less | 9 ++++++++ 7 files changed, 128 insertions(+), 21 deletions(-) diff --git a/models/bots/runner_token.go b/models/bots/runner_token.go index a97d47cd479bf..097bc79bcad80 100644 --- a/models/bots/runner_token.go +++ b/models/bots/runner_token.go @@ -49,13 +49,6 @@ func init() { db.RegisterModel(new(RunnerToken)) } -// NewRunnerToken creates new runner token. -func NewRunnerToken(t *RunnerToken) error { - t.Token = base.EncodeSha1(gouuid.New().String()) - _, err := db.GetEngine(db.DefaultContext).Insert(t) - return err -} - // GetRunnerByToken returns a bot runner via token func GetRunnerToken(token string) (*RunnerToken, error) { var runnerToken RunnerToken @@ -81,3 +74,28 @@ func UpdateRunnerToken(ctx context.Context, r *RunnerToken, cols ...string) (err } return err } + +// NewRunnerToken creates a new runner token +func NewRunnerToken(ownerID, repoID int64) (*RunnerToken, error) { + runnerToken := &RunnerToken{ + OwnerID: ownerID, + RepoID: repoID, + IsActive: false, + // FIXME: why token is 36 chars? + Token: base.EncodeSha1(gouuid.New().String())[:36], + } + _, err := db.GetEngine(db.DefaultContext).Insert(runnerToken) + return runnerToken, err +} + +// GetUnactivatedRunnerToken returns a unactivated runner token +func GetUnactivatedRunnerToken(ownerID, repoID int64) (*RunnerToken, error) { + var runnerToken RunnerToken + has, err := db.GetEngine(db.DefaultContext).Where("owner_id=? AND repo_id=? AND is_active=0", ownerID, repoID).OrderBy("id DESC").Get(&runnerToken) + if err != nil { + return nil, err + } else if !has { + return nil, ErrRunnerTokenNotExist{} + } + return &runnerToken, nil +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7cfaac0efd065..5c9266050fff8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3005,6 +3005,32 @@ notices.desc = Description notices.op = Op. notices.delete_success = The system notices have been deleted. +runners = Runners +runners.runner_manage_panel = Runners Management +runners.new = Create new Runner +runners.new_notice = Show runner installation documentation +runners.status = Status +runners.id = ID +runners.owner_type = Type +runners.description = Description +runners.labels = Labels +runners.latest_online = Last Online Time +runners.agent_labels = Agent Labels +runners.custom_labels = Custom Labels +runners.custom_labels_helper = Custom labels are labels that are not automatically added by the agent. They are added by the administrator. Use comma separated. +runners.runner_title = Runner +runners.task_list = Recent jobs on this runner +runners.edit_runner = Edit Runner +runners.update_runner = Update Changes +runners.update_runner_success = Runner updated successfully +runners.update_runner_failed = Failed to update runner +runners.delete_runner = Delete this runner +runners.delete_runner_success = Runner deleted successfully +runners.delete_runner_failed = Failed to delete runner +runners.delete_runner_header = Confirm to delete this runner +runners.delete_runner_notice = If job is running on this runner, it will be terminated and mark as failed. It may break building workflow. +runners.delete_runner_confirm = Delete this runner + [action] create_repo = created repository %s rename_repo = renamed repository from %[1]s to %[3]s diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index cf7bddd291fef..65ebf5cc23f28 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -63,9 +63,26 @@ func Runners(ctx *context.Context) { return } + // ownid=0,repo_id=0,means this token is used for global + var token *bots_model.RunnerToken + token, err = bots_model.GetUnactivatedRunnerToken(0, 0) + if _, ok := err.(bots_model.ErrRunnerTokenNotExist); ok { + token, err = bots_model.NewRunnerToken(0, 0) + if err != nil { + ctx.ServerError("CreateRunnerToken", err) + return + } + } else { + if err != nil { + ctx.ServerError("GetUnactivatedRunnerToken", err) + return + } + } + ctx.Data["Keyword"] = opts.Filter ctx.Data["Runners"] = runners ctx.Data["Total"] = count + ctx.Data["RegistrationToken"] = token.Token pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) ctx.Data["Page"] = pager @@ -75,7 +92,7 @@ func Runners(ctx *context.Context) { // EditRunner show editing runner page func EditRunner(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.runners.edit") + ctx.Data["Title"] = ctx.Tr("admin.runners.edit_runner") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRunners"] = true @@ -107,7 +124,7 @@ func EditRunnerPost(ctx *context.Context) { err = bots_model.UpdateRunner(ctx, runner, "description", "custom_labels") if err != nil { log.Warn("EditRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL) - ctx.Flash.Warning(ctx.Tr("admin.runners.edit_failed")) + ctx.Flash.Warning(ctx.Tr("admin.runners.update_runner_failed")) ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) return } @@ -118,7 +135,7 @@ func EditRunnerPost(ctx *context.Context) { log.Debug("EditRunnerPost success: %s", ctx.Req.URL) - ctx.Flash.Success(ctx.Tr("admin.runners.edit_success")) + ctx.Flash.Success(ctx.Tr("admin.runners.update_runner_success")) ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) } @@ -134,14 +151,25 @@ func DeleteRunnerPost(ctx *context.Context) { err = bots_model.DeleteRunner(ctx, runner) if err != nil { log.Warn("DeleteRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL) - ctx.Flash.Warning(ctx.Tr("admin.runners.delete_failed")) + ctx.Flash.Warning(ctx.Tr("admin.runners.delete_runner_failed")) ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid"))) return } log.Info("DeleteRunnerPost success: %s", ctx.Req.URL) - ctx.Flash.Success(ctx.Tr("admin.runners.deletion_success")) + ctx.Flash.Success(ctx.Tr("admin.runners.delete_runner_success")) + ctx.Redirect(setting.AppSubURL + "/admin/runners/") +} + +func ResetRunnerRegistrationToken(ctx *context.Context) { + _, err := bots_model.NewRunnerToken(0, 0) + if err != nil { + ctx.ServerError("ResetRunnerRegistrationToken", err) + return + } + + ctx.Flash.Success(ctx.Tr("admin.runners.reset_registration_token_success")) ctx.Redirect(setting.AppSubURL + "/admin/runners/") } diff --git a/routers/web/web.go b/routers/web/web.go index b8e72d14ebc84..2dbaf26538019 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -627,6 +627,7 @@ func RegisterRoutes(m *web.Route) { m.Group("/runners", func() { m.Get("", admin.Runners) + m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost) m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) }) diff --git a/templates/admin/runner/edit.tmpl b/templates/admin/runner/edit.tmpl index 023114185de1c..6a46eed8f40ca 100644 --- a/templates/admin/runner/edit.tmpl +++ b/templates/admin/runner/edit.tmpl @@ -16,7 +16,7 @@ {{.Runner.StatusType}}
    - + {{TimeSinceUnix .Runner.LastOnline $.locale}}
    @@ -56,7 +56,7 @@

    - {{.locale.Tr "admin.runner.task_list"}} + {{.locale.Tr "admin.runners.task_list"}}

    Comming soon @@ -66,18 +66,18 @@ + + {{template "settings/tokens" .}}
    diff --git a/templates/repo/settings/tokens.tmpl b/templates/repo/settings/tokens.tmpl new file mode 100644 index 0000000000000..ed85b71c1b46e --- /dev/null +++ b/templates/repo/settings/tokens.tmpl @@ -0,0 +1,73 @@ +
    + {{template "base/alert" .}} +

    + {{.locale.Tr "repo.settings.deploy_keys"}} +
    + {{if not .DisableSSH}} +
    {{.locale.Tr "repo.settings.add_deploy_key"}}
    + {{else}} +
    {{.locale.Tr "settings.ssh_disabled"}}
    + {{end}} +
    +

    +
    +
    +
    + {{.CsrfTokenHtml}} +
    + {{.locale.Tr "repo.settings.deploy_key_desc"}} +
    +
    + + +
    +
    + + +
    +
    +
    + + + {{$.locale.Tr "repo.settings.is_writable_info" | Str2html}} +
    +
    + + +
    +
    + {{if .Deploykeys}} +
    + {{range .Deploykeys}} +
    +
    + +
    +
    + {{svg "octicon-key" 32}} +
    +
    + {{.Name}} +
    + {{.Fingerprint}} +
    +
    + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}} +
    +
    +
    + {{end}} +
    + {{else}} + {{.locale.Tr "repo.settings.no_deploy_keys"}} + {{end}} +
    +
    From e43e3f9518c85c9dc2cf38d3198ab45d58a62301 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 9 Oct 2022 19:12:15 +0800 Subject: [PATCH 107/408] improve UI --- models/auth/secret.go | 2 +- models/migrations/v226.go | 25 +++++++++++++++ options/locale/locale_en-US.ini | 9 ++++++ templates/repo/settings/deploy_keys.tmpl | 4 +-- .../settings/{tokens.tmpl => secrets.tmpl} | 32 ++++++++----------- 5 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 models/migrations/v226.go rename templates/repo/settings/{tokens.tmpl => secrets.tmpl} (70%) diff --git a/models/auth/secret.go b/models/auth/secret.go index 32b1c48e9ccb8..fea4e4b3b5983 100644 --- a/models/auth/secret.go +++ b/models/auth/secret.go @@ -36,7 +36,7 @@ type Secret struct { Name string Data string PullRequest bool - CreatedUnix timeutil.TimeStamp + CreatedUnix timeutil.TimeStamp `xorm:"created"` } // Validate validates the required fields and formats. diff --git a/models/migrations/v226.go b/models/migrations/v226.go new file mode 100644 index 0000000000000..af9d2cd32f9b3 --- /dev/null +++ b/models/migrations/v226.go @@ -0,0 +1,25 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/xorm" +) + +func createSecretsTable(x *xorm.Engine) error { + type Secret struct { + ID int64 + UserID int64 `xorm:"index"` + RepoID int64 `xorm:"index"` + Name string + Data string + PullRequest bool + CreatedUnix timeutil.TimeStamp `xorm:"created"` + } + + return x.Sync(new(Secret)) +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2ef8b181d03b0..c7fc61be964a1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2072,6 +2072,15 @@ settings.deploy_key_desc = Deploy keys have read-only pull access to the reposit settings.is_writable = Enable Write Access settings.is_writable_info = Allow this deploy key to push to the repository. settings.no_deploy_keys = There are no deploy keys yet. +settings.secrets = Secrets +settings.pull_request_read = Pull Request Read +settings.pull_request_read_info = "If allow pull request read the secret, it's security related." +settings.add_secret = Add Secret +settings.secret_value_content_placeholder = Input any content +settings.secret_desc = Secrets could be visited by repository events +settings.secret_content = Value +settings.secret_key = Key +settings.no_secret = There are no secrets yet. settings.title = Title settings.deploy_key_content = Content settings.key_been_used = A deploy key with identical content is already in use. diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index f656640cadca1..31d1c1f7ab9d8 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -75,8 +75,8 @@ {{end}}
    - - {{template "settings/tokens" .}} +
    + {{template "repo/settings/secrets" .}}
    diff --git a/templates/repo/settings/tokens.tmpl b/templates/repo/settings/secrets.tmpl similarity index 70% rename from templates/repo/settings/tokens.tmpl rename to templates/repo/settings/secrets.tmpl index ed85b71c1b46e..dd1f75b5afd21 100644 --- a/templates/repo/settings/tokens.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -1,50 +1,46 @@
    {{template "base/alert" .}}

    - {{.locale.Tr "repo.settings.deploy_keys"}} + {{.locale.Tr "repo.settings.secrets"}}
    - {{if not .DisableSSH}} -
    {{.locale.Tr "repo.settings.add_deploy_key"}}
    - {{else}} -
    {{.locale.Tr "settings.ssh_disabled"}}
    - {{end}} +
    {{.locale.Tr "repo.settings.add_secret"}}

    -
    +
    {{.CsrfTokenHtml}}
    - {{.locale.Tr "repo.settings.deploy_key_desc"}} + {{.locale.Tr "repo.settings.secret_desc"}}
    - +
    - - + +
    - {{$.locale.Tr "repo.settings.is_writable_info" | Str2html}} + {{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}}
    -
    - {{if .Deploykeys}} + {{if .Secrets}}
    - {{range .Deploykeys}} + {{range .Secrets}}
    {{else}} - {{.locale.Tr "repo.settings.no_deploy_keys"}} + {{.locale.Tr "repo.settings.no_secret"}} {{end}}
    From da981db596e7f2fbbc494aea8a75b774f5157aba Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 9 Oct 2022 19:57:51 +0800 Subject: [PATCH 108/408] finish adding and deleting secret for repository settting --- modules/templates/helper.go | 3 ++ routers/init.go | 3 ++ routers/web/repo/setting.go | 42 ++++++++++++++++++++++++++-- services/forms/user_form.go | 28 ++++++++++++++----- templates/repo/settings/secrets.tmpl | 12 ++++---- 5 files changed, 72 insertions(+), 16 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 2720ab76dcc2e..e5f42943acceb 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -475,6 +475,9 @@ func NewFuncMap() []template.FuncMap { "RefShortName": func(ref string) string { return git.RefName(ref).ShortName() }, + "Shadow": func(s string) string { + return "******" + }, }} } diff --git a/routers/init.go b/routers/init.go index 5d700792b4c8f..65bb0fc6c3101 100644 --- a/routers/init.go +++ b/routers/init.go @@ -48,6 +48,7 @@ import ( pull_service "code.gitea.io/gitea/services/pull" repo_service "code.gitea.io/gitea/services/repository" "code.gitea.io/gitea/services/repository/archiver" + secret_service "code.gitea.io/gitea/services/secrets" "code.gitea.io/gitea/services/task" "code.gitea.io/gitea/services/webhook" ) @@ -151,6 +152,8 @@ func GlobalInitInstalled(ctx context.Context) { mustInit(models.Init) mustInit(repo_service.Init) + mustInit(secret_service.Init) + // Booting long running goroutines. issue_indexer.InitIssueIndexer(false) code_indexer.Init() diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index c479008736243..6836f8eed8eb9 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -45,8 +45,8 @@ import ( mirror_service "code.gitea.io/gitea/services/mirror" org_service "code.gitea.io/gitea/services/org" repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" secret_service "code.gitea.io/gitea/services/secrets" + wiki_service "code.gitea.io/gitea/services/wiki" ) const ( @@ -1114,19 +1114,38 @@ func DeployKeys(ctx *context.Context) { } ctx.Data["Deploykeys"] = keys - tokens, err := secret_service.FindRepoSecrets(ctx, ctx.Repo.Repository.ID) + secrets, err := secret_service.FindRepoSecrets(ctx, ctx.Repo.Repository.ID) if err != nil { ctx.ServerError("FindRepoSecrets", err) return } - ctx.Data["Tokens"] = tokens + ctx.Data["Secrets"] = secrets ctx.HTML(http.StatusOK, tplDeployKeys) } +// SecretsPost +func SecretsPost(ctx *context.Context) { + form := web.GetForm(ctx).(*forms.AddKeyForm) + if err := secret_service.InsertRepoSecret(ctx, ctx.Repo.Repository.ID, form.Title, form.Content, form.PullRequestRead); err != nil { + ctx.ServerError("InsertRepoSecret", err) + return + } + + log.Trace("Secret added: %d", ctx.Repo.Repository.ID) + ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") +} + // DeployKeysPost response for adding a deploy key of a repository func DeployKeysPost(ctx *context.Context) { + if ctx.FormString("act") == "secret" { + SecretsPost(ctx) + return + } + form := web.GetForm(ctx).(*forms.AddKeyForm) + ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") ctx.Data["PageIsSettingsKeys"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled @@ -1185,8 +1204,25 @@ func DeployKeysPost(ctx *context.Context) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") } +func DeleteSecret(ctx *context.Context) { + if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil { + ctx.Flash.Error("DeleteSecretByID: " + err.Error()) + } else { + ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + } + + ctx.JSON(http.StatusOK, map[string]interface{}{ + "redirect": ctx.Repo.RepoLink + "/settings/keys", + }) +} + // DeleteDeployKey response for deleting a deploy key func DeleteDeployKey(ctx *context.Context) { + if ctx.FormString("act") == "secret" { + DeleteSecret(ctx) + return + } + if err := asymkey_service.DeleteDeployKey(ctx.Doer, ctx.FormInt64("id")); err != nil { ctx.Flash.Error("DeleteDeployKey: " + err.Error()) } else { diff --git a/services/forms/user_form.go b/services/forms/user_form.go index 7c063945ad804..0add17967e5c1 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -351,13 +351,14 @@ func (f *AddOpenIDForm) Validate(req *http.Request, errs binding.Errors) binding // AddKeyForm form for adding SSH/GPG key type AddKeyForm struct { - Type string `binding:"OmitEmpty"` - Title string `binding:"Required;MaxSize(50)"` - Content string `binding:"Required"` - Signature string `binding:"OmitEmpty"` - KeyID string `binding:"OmitEmpty"` - Fingerprint string `binding:"OmitEmpty"` - IsWritable bool + Type string `binding:"OmitEmpty"` + Title string `binding:"Required;MaxSize(50)"` + Content string `binding:"Required"` + Signature string `binding:"OmitEmpty"` + KeyID string `binding:"OmitEmpty"` + Fingerprint string `binding:"OmitEmpty"` + IsWritable bool + PullRequestRead bool } // Validate validates the fields @@ -366,6 +367,19 @@ func (f *AddKeyForm) Validate(req *http.Request, errs binding.Errors) binding.Er return middleware.Validate(errs, ctx.Data, f, ctx.Locale) } +// AddSecretForm for adding secrets +type AddSecretForm struct { + Title string `binding:"Required;MaxSize(50)"` + Content string `binding:"Required"` + PullRequestRead bool +} + +// Validate validates the fields +func (f *AddSecretForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { + ctx := context.GetContext(req) + return middleware.Validate(errs, ctx.Data, f, ctx.Locale) +} + // NewAccessTokenForm form for creating access token type NewAccessTokenForm struct { Name string `binding:"Required;MaxSize(255)"` diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl index dd1f75b5afd21..9a5d1e85bf47c 100644 --- a/templates/repo/settings/secrets.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -8,7 +8,7 @@
    -
    + {{.CsrfTokenHtml}}
    {{.locale.Tr "repo.settings.secret_desc"}} @@ -23,7 +23,7 @@
    - + @@ -43,20 +43,20 @@ {{range .Secrets}}
    -
    - {{svg "octicon-key" 32}} + {{svg "octicon-key" 32}}
    {{.Name}}
    - {{.Fingerprint}} + {{Shadow .Data}}
    - {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}}
    From fa5b8e9eba88370af78b327da842c6a866c98c59 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 10 Oct 2022 15:46:03 +0800 Subject: [PATCH 109/408] org secrets --- routers/web/org/setting.go | 11 ++++ routers/web/web.go | 4 ++ templates/org/settings/navbar.tmpl | 3 ++ templates/org/settings/secrets.tmpl | 79 +++++++++++++++++++++++++++++ templates/repo/settings/nav.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- 6 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 templates/org/settings/secrets.tmpl diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1a54fa6e861bf..b64fe0e69f7d6 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -40,6 +40,8 @@ const ( tplSettingsLabels base.TplName = "org/settings/labels" // tplSettingsRunners template path for render runners settings tplSettingsRunners base.TplName = "org/settings/runners" + // tplSettingsSecrets template path for render secrets settings + tplSettingsSecrets base.TplName = "org/settings/secrets" ) // Settings render the main settings page @@ -249,3 +251,12 @@ func Labels(ctx *context.Context) { ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.HTML(http.StatusOK, tplSettingsLabels) } + +// Secrets render organization secrets page +func Secrets(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.secrets") + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageIsOrgSettingsSecrets"] = true + ctx.Data["RequireTribute"] = true + ctx.HTML(http.StatusOK, tplSettingsSecrets) +} diff --git a/routers/web/web.go b/routers/web/web.go index 3c8bcbe724d2a..c0eb5f05b2025 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -791,6 +791,10 @@ func RegisterRoutes(m *web.Route) { m.Post("/initialize", bindIgnErr(forms.InitializeLabelsForm{}), org.InitializeLabels) }) + m.Group("/secrets", func() { + m.Get("", org.Secrets) + }) + m.Group("/runners", func() { m.Get("", org.Runners) m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 8f21762175a8e..1d236a3d89cea 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,6 +25,9 @@ {{.locale.Tr "repo.runners"}} + + {{.locale.Tr "repo.secrets"}} + {{.locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl new file mode 100644 index 0000000000000..4657a9b296a8b --- /dev/null +++ b/templates/org/settings/secrets.tmpl @@ -0,0 +1,79 @@ +{{template "base/head" .}} +
    + {{template "org/header" .}} +
    +
    + {{template "org/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.locale.Tr "repo.settings.secrets"}} +
    +
    {{.locale.Tr "repo.settings.add_secret"}}
    +
    +

    +
    +
    + + {{.CsrfTokenHtml}} +
    + {{.locale.Tr "repo.settings.secret_desc"}} +
    +
    + + +
    +
    + + +
    +
    +
    + + + {{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}} +
    +
    + + + +
    + {{if .Secrets}} +
    + {{range .Secrets}} +
    +
    + +
    +
    + {{svg "octicon-key" 32}} +
    +
    + {{.Name}} +
    + {{Shadow .Data}} +
    +
    + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} +
    +
    +
    + {{end}} +
    + {{else}} + {{.locale.Tr "repo.settings.no_secret"}} + {{end}} +
    +
    +
    +
    +
    +
    diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 6239b04ed492f..5cd1d86f78e41 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -12,7 +12,7 @@ {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
  • {{.locale.Tr "repo.settings.githooks"}}
    • {{end}} -
  • {{.locale.Tr "repo.settings.deploy_keys"}}
    • +
  • {{.locale.Tr "repo.settings.secrets"}}
    • diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 82ae250df1cb2..522e35d230238 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{end}} - {{.locale.Tr "repo.settings.deploy_keys"}} + {{.locale.Tr "repo.settings.secrets"}} {{if .LFSStartServer}} From 8dc263c6ed42c782efaea7d697dc80e406173d06 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Oct 2022 23:24:52 +0800 Subject: [PATCH 110/408] fix show add secret panel --- templates/org/settings/secrets.tmpl | 127 +++++++++++++++------------- 1 file changed, 66 insertions(+), 61 deletions(-) diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index 4657a9b296a8b..b59754063a35c 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -5,75 +5,80 @@
    {{template "org/settings/navbar" .}}
    - {{template "base/alert" .}} -

    - {{.locale.Tr "repo.settings.secrets"}} -
    -
    {{.locale.Tr "repo.settings.add_secret"}}
    -
    -

    -
    -
    -
    - {{.CsrfTokenHtml}} -
    - {{.locale.Tr "repo.settings.secret_desc"}} -
    -
    - - + {{template "base/alert" .}} +

    + {{.locale.Tr "repo.settings.secrets"}} +
    +
    {{.locale.Tr "repo.settings.add_secret"}}
    +
    +

    +
    +
    + + {{.CsrfTokenHtml}} +
    + {{.locale.Tr "repo.settings.secret_desc"}} +
    +
    + + +
    +
    + + +
    +
    +
    + + + {{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}}
    -
    - - +
    + + + +
    + {{if .Secrets}} +
    + {{range .Secrets}} +
    +
    + +
    +
    + {{svg "octicon-key" 32}} +
    +
    + {{.Name}} +
    + {{Shadow .Data}}
    -
    -
    - - - {{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}} -
    +
    + + {{$.locale.Tr "settings.add_on"}} + {{.CreatedUnix.FormatShort}} + — {{svg "octicon-info"}} - + {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} +
    - - - -
    - {{if .Secrets}} -
    - {{range .Secrets}} -
    -
    - -
    -
    - {{svg "octicon-key" 32}} -
    -
    - {{.Name}} -
    - {{Shadow .Data}} -
    -
    - {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} -
    -
    -
    - {{end}}
    - {{else}} - {{.locale.Tr "repo.settings.no_secret"}} +
    {{end}}
    + {{else}} + {{.locale.Tr "repo.settings.no_secret"}} + {{end}}
    +{{template "base/footer" .}} From 5b55fd0d36bfc70bfb9eb1736f10ab8815116f8a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Oct 2022 01:08:22 +0800 Subject: [PATCH 111/408] org secrets --- routers/web/org/setting.go | 35 +++++++++++++++++++++++++++++ routers/web/web.go | 2 ++ templates/org/settings/secrets.tmpl | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index b64fe0e69f7d6..fe4df094f4ff1 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -26,6 +26,7 @@ import ( "code.gitea.io/gitea/services/org" container_service "code.gitea.io/gitea/services/packages/container" repo_service "code.gitea.io/gitea/services/repository" + secret_service "code.gitea.io/gitea/services/secrets" user_service "code.gitea.io/gitea/services/user" ) @@ -258,5 +259,39 @@ func Secrets(ctx *context.Context) { ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsSecrets"] = true ctx.Data["RequireTribute"] = true + + secrets, err := secret_service.FindUserSecrets(ctx, ctx.Org.Organization.ID) + if err != nil { + ctx.ServerError("FindRepoSecrets", err) + return + } + ctx.Data["Secrets"] = secrets + ctx.HTML(http.StatusOK, tplSettingsSecrets) } + +// SecretsPost add secrets +func SecretsPost(ctx *context.Context) { + form := web.GetForm(ctx).(*forms.AddSecretForm) + if err := secret_service.InsertOrgSecret(ctx, ctx.Org.Organization.ID, form.Title, form.Content, form.PullRequestRead); err != nil { + ctx.ServerError("InsertRepoSecret", err) + return + } + + log.Trace("Secret added: %d", ctx.Org.Organization.ID) + ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Redirect(ctx.Org.OrgLink + "/settings/secrets") +} + +// SecretsDelete delete secrets +func SecretsDelete(ctx *context.Context) { + if err := secret_service.DeleteSecretByID(ctx, ctx.ParamsInt64("id")); err != nil { + ctx.Flash.Error("DeleteSecretByID: " + err.Error()) + } else { + ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + } + + ctx.JSON(http.StatusOK, map[string]interface{}{ + "redirect": ctx.Org.OrgLink + "/settings/secrets", + }) +} diff --git a/routers/web/web.go b/routers/web/web.go index c0eb5f05b2025..d0ac2fe5d2e0c 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -793,6 +793,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/secrets", func() { m.Get("", org.Secrets) + m.Post("", bindIgnErr(forms.AddSecretForm{}), org.SecretsPost) + m.Post("/delete", org.SecretsDelete) }) m.Group("/runners", func() { diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index b59754063a35c..b44d82c115d63 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -49,7 +49,7 @@ {{range .Secrets}}
    -
    From 08b463a3084e80f2da8266a2e16a4489a1529ecf Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Oct 2022 17:48:04 +0800 Subject: [PATCH 112/408] Fix duplicated alert --- templates/repo/settings/secrets.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl index 9a5d1e85bf47c..888f8fb84e98e 100644 --- a/templates/repo/settings/secrets.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -1,5 +1,4 @@
    - {{template "base/alert" .}}

    {{.locale.Tr "repo.settings.secrets"}}
    From da60ae69bedcc92e7f451498c12bd0d0dc3ef62b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 14 Oct 2022 19:17:08 +0800 Subject: [PATCH 113/408] delete modal --- templates/org/settings/secrets.tmpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index b44d82c115d63..9e8d9383fdbfc 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -81,4 +81,16 @@

    + +
    +
    + {{svg "octicon-trash" 16 "mr-2"}} + delete +
    +
    +

    detail

    +
    + {{template "base/delete_modal_actions" .}} +
    + {{template "base/footer" .}} From 8ec691f3ce92ad0e1b4c0faabbdb7f92ffe7d7a0 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Oct 2022 21:22:22 +0800 Subject: [PATCH 114/408] Almost finished --- options/locale/locale_en-US.ini | 6 ++++++ routers/web/org/setting.go | 6 +++--- routers/web/repo/setting.go | 4 ++-- templates/org/settings/navbar.tmpl | 2 +- templates/org/settings/secrets.tmpl | 10 +++++----- templates/repo/settings/secrets.tmpl | 5 +++-- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c7fc61be964a1..28fd71abe93ea 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2075,12 +2075,17 @@ settings.no_deploy_keys = There are no deploy keys yet. settings.secrets = Secrets settings.pull_request_read = Pull Request Read settings.pull_request_read_info = "If allow pull request read the secret, it's security related." +settings.pull_request_read_hint = Allow pull request read the secret settings.add_secret = Add Secret +settings.add_secret_success = The secret '%s' has been added. settings.secret_value_content_placeholder = Input any content settings.secret_desc = Secrets could be visited by repository events settings.secret_content = Value settings.secret_key = Key settings.no_secret = There are no secrets yet. +settings.secret_deletion = Remove secret +settings.secret_deletion_desc = Removing a secret will revoke its access to this repository. Continue? +settings.secret_deletion_success = The secret has been removed. settings.title = Title settings.deploy_key_content = Content settings.key_been_used = A deploy key with identical content is already in use. @@ -2399,6 +2404,7 @@ settings.update_setting_success = Organization settings have been updated. settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL. settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed. settings.update_avatar_success = The organization's avatar has been updated. +settings.secrets = Secrets settings.delete = Delete Organization settings.delete_account = Delete This Organization settings.delete_prompt = The organization will be permanently removed. This CANNOT be undone! diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index fe4df094f4ff1..7a86b52bccc0c 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -279,16 +279,16 @@ func SecretsPost(ctx *context.Context) { } log.Trace("Secret added: %d", ctx.Org.Organization.ID) - ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title)) ctx.Redirect(ctx.Org.OrgLink + "/settings/secrets") } // SecretsDelete delete secrets func SecretsDelete(ctx *context.Context) { - if err := secret_service.DeleteSecretByID(ctx, ctx.ParamsInt64("id")); err != nil { + if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil { ctx.Flash.Error("DeleteSecretByID: " + err.Error()) } else { - ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success")) } ctx.JSON(http.StatusOK, map[string]interface{}{ diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 6836f8eed8eb9..412b117b65e6f 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -1133,7 +1133,7 @@ func SecretsPost(ctx *context.Context) { } log.Trace("Secret added: %d", ctx.Repo.Repository.ID) - ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title)) ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") } @@ -1208,7 +1208,7 @@ func DeleteSecret(ctx *context.Context) { if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil { ctx.Flash.Error("DeleteSecretByID: " + err.Error()) } else { - ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success")) } ctx.JSON(http.StatusOK, map[string]interface{}{ diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 1d236a3d89cea..94a4bbbbeaa47 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -26,7 +26,7 @@ {{.locale.Tr "repo.runners"}}     - {{.locale.Tr "repo.secrets"}} + {{.locale.Tr "org.settings.secrets"}} {{.locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index 9e8d9383fdbfc..24605dfabcfd8 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -25,7 +25,7 @@
    - +
    @@ -65,8 +65,8 @@ {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} - — {{svg "octicon-info"}} - - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} + {{if .PullRequest}} — {{svg "octicon-info"}} - + {{$.locale.Tr "repo.settings.pull_request_read_hint"}} {{end}}
    @@ -85,10 +85,10 @@
    {{svg "octicon-trash" 16 "mr-2"}} - delete + {{.locale.Tr "repo.settings.secret_deletion"}}
    -

    detail

    +

    {{.locale.Tr "repo.settings.secret_deletion_desc"}}

    {{template "base/delete_modal_actions" .}}
    diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl index 888f8fb84e98e..1facd7ba0a3ac 100644 --- a/templates/repo/settings/secrets.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -18,7 +18,7 @@
    - +
    @@ -55,7 +55,8 @@ {{Shadow .Data}}
    - {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} + {{if .PullRequest}} — {{svg "octicon-info"}} - {{$.locale.Tr "repo.settings.pull_request_read_hint"}} {{end}}
    From e7d5c99b42b68e8a237aefb0c9e191dcfe6f1d1c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 14 Oct 2022 21:48:47 +0800 Subject: [PATCH 115/408] Fix lint --- models/auth/secret.go | 15 ++++++------ models/db/search.go | 2 +- models/migrations/v227.go | 25 ++++++++++++++++++++ modules/generate/generate.go | 10 -------- modules/setting/setting.go | 4 ++-- services/secrets/encryption_aes.go | 3 +-- services/secrets/masterkey_nop.go | 3 +-- services/secrets/secrets.go | 37 +++++++++++++++--------------- 8 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 models/migrations/v227.go diff --git a/models/auth/secret.go b/models/auth/secret.go index fea4e4b3b5983..5bf950a50d6e2 100644 --- a/models/auth/secret.go +++ b/models/auth/secret.go @@ -29,17 +29,18 @@ func (err ErrSecretDataInvalid) Error() string { var nameRE = regexp.MustCompile("[^a-zA-Z0-9-_.]+") +// Secret represents a secret type Secret struct { - ID int64 - UserID int64 `xorm:"index"` - RepoID int64 `xorm:"index"` - Name string - Data string - PullRequest bool + ID int64 + UserID int64 `xorm:"index"` + RepoID int64 `xorm:"index"` + Name string + Data string + PullRequest bool CreatedUnix timeutil.TimeStamp `xorm:"created"` } - // Validate validates the required fields and formats. +// Validate validates the required fields and formats. func (s *Secret) Validate() error { switch { case len(s.Name) == 0: diff --git a/models/db/search.go b/models/db/search.go index f4bbd9d3fafa2..a5bd427ee6fd7 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -41,7 +41,7 @@ func FindObjects[Object any](ctx context.Context, cond builder.Cond, opts *ListO if opts.Page < 1 { opts.Page = 1 } - sess.Limit(opts.PageSize, opts.PageSize * (opts.Page - 1)) + sess.Limit(opts.PageSize, opts.PageSize*(opts.Page-1)) } return sess.Find(objects) } diff --git a/models/migrations/v227.go b/models/migrations/v227.go new file mode 100644 index 0000000000000..d4455c0c4a1d2 --- /dev/null +++ b/models/migrations/v227.go @@ -0,0 +1,25 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/xorm" +) + +func createSecretsTable(x *xorm.Engine) error { + type Secret struct { + ID int64 + UserID int64 `xorm:"index"` + RepoID int64 `xorm:"index"` + Name string + Data string + PullRequest bool + CreatedUnix timeutil.TimeStamp `xorm:"created"` + } + + return x.Sync(new(Secret)) +} diff --git a/modules/generate/generate.go b/modules/generate/generate.go index c28b99d552160..6b788df0a1f74 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -9,7 +9,6 @@ import ( "crypto/rand" "encoding/base64" "io" - "math/big" "time" "code.gitea.io/gitea/modules/util" @@ -79,12 +78,3 @@ func NewMasterKey() ([]byte, error) { return secretBytes, nil } - -func randomInt(max *big.Int) (int, error) { - rand, err := rand.Int(rand.Reader, max) - if err != nil { - return 0, err - } - - return int(rand.Int64()), nil -} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8b472b42b4885..3e4ec0e488108 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -215,8 +215,8 @@ var ( HMACKey string `ini:"HMAC_KEY"` Allways bool }{} - MasterKeyProvider string - MasterKey []byte + MasterKeyProvider string + MasterKey []byte // UI settings UI = struct { diff --git a/services/secrets/encryption_aes.go b/services/secrets/encryption_aes.go index d34636c7aa677..7a3141de77116 100644 --- a/services/secrets/encryption_aes.go +++ b/services/secrets/encryption_aes.go @@ -13,8 +13,7 @@ import ( "io" ) -type aesEncryptionProvider struct { -} +type aesEncryptionProvider struct{} func NewAesEncryptionProvider() EncryptionProvider { return &aesEncryptionProvider{} diff --git a/services/secrets/masterkey_nop.go b/services/secrets/masterkey_nop.go index 83d85ab2769c2..db0d11471a1c2 100644 --- a/services/secrets/masterkey_nop.go +++ b/services/secrets/masterkey_nop.go @@ -4,8 +4,7 @@ package secrets -type nopMasterKeyProvider struct { -} +type nopMasterKeyProvider struct{} // NewNopMasterKeyProvider returns master key provider that holds no master key and is always unsealed func NewNopMasterKeyProvider() MasterKeyProvider { diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go index 4f113958d42fd..4d32a82b0d36b 100644 --- a/services/secrets/secrets.go +++ b/services/secrets/secrets.go @@ -103,16 +103,16 @@ func DecryptString(enc string) (string, error) { } func InsertRepoSecret(ctx context.Context, repoID int64, key, data string, pullRequest bool) error { - v, err := EncryptString( data) + v, err := EncryptString(data) if err != nil { return err } -return db.Insert(ctx, &auth_model.Secret{ - RepoID: repoID, - Name: key, - Data: v, - PullRequest: pullRequest, -}) + return db.Insert(ctx, &auth_model.Secret{ + RepoID: repoID, + Name: key, + Data: v, + PullRequest: pullRequest, + }) } func InsertOrgSecret(ctx context.Context, userID int64, key, data string, pullRequest bool) error { @@ -120,26 +120,25 @@ func InsertOrgSecret(ctx context.Context, userID int64, key, data string, pullRe if err != nil { return err } -return db.Insert(ctx, &auth_model.Secret{ - UserID: userID, - Name: key, - Data: v, - PullRequest: pullRequest, -}) + return db.Insert(ctx, &auth_model.Secret{ + UserID: userID, + Name: key, + Data: v, + PullRequest: pullRequest, + }) } func DeleteSecretByID(ctx context.Context, id int64) error { -_, err := db.DeleteByBean(ctx, &auth_model.Secret{ID: id}) -return err + _, err := db.DeleteByBean(ctx, &auth_model.Secret{ID: id}) + return err } - -func FindRepoSecrets(ctx context.Context,repoID int64) ([]*auth_model.Secret, error) { +func FindRepoSecrets(ctx context.Context, repoID int64) ([]*auth_model.Secret, error) { var res []*auth_model.Secret - return res, db.FindObjects(ctx, builder.Eq{"repo_id": repoID}, nil,&res) + return res, db.FindObjects(ctx, builder.Eq{"repo_id": repoID}, nil, &res) } func FindUserSecrets(ctx context.Context, userID int64) ([]*auth_model.Secret, error) { var res []*auth_model.Secret - return res, db.FindObjects(ctx, builder.Eq{"user_id": userID}, nil,&res) + return res, db.FindObjects(ctx, builder.Eq{"user_id": userID}, nil, &res) } From b5520f098f188a7c0c401d2133e0e3c09ae673ab Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 15 Oct 2022 11:45:03 +0800 Subject: [PATCH 116/408] Some improvements --- models/auth/secret.go | 12 ++++++------ models/db/search.go | 1 + models/migrations/v227.go | 12 ++++++------ modules/generate/generate.go | 8 +------- routers/web/repo/setting.go | 2 +- services/secrets/masterkey_nop_test.go | 4 ++++ templates/org/settings/secrets.tmpl | 6 +++--- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/models/auth/secret.go b/models/auth/secret.go index 5bf950a50d6e2..da71df9637738 100644 --- a/models/auth/secret.go +++ b/models/auth/secret.go @@ -32,12 +32,12 @@ var nameRE = regexp.MustCompile("[^a-zA-Z0-9-_.]+") // Secret represents a secret type Secret struct { ID int64 - UserID int64 `xorm:"index"` - RepoID int64 `xorm:"index"` - Name string - Data string - PullRequest bool - CreatedUnix timeutil.TimeStamp `xorm:"created"` + UserID int64 `xorm:"index NOTNULL"` + RepoID int64 `xorm:"index NOTNULL"` + Name string `xorm:"NOTNULL"` + Data string `xorm:"TEXT"` + PullRequest bool `xorm:"NOTNULL"` + CreatedUnix timeutil.TimeStamp `xorm:"created NOTNULL"` } // Validate validates the required fields and formats. diff --git a/models/db/search.go b/models/db/search.go index a5bd427ee6fd7..21731e4599ab9 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -35,6 +35,7 @@ const ( SearchOrderByForksReverse SearchOrderBy = "num_forks DESC" ) +// FindObjects represents a common function to find Objects from database according cond and ListOptions func FindObjects[Object any](ctx context.Context, cond builder.Cond, opts *ListOptions, objects *[]*Object) error { sess := GetEngine(ctx).Where(cond) if opts != nil && opts.PageSize > 0 { diff --git a/models/migrations/v227.go b/models/migrations/v227.go index d4455c0c4a1d2..f5bbab43e20d8 100644 --- a/models/migrations/v227.go +++ b/models/migrations/v227.go @@ -13,12 +13,12 @@ import ( func createSecretsTable(x *xorm.Engine) error { type Secret struct { ID int64 - UserID int64 `xorm:"index"` - RepoID int64 `xorm:"index"` - Name string - Data string - PullRequest bool - CreatedUnix timeutil.TimeStamp `xorm:"created"` + UserID int64 `xorm:"index NOTNULL"` + RepoID int64 `xorm:"index NOTNULL"` + Name string `xorm:"NOTNULL"` + Data string `xorm:"TEXT"` + PullRequest bool `xorm:"NOTNULL"` + CreatedUnix timeutil.TimeStamp `xorm:"created NOTNULL"` } return x.Sync(new(Secret)) diff --git a/modules/generate/generate.go b/modules/generate/generate.go index 6b788df0a1f74..29179f905bcf1 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -70,11 +70,5 @@ func NewSecretKey() (string, error) { // NewMasterKey generate a new value intended to be used by MASTER_KEY. func NewMasterKey() ([]byte, error) { - secretBytes := make([]byte, 32) - _, err := io.ReadFull(rand.Reader, secretBytes) - if err != nil { - return nil, err - } - - return secretBytes, nil + return util.CryptoRandomBytes(32) } diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 412b117b65e6f..91cde89980767 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -1124,7 +1124,7 @@ func DeployKeys(ctx *context.Context) { ctx.HTML(http.StatusOK, tplDeployKeys) } -// SecretsPost +// SecretsPost response for creating a new secret func SecretsPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.AddKeyForm) if err := secret_service.InsertRepoSecret(ctx, ctx.Repo.Repository.ID, form.Title, form.Content, form.PullRequestRead); err != nil { diff --git a/services/secrets/masterkey_nop_test.go b/services/secrets/masterkey_nop_test.go index 09e4587d4dfd1..f270a6cee41d5 100644 --- a/services/secrets/masterkey_nop_test.go +++ b/services/secrets/masterkey_nop_test.go @@ -1,3 +1,7 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package secrets import ( diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index 24605dfabcfd8..96068c77b5383 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -21,14 +21,14 @@
    - +
    - +
    -
    +
    {{template "repo/header" .}} -
    -
    -
    -

    - {{template "repo/builds/status" .Build.Status}}{{RenderIssueTitle $.Context .Build.Title $.RepoLink $.Repository.ComposeMetas}} - #{{.Build.Index}} -

    -
    -
    +
    +

    + {{template "repo/builds/status" .Build.Status}}{{RenderIssueTitle $.Context .Build.Title $.RepoLink $.Repository.ComposeMetas}} + #{{.Build.Index}} +

    -
    + +
    +
    + {{template "base/footer" .}} diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue index b6a3259a685df..afe0cdf98b6a8 100644 --- a/web_src/js/components/RepoBuildView.vue +++ b/web_src/js/components/RepoBuildView.vue @@ -103,10 +103,6 @@ const sfc = { }, mounted() { - // TODO: the parent element's full height doesn't work well now - const elBodyDiv = document.querySelector('body > div.full.height'); - elBodyDiv.style.height = '100%'; - // load job data and then auto-reload periodically this.loadJobData(); setInterval(() => this.loadJobData(), 1000); @@ -239,7 +235,7 @@ const sfc = { // prepare mock data for logs for (const reqCursor of reqData.stepLogCursors) { if (!reqCursor.expanded) continue; // backend can decide whether send logs for a step - // if (reqCursor.cursor > 100) continue; + if (reqCursor.cursor > 100) continue; let cursor = reqCursor.cursor; // use cursor to send remaining logs const lines = []; for (let i = 0; i < 110; i++) { @@ -317,8 +313,8 @@ export function initRepositoryBuildView() { if (!el) return; const view = createApp(sfc, { - jobIndex: el.getAttribute("job-index"), - runIndex: el.getAttribute("run-index"), + jobIndex: el.getAttribute("data-job-index"), + runIndex: el.getAttribute("data-run-index"), }); view.mount(el); } @@ -329,7 +325,7 @@ export function initRepositoryBuildView() { .build-view-container { display: flex; - height: 100%; + height: calc(100vh - 286px); // fine tune this value to make the main view has full height } @@ -416,6 +412,12 @@ export function initRepositoryBuildView() { @@ -408,11 +410,11 @@ body > div.full.height { display: flex; line-num { width: 48px; - color: #555; + color: var(--color-grey-light); text-align: right; } log-time { - color: #777; + color: var(--color-grey-light); margin-left: 10px; white-space: nowrap; } From 59beb2dba6b35b88dae5ac5c3d094bc6c1bba19c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 14:47:27 +0800 Subject: [PATCH 371/408] feat: add _actions.less --- web_src/js/components/RepoActionView.vue | 57 +----------------------- web_src/less/_actions.less | 51 +++++++++++++++++++++ web_src/less/index.less | 1 + 3 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 web_src/less/_actions.less diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 0f26a1c57113c..4a9e86281a4e9 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -281,6 +281,8 @@ export function initRepositoryActionView() { - diff --git a/web_src/less/_actions.less b/web_src/less/_actions.less new file mode 100644 index 0000000000000..b149ab6fe4647 --- /dev/null +++ b/web_src/less/_actions.less @@ -0,0 +1,51 @@ +@import "variables.less"; + +// TODO: the parent element's full height doesn't work well now +body > div.full.height { + padding-bottom: 0; +} + +.job-status-rotate { + animation: job-status-rotate-keyframes 1s linear infinite; +} +@keyframes job-status-rotate-keyframes { + 100% { + transform:rotate(360deg); + } +} + +.job-step-section { + margin: 10px; + .job-step-logs { + font-family: monospace, monospace; + .job-log-line { + display: flex; + line-num { + width: 48px; + color: var(--color-grey-light); + text-align: right; + } + log-time { + color: var(--color-grey-light); + margin-left: 10px; + white-space: nowrap; + } + log-msg { + flex: 1; + word-break: break-all; + white-space: break-spaces; + margin-left: 10px; + } + } + + // TODO: group support + .job-log-group { + } + + .job-log-group-summary { + } + + .job-log-list { + } + } +} diff --git a/web_src/less/index.less b/web_src/less/index.less index dafed3eb2755d..1232c4b7cb880 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -37,5 +37,6 @@ @import "_review"; @import "_package"; @import "_runner"; +@import "_actions"; @import "./helpers.less"; From 11b0f84f88d790cab0f238fd43cb3c74761bd76f Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 14:50:18 +0800 Subject: [PATCH 372/408] chore: getLogsContainer --- web_src/js/components/RepoActionView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 4a9e86281a4e9..78988e825503f 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -106,7 +106,7 @@ const sfc = { methods: { // get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group` - stepLogsGetActiveContainer(idx) { + getLogsContainer(idx) { const el = this.$refs.elJobStepLogs[idx]; return el._stepLogsActiveContainer ?? el; }, @@ -205,7 +205,7 @@ const sfc = { appendLogs(stepIndex, logLines) { for (const line of logLines) { // TODO: group support: ##[group]GroupTitle , ##[endgroup] - const el = this.stepLogsGetActiveContainer(stepIndex); + const el = this.getLogsContainer(stepIndex); el.append(this.createLogLine(line)); } }, From 563d798aced1fcdce5a5109f4e7aed1ec200cbf0 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 14:52:02 +0800 Subject: [PATCH 373/408] chore: logsContainer --- web_src/js/components/RepoActionView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 78988e825503f..a0d407738ebaa 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -108,7 +108,7 @@ const sfc = { // get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group` getLogsContainer(idx) { const el = this.$refs.elJobStepLogs[idx]; - return el._stepLogsActiveContainer ?? el; + return el.logsContainer ?? el; }, // begin a log group stepLogsGroupBegin(idx) { @@ -125,12 +125,12 @@ const sfc = { elJobLogGroup.appendChild(elJobLogGroupSummary); elJobLogGroup.appendChild(elJobLogList); - el._stepLogsActiveContainer = elJobLogList; + el.logsContainer = elJobLogList; }, // end a log group stepLogsGroupEnd(idx) { const el = this.$refs.elJobStepLogs[idx]; - el._stepLogsActiveContainer = null; + el.logsContainer = null; }, // show/hide the step logs for a step From 0f6c886e13ef3fd09d78c5901f545818aa390dd1 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 14:53:26 +0800 Subject: [PATCH 374/408] chore: rename --- web_src/js/components/RepoActionView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index a0d407738ebaa..938a679dd554a 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -111,7 +111,7 @@ const sfc = { return el.logsContainer ?? el; }, // begin a log group - stepLogsGroupBegin(idx) { + beginLogGroup(idx) { const el = this.$refs.elJobStepLogs[idx]; const elJobLogGroup = document.createElement('div'); @@ -128,7 +128,7 @@ const sfc = { el.logsContainer = elJobLogList; }, // end a log group - stepLogsGroupEnd(idx) { + endLogGroup(idx) { const el = this.$refs.elJobStepLogs[idx]; el.logsContainer = null; }, From 3edc5d76e666430d45417e2f562f391fe31aef73 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 15:06:34 +0800 Subject: [PATCH 375/408] chore: format css --- web_src/less/_actions.less | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/web_src/less/_actions.less b/web_src/less/_actions.less index b149ab6fe4647..77bae4a923803 100644 --- a/web_src/less/_actions.less +++ b/web_src/less/_actions.less @@ -10,14 +10,14 @@ body > div.full.height { } @keyframes job-status-rotate-keyframes { 100% { - transform:rotate(360deg); + transform: rotate(360deg); } } .job-step-section { margin: 10px; .job-step-logs { - font-family: monospace, monospace; + font-family: monospace; .job-log-line { display: flex; line-num { @@ -39,13 +39,5 @@ body > div.full.height { } // TODO: group support - .job-log-group { - } - - .job-log-group-summary { - } - - .job-log-list { - } } } From 1c87be23c0b328df20471d38b925ac897aab2001 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 15:21:18 +0800 Subject: [PATCH 376/408] chore: use SliceContains --- models/actions/run.go | 2 +- models/actions/run_job.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 565a2a4bf161b..2b748bb0d5633 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -229,7 +229,7 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { } _, err := sess.Update(run) - if run.Status != 0 || util.IsStringInSlice("status", cols) { + if run.Status != 0 || util.SliceContains(cols, "status") { if run.RepoID == 0 { run, err = GetRunByID(ctx, run.ID) if err != nil { diff --git a/models/actions/run_job.go b/models/actions/run_job.go index edaf445931319..0002e507704d5 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -107,7 +107,7 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col return 0, err } - if affected == 0 || (!util.IsStringInSlice("status", cols) && job.Status == 0) { + if affected == 0 || (!util.SliceContains(cols, "status") && job.Status == 0) { return affected, nil } From 14593a8d35598ed59c436aa7094d2a784478b17b Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 16:45:45 +0800 Subject: [PATCH 377/408] fix: fetch data with url --- routers/web/repo/actions/view.go | 6 ++---- templates/repo/actions/view.tmpl | 4 +--- web_src/js/components/RepoActionView.vue | 6 ++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 1941761bbfdcd..36c653c3c6f12 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -30,13 +30,11 @@ func View(ctx *context_module.Context) { jobIndex := ctx.ParamsInt64("job") ctx.Data["RunIndex"] = runIndex ctx.Data["JobIndex"] = jobIndex + ctx.Data["ActionsURL"] = ctx.Repo.RepoLink + "/actions" - job, _ := getRunJobs(ctx, runIndex, jobIndex) - if ctx.Written() { + if getRunJobs(ctx, runIndex, jobIndex); ctx.Written() { return } - run := job.Run - ctx.Data["Build"] = run ctx.HTML(http.StatusOK, tplViewActions) } diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl index 8b20b890d37ae..0c046711539c6 100644 --- a/templates/repo/actions/view.tmpl +++ b/templates/repo/actions/view.tmpl @@ -2,9 +2,7 @@
    {{template "repo/header" .}} -
    -
    - +
    {{template "base/footer" .}} diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 938a679dd554a..13e529ca2ccaa 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -78,6 +78,7 @@ const sfc = { props: { runIndex: Number, jobIndex: Number, + actionsURL: String, }, data() { @@ -214,7 +215,7 @@ const sfc = { // * stateData: it will be stored into Vue data and used to update the UI state // * logsData: the logs in it will be appended to the UI manually, no touch to Vue data async fetchJobData(reqData) { - const resp = await fetch(``, { + const resp = await fetch(`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -271,8 +272,9 @@ export function initRepositoryActionView() { if (!el) return; const view = createApp(sfc, { - jobIndex: el.getAttribute('data-job-index'), runIndex: el.getAttribute('data-run-index'), + jobIndex: el.getAttribute('data-job-index'), + actionsURL: el.getAttribute('data-actions-url'), }); view.mount(el); } From f5b553802932bc1952b780e6c850509ff29acb81 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 16:58:49 +0800 Subject: [PATCH 378/408] fix: style for log lines --- web_src/js/components/RepoActionView.vue | 2 ++ web_src/less/_actions.less | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 13e529ca2ccaa..28731d2e4f2b7 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -191,12 +191,14 @@ const sfc = { div._jobLogTime = line.t; const lineNumber = document.createElement('div'); + lineNumber.className = 'line-num'; lineNumber.innerText = line.ln; div.appendChild(lineNumber); // TODO: Support displaying time optionally const logMessage = document.createElement('div'); + logMessage.className = 'log-msg'; logMessage.innerHTML = this.ansiToHTML.toHtml(line.m); div.appendChild(logMessage); diff --git a/web_src/less/_actions.less b/web_src/less/_actions.less index 77bae4a923803..1acad06a655e4 100644 --- a/web_src/less/_actions.less +++ b/web_src/less/_actions.less @@ -20,17 +20,17 @@ body > div.full.height { font-family: monospace; .job-log-line { display: flex; - line-num { + .line-num { width: 48px; color: var(--color-grey-light); text-align: right; } - log-time { + .log-time { color: var(--color-grey-light); margin-left: 10px; white-space: nowrap; } - log-msg { + .log-msg { flex: 1; word-break: break-all; white-space: break-spaces; From 2e8aff7cd4fffb7f9865e27db453a0530c1756e1 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:07:35 +0800 Subject: [PATCH 379/408] chore: init ansiToHTML in data() --- web_src/js/components/RepoActionView.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 28731d2e4f2b7..0de0ea7a4d190 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -83,6 +83,8 @@ const sfc = { data() { return { + ansiToHTML: new AnsiToHTML({escapeXML: true}), + // internal state loading: false, currentJobStepsStates: [], @@ -95,10 +97,6 @@ const sfc = { }; }, - created() { - this.ansiToHTML = new AnsiToHTML({escapeXML: true}); - }, - mounted() { // load job data and then auto-reload periodically this.loadJobData(); From 5e898b3299194c63eef0d953a7ca71accd4d1a17 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:14:16 +0800 Subject: [PATCH 380/408] fix: format duration in backend --- routers/web/repo/actions/view.go | 8 ++++---- web_src/js/components/RepoActionView.vue | 23 +---------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 36c653c3c6f12..8be9dcb7f9e73 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -79,9 +79,9 @@ type ViewJob struct { } type ViewJobStep struct { - Summary string `json:"summary"` - Duration float64 `json:"duration"` - Status string `json:"status"` + Summary string `json:"summary"` + Duration string `json:"duration"` + Status string `json:"status"` } type ViewStepLog struct { @@ -154,7 +154,7 @@ func ViewPost(ctx *context_module.Context) { for i, v := range steps { resp.StateData.CurrentJobSteps[i] = ViewJobStep{ Summary: v.Name, - Duration: float64(v.Duration() / time.Second), + Duration: v.Duration().Round(time.Second).String(), Status: v.Status.String(), } } diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 0de0ea7a4d190..f572b0c6cbd25 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -51,7 +51,7 @@ {{ jobStep.summary }} - {{ formatDuration(jobStep.duration) }} + {{ jobStep.duration }}
    @@ -162,27 +162,6 @@ const sfc = { }); }, - formatDuration(d) { - d = Math.round(d); - const unitValues = [60, 60, 24]; - const unitNames = ['s', 'm', 'h', 'd']; - const parts = []; - for (let i = 0; i < unitValues.length; i++) { - parts[i] = d % unitValues[i]; - d = Math.floor(d / unitValues[i]); - } - parts.push(d); - let res = '', resCount = 0; - for (let i = parts.length - 1; i >= 0 && resCount < 2; i--) { - if (parts[i] > 0) { - res += `${parts[i] + unitNames[i]} `; - resCount++; - } - } - if (!res) return '0s'; - return res.substring(0, res.length - 1); - }, - createLogLine(line) { const div = document.createElement('div'); div.classList.add('job-log-line'); From 358d494c05a385705a19608c85858bdd424fd399 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:24:23 +0800 Subject: [PATCH 381/408] fix: i18nCancel --- templates/base/head_script.tmpl | 2 +- web_src/js/components/RepoActionView.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl index c4ac18a86ee5e..2d56d907bcae2 100644 --- a/templates/base/head_script.tmpl +++ b/templates/base/head_script.tmpl @@ -40,7 +40,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly. copy_success: '{{.locale.Tr "copy_success"}}', copy_error: '{{.locale.Tr "copy_error"}}', error_occurred: '{{.locale.Tr "error.occurred"}}', - network_error: '{{.locale.Tr "error.network_error"}}', + cancel: '{{.locale.Tr "cancel"}}', }, }; {{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}} diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index f572b0c6cbd25..598ac7c7a7209 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -23,7 +23,7 @@
    @@ -68,7 +68,7 @@ import {SvgIcon} from '../svg.js'; import {createApp} from 'vue'; import AnsiToHTML from 'ansi-to-html'; -const {csrfToken} = window.config; +const {csrfToken, i18n} = window.config; const sfc = { name: 'RepoActionView', @@ -84,6 +84,7 @@ const sfc = { data() { return { ansiToHTML: new AnsiToHTML({escapeXML: true}), + i18nCancel: i18n.cancel, // internal state loading: false, From 83534ad8b0bc257587dc6e7477b81cffec3af686 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:30:08 +0800 Subject: [PATCH 382/408] chore: rename to fetchJob --- web_src/js/components/RepoActionView.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 598ac7c7a7209..a8452658da532 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -191,17 +191,17 @@ const sfc = { } }, - // the respData has the following fields: + // the requestBody has the following fields: // * stateData: it will be stored into Vue data and used to update the UI state // * logsData: the logs in it will be appended to the UI manually, no touch to Vue data - async fetchJobData(reqData) { + async fetchJob(requestBody) { const resp = await fetch(`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Csrf-Token': csrfToken, }, - body: JSON.stringify(reqData), + body: JSON.stringify(requestBody), }); return await resp.json(); }, @@ -219,7 +219,7 @@ const sfc = { }); const reqData = {stepLogCursors}; - const respData = await this.fetchJobData(reqData); + const respData = await this.fetchJob(reqData); // save the stateData to Vue data, then the UI will be updated for (const [key, value] of Object.entries(respData.stateData)) { From 1072f9926a53ee8805115ec15f580cdb5a929d0d Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:43:37 +0800 Subject: [PATCH 383/408] fix: extract the fetch into a submethod --- web_src/js/components/RepoActionView.vue | 44 ++++++++++-------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index a8452658da532..50686220a21a9 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -142,25 +142,11 @@ const sfc = { }, // rerun a job rerunJob(idx) { - fetch(`${this.runInfo.htmlurl}/jobs/${idx}/rerun`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-Csrf-Token': csrfToken, - }, - body: {}, - }); + this.fetch(`${this.runInfo.htmlurl}/jobs/${idx}/rerun`); }, // cancel a run cancelRun() { - fetch(`${this.runInfo.htmlurl}/cancel`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-Csrf-Token': csrfToken, - }, - body: {}, - }); + this.fetch(`${this.runInfo.htmlurl}/cancel`); }, createLogLine(line) { @@ -195,14 +181,10 @@ const sfc = { // * stateData: it will be stored into Vue data and used to update the UI state // * logsData: the logs in it will be appended to the UI manually, no touch to Vue data async fetchJob(requestBody) { - const resp = await fetch(`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-Csrf-Token': csrfToken, - }, - body: JSON.stringify(requestBody), - }); + const resp = await this.fetch( + `${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, + JSON.stringify(requestBody), + ); return await resp.json(); }, @@ -241,7 +223,19 @@ const sfc = { } finally { this.loading = false; } - } + }, + + fetch(url, body) { + const resp = fetch(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Csrf-Token': csrfToken, + }, + body, + }); + return resp; + }, }, }; From 2e0bf2b532a21fb581b7e34f860f8734d1f4849c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 11 Jan 2023 17:51:22 +0800 Subject: [PATCH 384/408] fix: rename elJobStepLogs --- web_src/js/components/RepoActionView.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 50686220a21a9..df9d708cd762e 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -55,7 +55,7 @@
    -
    +
    @@ -107,12 +107,12 @@ const sfc = { methods: { // get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group` getLogsContainer(idx) { - const el = this.$refs.elJobStepLogs[idx]; + const el = this.$refs.logs[idx]; return el.logsContainer ?? el; }, // begin a log group beginLogGroup(idx) { - const el = this.$refs.elJobStepLogs[idx]; + const el = this.$refs.logs[idx]; const elJobLogGroup = document.createElement('div'); elJobLogGroup.classList.add('job-log-group'); @@ -129,7 +129,7 @@ const sfc = { }, // end a log group endLogGroup(idx) { - const el = this.$refs.elJobStepLogs[idx]; + const el = this.$refs.logs[idx]; el.logsContainer = null; }, From 6e404943fda6f55d8a382db5f8c7ffafa2fed0a8 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 11:10:47 +0800 Subject: [PATCH 385/408] fix: UpdateTaskByState --- models/actions/task.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/actions/task.go b/models/actions/task.go index 19d728f5f459a..7ba3e5e3b2ea0 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -386,7 +386,6 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT return nil, err } - prevStepDone := true for _, step := range task.Steps { var result runnerv1.Result if v, ok := stepStates[step.Index]; ok { @@ -398,10 +397,8 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT } if result != runnerv1.Result_RESULT_UNSPECIFIED { step.Status = Status(result) - prevStepDone = true - } else if prevStepDone { + } else if step.Started != 0 { step.Status = StatusRunning - prevStepDone = false } if _, err := e.ID(step.ID).Update(step); err != nil { return nil, err From 5fb2d7fbe4424484c683d2ba03c0d010f5f76eba Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 12:07:54 +0800 Subject: [PATCH 386/408] feat: improve view page --- routers/web/repo/actions/view.go | 151 +++++++++++------------ web_src/js/components/RepoActionView.vue | 71 +++++++---- 2 files changed, 116 insertions(+), 106 deletions(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 8be9dcb7f9e73..e8fcd596c1f93 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -20,7 +20,6 @@ import ( "code.gitea.io/gitea/modules/web" actions_service "code.gitea.io/gitea/services/actions" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" ) @@ -40,35 +39,30 @@ func View(ctx *context_module.Context) { } type ViewRequest struct { - StepLogCursors []struct { - StepIndex int `json:"stepIndex"` - Cursor int64 `json:"cursor"` - Expanded bool `json:"expanded"` - } `json:"stepLogCursors"` + LogCursors []struct { + Step int `json:"step"` + Cursor int64 `json:"cursor"` + Expanded bool `json:"expanded"` + } `json:"logCursors"` } type ViewResponse struct { - StateData struct { - RunInfo struct { - HTMLURL string `json:"htmlurl"` - Title string `json:"title"` - CanCancel bool `json:"can_cancel"` - } `json:"runInfo"` - AllJobGroups []ViewGroup `json:"allJobGroups"` - CurrentJobInfo struct { - Title string `json:"title"` - Detail string `json:"detail"` - } `json:"currentJobInfo"` - CurrentJobSteps []ViewJobStep `json:"currentJobSteps"` - } `json:"stateData"` - LogsData struct { - StreamingLogs []ViewStepLog `json:"streamingLogs"` - } `json:"logsData"` -} - -type ViewGroup struct { - Summary string `json:"summary"` - Jobs []*ViewJob `json:"jobs"` + State struct { + Run struct { + HTMLURL string `json:"htmlurl"` + Title string `json:"title"` + CanCancel bool `json:"can_cancel"` + Jobs []*ViewJob `json:"jobs"` + } `json:"run"` + CurrentJob struct { + Title string `json:"title"` + Detail string `json:"detail"` + Steps []*ViewJobStep `json:"steps"` + } `json:"currentJob"` + } `json:"state"` + Logs struct { + StepsLog []*ViewStepLog `json:"steps_log"` + } `json:"logs"` } type ViewJob struct { @@ -85,15 +79,15 @@ type ViewJobStep struct { } type ViewStepLog struct { - StepIndex int `json:"stepIndex"` - Cursor int64 `json:"cursor"` - Lines []ViewStepLogLine `json:"lines"` + Step int `json:"step"` + Cursor int64 `json:"cursor"` + Lines []*ViewStepLogLine `json:"lines"` } type ViewStepLogLine struct { - Ln int64 `json:"ln"` - M string `json:"m"` - T float64 `json:"t"` + Index int64 `json:"index"` + Message string `json:"message"` + Timestamp float64 `json:"timestamp"` } func ViewPost(ctx *context_module.Context) { @@ -108,24 +102,18 @@ func ViewPost(ctx *context_module.Context) { run := current.Run resp := &ViewResponse{} - resp.StateData.RunInfo.Title = run.Title - resp.StateData.RunInfo.HTMLURL = run.HTMLURL() - resp.StateData.RunInfo.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions) - respJobs := make([]*ViewJob, len(jobs)) - for i, v := range jobs { - respJobs[i] = &ViewJob{ + resp.State.Run.Title = run.Title + resp.State.Run.HTMLURL = run.HTMLURL() + resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions) + resp.State.Run.Jobs = make([]*ViewJob, 0, len(jobs)) // marshal to '[]' instead fo 'null' in json + for _, v := range jobs { + resp.State.Run.Jobs = append(resp.State.Run.Jobs, &ViewJob{ ID: v.ID, Name: v.Name, Status: v.Status.String(), CanRerun: v.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions), - } - } - - resp.StateData.AllJobGroups = []ViewGroup{ - { - Jobs: respJobs, - }, + }) } var task *actions_model.ActionTask @@ -143,51 +131,54 @@ func ViewPost(ctx *context_module.Context) { } } - resp.StateData.CurrentJobInfo.Title = current.Name - resp.StateData.CurrentJobSteps = make([]ViewJobStep, 0) - resp.LogsData.StreamingLogs = make([]ViewStepLog, 0, len(req.StepLogCursors)) - resp.StateData.CurrentJobInfo.Detail = current.Status.LocaleString(ctx.Locale) + resp.State.CurrentJob.Title = current.Name + resp.State.CurrentJob.Detail = current.Status.LocaleString(ctx.Locale) if task != nil { steps := actions.FullSteps(task) - resp.StateData.CurrentJobSteps = make([]ViewJobStep, len(steps)) - for i, v := range steps { - resp.StateData.CurrentJobSteps[i] = ViewJobStep{ + resp.State.CurrentJob.Steps = make([]*ViewJobStep, 0, len(steps)) // marshal to '[]' instead fo 'null' in json + for _, v := range steps { + resp.State.CurrentJob.Steps = append(resp.State.CurrentJob.Steps, &ViewJobStep{ Summary: v.Name, - Duration: v.Duration().Round(time.Second).String(), + Duration: v.Duration().String(), Status: v.Status.String(), - } + }) } - for _, cursor := range req.StepLogCursors { - if cursor.Expanded { - step := steps[cursor.StepIndex] - var logRows []*runnerv1.LogRow - if cursor.Cursor < step.LogLength || step.LogLength < 0 { - index := step.LogIndex + cursor.Cursor - length := step.LogLength - cursor.Cursor - offset := (*task.LogIndexes)[index] - var err error - logRows, err = actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } + resp.Logs.StepsLog = make([]*ViewStepLog, 0, len(req.LogCursors)) // marshal to '[]' instead fo 'null' in json + for _, cursor := range req.LogCursors { + if !cursor.Expanded { + continue + } + + step := steps[cursor.Step] + + logLines := make([]*ViewStepLogLine, 0) // marshal to '[]' instead fo 'null' in json + if c := cursor.Cursor; c < step.LogLength && c >= 0 { + index := step.LogIndex + c + length := step.LogLength - cursor.Cursor + offset := (*task.LogIndexes)[index] + var err error + logRows, err := actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return } - logLines := make([]ViewStepLogLine, len(logRows)) + for i, row := range logRows { - logLines[i] = ViewStepLogLine{ - Ln: cursor.Cursor + int64(i) + 1, // start at 1 - M: row.Content, - T: float64(row.Time.AsTime().UnixNano()) / float64(time.Second), - } + logLines = append(logLines, &ViewStepLogLine{ + Index: cursor.Cursor + int64(i) + 1, // start at 1 + Message: row.Content, + Timestamp: float64(row.Time.AsTime().UnixNano()) / float64(time.Second), + }) } - resp.LogsData.StreamingLogs = append(resp.LogsData.StreamingLogs, ViewStepLog{ - StepIndex: cursor.StepIndex, - Cursor: cursor.Cursor + int64(len(logLines)), - Lines: logLines, - }) } + + resp.Logs.StepsLog = append(resp.Logs.StepsLog, &ViewStepLog{ + Step: cursor.Step, + Cursor: cursor.Cursor + int64(len(logLines)), + Lines: logLines, + }) } } diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index df9d708cd762e..7de2521341a0d 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -2,14 +2,14 @@
    - {{ runInfo.title }} + {{ run.title }}
    -
    +
    - + @@ -22,7 +22,7 @@
    -
    @@ -31,14 +31,14 @@
    - {{ currentJobInfo.title }} + {{ currentJob.title }}
    - {{ currentJobInfo.detail }} + {{ currentJob.detail }}
    -
    +
    @@ -91,10 +91,30 @@ const sfc = { currentJobStepsStates: [], // provided by backend - runInfo: {}, - allJobGroups: [], - currentJobInfo: {}, - currentJobSteps: [], + run: { + htmlurl: '', + title: '', + can_cancel: false, + jobs: [ + // { + // id: 0, + // name: '', + // status: '', + // can_rerun: false, + // }, + ], + }, + currentJob: { + title: '', + detail: '', + steps: [ + // { + // summary: '', + // duration: '', + // status: '', + // } + ], + }, }; }, @@ -142,28 +162,28 @@ const sfc = { }, // rerun a job rerunJob(idx) { - this.fetch(`${this.runInfo.htmlurl}/jobs/${idx}/rerun`); + this.fetch(`${this.run.htmlurl}/jobs/${idx}/rerun`); }, // cancel a run cancelRun() { - this.fetch(`${this.runInfo.htmlurl}/cancel`); + this.fetch(`${this.run.htmlurl}/cancel`); }, createLogLine(line) { const div = document.createElement('div'); div.classList.add('job-log-line'); - div._jobLogTime = line.t; + div._jobLogTime = line.timestamp; const lineNumber = document.createElement('div'); lineNumber.className = 'line-num'; - lineNumber.innerText = line.ln; + lineNumber.innerText = line.index; div.appendChild(lineNumber); // TODO: Support displaying time optionally const logMessage = document.createElement('div'); logMessage.className = 'log-msg'; - logMessage.innerHTML = this.ansiToHTML.toHtml(line.m); + logMessage.innerHTML = this.ansiToHTML.toHtml(line.message); div.appendChild(logMessage); return div; @@ -193,32 +213,32 @@ const sfc = { try { this.loading = true; - const stepLogCursors = this.currentJobStepsStates.map((it, idx) => { + const logCursors = this.currentJobStepsStates.map((it, idx) => { // cursor is used to indicate the last position of the logs // it's only used by backend, frontend just reads it and passes it back, it and can be any type. // for example: make cursor=null means the first time to fetch logs, cursor=eof means no more logs, etc - return {stepIndex: idx, cursor: it.cursor, expanded: it.expanded}; + return {step: idx, cursor: it.cursor, expanded: it.expanded}; }); - const reqData = {stepLogCursors}; + const reqData = {logCursors}; const respData = await this.fetchJob(reqData); // save the stateData to Vue data, then the UI will be updated - for (const [key, value] of Object.entries(respData.stateData)) { + for (const [key, value] of Object.entries(respData.state)) { this[key] = value; } // sync the currentJobStepsStates to store the job step states - for (let i = 0; i < this.currentJobSteps.length; i++) { + for (let i = 0; i < this.currentJob.steps.length; i++) { if (!this.currentJobStepsStates[i]) { this.currentJobStepsStates[i] = {cursor: null, expanded: false}; } } // append logs to the UI - for (const logs of respData.logsData.streamingLogs) { + for (const logs of respData.logs.steps_log) { // save the cursor, it will be passed to backend next time - this.currentJobStepsStates[logs.stepIndex].cursor = logs.cursor; - this.appendLogs(logs.stepIndex, logs.lines); + this.currentJobStepsStates[logs.step].cursor = logs.cursor; + this.appendLogs(logs.step, logs.lines); } } finally { this.loading = false; @@ -226,7 +246,7 @@ const sfc = { }, fetch(url, body) { - const resp = fetch(url, { + return fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -234,7 +254,6 @@ const sfc = { }, body, }); - return resp; }, }, }; From 87f7874958f149efc7daf9c8326ad5796337d863 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 12:13:12 +0800 Subject: [PATCH 387/408] chore: use slice as LogIndexes --- models/actions/task.go | 12 ++++++------ models/migrations/v1_19/v238.go | 12 ++++++------ routers/api/actions/runner/runner.go | 5 +---- routers/web/repo/actions/view.go | 2 +- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/models/actions/task.go b/models/actions/task.go index 7ba3e5e3b2ea0..5b6206c346425 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -46,12 +46,12 @@ type ActionTask struct { TokenSalt string TokenLastEight string `xorm:"index token_last_eight"` - LogFilename string // file name of log - LogInStorage bool // read log from database or from storage - LogLength int64 // lines count - LogSize int64 // blob size - LogIndexes *LogIndexes `xorm:"LONGBLOB"` // line number to offset - LogExpired bool // files that are too old will be deleted + LogFilename string // file name of log + LogInStorage bool // read log from database or from storage + LogLength int64 // lines count + LogSize int64 // blob size + LogIndexes LogIndexes `xorm:"LONGBLOB"` // line number to offset + LogExpired bool // files that are too old will be deleted Created timeutil.TimeStamp `xorm:"created"` Updated timeutil.TimeStamp `xorm:"updated index"` diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 54a87f06ccef6..4505f86299556 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -117,12 +117,12 @@ func AddActionsTables(x *xorm.Engine) error { TokenSalt string TokenLastEight string `xorm:"index token_last_eight"` - LogFilename string // file name of log - LogInStorage bool // read log from database or from storage - LogLength int64 // lines count - LogSize int64 // blob size - LogIndexes *[]int64 `xorm:"LONGBLOB"` // line number to offset - LogExpired bool // files that are too old will be deleted + LogFilename string // file name of log + LogInStorage bool // read log from database or from storage + LogLength int64 // lines count + LogSize int64 // blob size + LogIndexes []int64 `xorm:"LONGBLOB"` // line number to offset + LogExpired bool // files that are too old will be deleted Created timeutil.TimeStamp `xorm:"created"` Updated timeutil.TimeStamp `xorm:"updated index"` diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 66d004de0e53a..c6effad1c6a1d 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -206,11 +206,8 @@ func (s *Service) UpdateLog( return nil, status.Errorf(codes.Internal, "write logs: %v", err) } task.LogLength += int64(len(rows)) - if task.LogIndexes == nil { - task.LogIndexes = &actions_model.LogIndexes{} - } for _, n := range ns { - *task.LogIndexes = append(*task.LogIndexes, task.LogSize) + task.LogIndexes = append(task.LogIndexes, task.LogSize) task.LogSize += int64(n) } diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index e8fcd596c1f93..6032b6296e59a 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -157,7 +157,7 @@ func ViewPost(ctx *context_module.Context) { if c := cursor.Cursor; c < step.LogLength && c >= 0 { index := step.LogIndex + c length := step.LogLength - cursor.Cursor - offset := (*task.LogIndexes)[index] + offset := task.LogIndexes[index] var err error logRows, err := actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length) if err != nil { From 26925e296a8a8affeaa84734deb8ccf209757aaf Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 13:50:36 +0800 Subject: [PATCH 388/408] chore: fix go-licenses --- assets/go-licenses.json | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 5ada25c572591..15e1011e065f9 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -234,7 +234,6 @@ "path": "github.com/chi-middleware/proxy/LICENSE", "licenseText": "Copyright (c) 2020 Lauris BH\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, - { { "name": "github.com/cloudflare/circl", "path": "github.com/cloudflare/circl/LICENSE", From b71f539f0cc6ba0a67e56f2edd61775e9143678b Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 14:28:39 +0800 Subject: [PATCH 389/408] chore: improve loadJob --- web_src/js/components/RepoActionView.vue | 37 ++++++++++-------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 7de2521341a0d..3fd476b6193ac 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -120,8 +120,8 @@ const sfc = { mounted() { // load job data and then auto-reload periodically - this.loadJobData(); - setInterval(() => this.loadJobData(), 1000); + this.loadJob(); + setInterval(() => this.loadJob(), 1000); }, methods: { @@ -157,7 +157,7 @@ const sfc = { toggleStepLogs(idx) { this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; if (this.currentJobStepsStates[idx].expanded) { - this.loadJobData(); // try to load the data immediately instead of waiting for next timer interval + this.loadJob(); // try to load the data immediately instead of waiting for next timer interval } }, // rerun a job @@ -197,34 +197,29 @@ const sfc = { } }, - // the requestBody has the following fields: - // * stateData: it will be stored into Vue data and used to update the UI state - // * logsData: the logs in it will be appended to the UI manually, no touch to Vue data - async fetchJob(requestBody) { + async fetchJob() { + const logCursors = this.currentJobStepsStates.map((it, idx) => { + // cursor is used to indicate the last position of the logs + // it's only used by backend, frontend just reads it and passes it back, it and can be any type. + // for example: make cursor=null means the first time to fetch logs, cursor=eof means no more logs, etc + return {step: idx, cursor: it.cursor, expanded: it.expanded}; + }); const resp = await this.fetch( `${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, - JSON.stringify(requestBody), + JSON.stringify({logCursors}), ); return await resp.json(); }, - async loadJobData() { + async loadJob() { if (this.loading) return; try { this.loading = true; - const logCursors = this.currentJobStepsStates.map((it, idx) => { - // cursor is used to indicate the last position of the logs - // it's only used by backend, frontend just reads it and passes it back, it and can be any type. - // for example: make cursor=null means the first time to fetch logs, cursor=eof means no more logs, etc - return {step: idx, cursor: it.cursor, expanded: it.expanded}; - }); - const reqData = {logCursors}; - - const respData = await this.fetchJob(reqData); + const response = await this.fetchJob(); - // save the stateData to Vue data, then the UI will be updated - for (const [key, value] of Object.entries(respData.state)) { + // save the state to Vue data, then the UI will be updated + for (const [key, value] of Object.entries(response.state)) { this[key] = value; } @@ -235,7 +230,7 @@ const sfc = { } } // append logs to the UI - for (const logs of respData.logs.steps_log) { + for (const logs of response.logs.steps_log) { // save the cursor, it will be passed to backend next time this.currentJobStepsStates[logs.step].cursor = logs.cursor; this.appendLogs(logs.step, logs.lines); From d5e0ee58733a7e274e30a716d2d87e39f73ea579 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 14:39:23 +0800 Subject: [PATCH 390/408] fix: var names --- routers/web/repo/actions/view.go | 6 +++--- web_src/js/components/RepoActionView.vue | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 6032b6296e59a..dbbe961de9e28 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -51,7 +51,7 @@ type ViewResponse struct { Run struct { HTMLURL string `json:"htmlurl"` Title string `json:"title"` - CanCancel bool `json:"can_cancel"` + CanCancel bool `json:"canCancel"` Jobs []*ViewJob `json:"jobs"` } `json:"run"` CurrentJob struct { @@ -61,7 +61,7 @@ type ViewResponse struct { } `json:"currentJob"` } `json:"state"` Logs struct { - StepsLog []*ViewStepLog `json:"steps_log"` + StepsLog []*ViewStepLog `json:"stepsLog"` } `json:"logs"` } @@ -69,7 +69,7 @@ type ViewJob struct { ID int64 `json:"id"` Name string `json:"name"` Status string `json:"status"` - CanRerun bool `json:"can_rerun"` + CanRerun bool `json:"canRerun"` } type ViewJobStep struct { diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 3fd476b6193ac..6eddf550c1467 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -17,12 +17,12 @@ {{ job.name }} -
    -
    @@ -94,13 +94,13 @@ const sfc = { run: { htmlurl: '', title: '', - can_cancel: false, + canCancel: false, jobs: [ // { // id: 0, // name: '', // status: '', - // can_rerun: false, + // canRerun: false, // }, ], }, @@ -219,9 +219,8 @@ const sfc = { const response = await this.fetchJob(); // save the state to Vue data, then the UI will be updated - for (const [key, value] of Object.entries(response.state)) { - this[key] = value; - } + this.run = response.state.run; + this.currentJob = response.state.currentJob; // sync the currentJobStepsStates to store the job step states for (let i = 0; i < this.currentJob.steps.length; i++) { @@ -230,7 +229,7 @@ const sfc = { } } // append logs to the UI - for (const logs of response.logs.steps_log) { + for (const logs of response.logs.stepsLog) { // save the cursor, it will be passed to backend next time this.currentJobStepsStates[logs.step].cursor = logs.cursor; this.appendLogs(logs.step, logs.lines); From ec4f6460e1b0b9d28acae65ad745b36f7b9a772f Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 15:19:26 +0800 Subject: [PATCH 391/408] chore: stop interval --- routers/web/repo/actions/view.go | 2 ++ web_src/js/components/RepoActionView.vue | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index dbbe961de9e28..3da6e43a1c57e 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -52,6 +52,7 @@ type ViewResponse struct { HTMLURL string `json:"htmlurl"` Title string `json:"title"` CanCancel bool `json:"canCancel"` + Done bool `json:"done"` Jobs []*ViewJob `json:"jobs"` } `json:"run"` CurrentJob struct { @@ -106,6 +107,7 @@ func ViewPost(ctx *context_module.Context) { resp.State.Run.Title = run.Title resp.State.Run.HTMLURL = run.HTMLURL() resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions) + resp.State.Run.Done = run.Status.IsDone() resp.State.Run.Jobs = make([]*ViewJob, 0, len(jobs)) // marshal to '[]' instead fo 'null' in json for _, v := range jobs { resp.State.Run.Jobs = append(resp.State.Run.Jobs, &ViewJob{ diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 6eddf550c1467..a96302d73c193 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -88,6 +88,7 @@ const sfc = { // internal state loading: false, + intervalID: null, currentJobStepsStates: [], // provided by backend @@ -95,6 +96,7 @@ const sfc = { htmlurl: '', title: '', canCancel: false, + done: false, jobs: [ // { // id: 0, @@ -121,7 +123,7 @@ const sfc = { mounted() { // load job data and then auto-reload periodically this.loadJob(); - setInterval(() => this.loadJob(), 1000); + this.intervalID = setInterval(this.loadJob, 1000); }, methods: { @@ -234,6 +236,11 @@ const sfc = { this.currentJobStepsStates[logs.step].cursor = logs.cursor; this.appendLogs(logs.step, logs.lines); } + + if (this.run.done && this.intervalID) { + clearInterval(this.intervalID); + this.intervalID = null; + } } finally { this.loading = false; } From 11fec3501e363bf3f7b0e0d29723cfbd93d3616a Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 15:40:34 +0800 Subject: [PATCH 392/408] Revert "chore: logsContainer" This reverts commit 563d798aced1fcdce5a5109f4e7aed1ec200cbf0. --- web_src/js/components/RepoActionView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index a96302d73c193..13de148d56a2c 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -130,7 +130,7 @@ const sfc = { // get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group` getLogsContainer(idx) { const el = this.$refs.logs[idx]; - return el.logsContainer ?? el; + return el._stepLogsActiveContainer ?? el; }, // begin a log group beginLogGroup(idx) { @@ -147,12 +147,12 @@ const sfc = { elJobLogGroup.appendChild(elJobLogGroupSummary); elJobLogGroup.appendChild(elJobLogList); - el.logsContainer = elJobLogList; + el._stepLogsActiveContainer = elJobLogList; }, // end a log group endLogGroup(idx) { const el = this.$refs.logs[idx]; - el.logsContainer = null; + el._stepLogsActiveContainer = null; }, // show/hide the step logs for a step From 4c0cc4608d57775cfd5c4faf80cf84fc65f14e87 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 15:44:59 +0800 Subject: [PATCH 393/408] fix: props type --- web_src/js/components/RepoActionView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 13de148d56a2c..47f472140f10d 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -76,8 +76,8 @@ const sfc = { SvgIcon, }, props: { - runIndex: Number, - jobIndex: Number, + runIndex: String, + jobIndex: String, actionsURL: String, }, From 011e59ef5108468efafb8b11589c52a3282f16bf Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 16:04:50 +0800 Subject: [PATCH 394/408] chore: improve runnr list ui --- templates/shared/actions/runner_list.tmpl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 2b7866325e67d..ea91be80c807d 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -62,17 +62,10 @@ {{.StatusLocaleName $.locale}} - {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - - {{template "shared/actions/runner_id" .ID}} - {{.Name}} - - {{else}}

    {{template "shared/actions/runner_id" .ID}} {{.Name}}

    - {{end}} {{.OwnType}} From 1f2b7064c4e3e456218806e4e1537e8790c503ce Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 16:07:52 +0800 Subject: [PATCH 395/408] fix: remove unnecessary delay --- routers/api/actions/runner/runner.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index c6effad1c6a1d..7dbab9da0a2b9 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -7,7 +7,6 @@ import ( "context" "errors" "net/http" - "time" actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/modules/actions" @@ -108,17 +107,6 @@ func (s *Service) FetchTask( task = t } - // avoid crazy retry - if task == nil { - duration := 2 * time.Second - if deadline, ok := ctx.Deadline(); ok { - if d := time.Until(deadline) - time.Second; d < duration { - duration = d - } - } - time.Sleep(duration) - } - res := connect.NewResponse(&runnerv1.FetchTaskResponse{ Task: task, }) From 7cc2dfc0be8a84e0bcbc956a4b39aff75717e1d8 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 16:53:15 +0800 Subject: [PATCH 396/408] feat: improve rerun button ui --- web_src/js/components/RepoActionView.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 47f472140f10d..55164311ef06e 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -325,7 +325,12 @@ export function initRepositoryActionView() { float: right; border: none; background-color: transparent; - outline: none + outline: none; + cursor: pointer; + transition:transform 0.2s; + }; + button.job-brief-rerun:hover{ + transform:scale(130%); }; } a.job-brief-item:hover { From 1bf2441e4931c1575771742b1250aa5c9a5b234c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 17:07:55 +0800 Subject: [PATCH 397/408] chore: update go-licenses --- assets/go-licenses.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index b267695ee09ca..57bb014fa10a1 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -854,6 +854,11 @@ "path": "github.com/sirupsen/logrus/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Simon Eskildsen\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, + { + "name": "github.com/skeema/knownhosts", + "path": "github.com/skeema/knownhosts/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright {yyyy} {name of copyright owner}\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, { "name": "github.com/ssor/bom", "path": "github.com/ssor/bom/LICENSE", From c664e5202de21593b04009a1f6e044445795775c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 12 Jan 2023 17:10:29 +0800 Subject: [PATCH 398/408] chore: no need to upgrade x/tools --- go.mod | 2 +- go.sum | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 427bbb5cd9691..eee07d4c036a6 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( golang.org/x/oauth2 v0.3.0 golang.org/x/sys v0.3.0 golang.org/x/text v0.5.0 - golang.org/x/tools v0.2.0 + golang.org/x/tools v0.1.12 google.golang.org/grpc v1.47.0 google.golang.org/protobuf v1.28.1 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df diff --git a/go.sum b/go.sum index 88614b85e066f..d1c6be717fc12 100644 --- a/go.sum +++ b/go.sum @@ -1684,9 +1684,8 @@ 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/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= 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= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 8b626db06f05eeeea0d2ff704cfc09c99ff7dd9d Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 13 Jan 2023 13:56:46 +0800 Subject: [PATCH 399/408] fix: marshal empty slice to [] in json --- routers/web/repo/actions/view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 3da6e43a1c57e..e83494f64a592 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -135,10 +135,11 @@ func ViewPost(ctx *context_module.Context) { resp.State.CurrentJob.Title = current.Name resp.State.CurrentJob.Detail = current.Status.LocaleString(ctx.Locale) + resp.State.CurrentJob.Steps = make([]*ViewJobStep, 0) // marshal to '[]' instead fo 'null' in json + resp.Logs.StepsLog = make([]*ViewStepLog, 0) // marshal to '[]' instead fo 'null' in json if task != nil { steps := actions.FullSteps(task) - resp.State.CurrentJob.Steps = make([]*ViewJobStep, 0, len(steps)) // marshal to '[]' instead fo 'null' in json for _, v := range steps { resp.State.CurrentJob.Steps = append(resp.State.CurrentJob.Steps, &ViewJobStep{ Summary: v.Name, @@ -147,7 +148,6 @@ func ViewPost(ctx *context_module.Context) { }) } - resp.Logs.StepsLog = make([]*ViewStepLog, 0, len(req.LogCursors)) // marshal to '[]' instead fo 'null' in json for _, cursor := range req.LogCursors { if !cursor.Expanded { continue From 98107ef443fd4d1f668241052cc917efcc9a81cc Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 11:22:15 +0800 Subject: [PATCH 400/408] chore: format code --- models/migrations/v1_19/v240.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index ac9fc75331938..4505f86299556 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -174,4 +174,3 @@ func AddActionsTables(x *xorm.Engine) error { new(dbfsData), ) } - From 39b55ded50808aa7d2172acaee3f41623a4e365b Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 11:25:00 +0800 Subject: [PATCH 401/408] Update options/locale/locale_en-US.ini Co-authored-by: delvh --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7ef077d7ece45..81b71374d3cda 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3270,7 +3270,7 @@ runners.labels = Labels runners.last_online = Last Online Time runners.agent_labels = Agent Labels runners.custom_labels = Custom Labels -runners.custom_labels_helper = Custom labels are labels that are added manually by an administrator. A comma separates labels, whitespace at the start and end of each label are ignored. +runners.custom_labels_helper = Custom labels are labels that are added manually by an administrator. A comma separates labels, whitespace at the start and end of each label is ignored. runners.runner_title = Runner runners.task_list = Recent tasks on this runner runners.task_list.run = Run From 011e32090eb2262af5e5bfb4c8e7cab3132690bc Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 11:55:55 +0800 Subject: [PATCH 402/408] fix: fix id style --- options/locale/locale_en-US.ini | 1 + templates/shared/actions/runner_edit.tmpl | 4 ++-- templates/shared/actions/runner_id.tmpl | 1 - templates/shared/actions/runner_list.tmpl | 11 ++++------- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 templates/shared/actions/runner_id.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 81b71374d3cda..a794f8b3e4432 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3264,6 +3264,7 @@ runners.new = Create new Runner runners.new_notice = How to start a runner runners.status = Status runners.id = ID +runners.name = Name runners.owner_type = Type runners.description = Description runners.labels = Labels diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index 584c3f4d5568b..5cb65eb0e47b1 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -1,7 +1,7 @@
    {{template "base/alert" .}}

    - {{.locale.Tr "actions.runners.runner_title"}} {{template "shared/actions/runner_id" .Runner.ID}} {{.Runner.Name}} + {{.locale.Tr "actions.runners.runner_title"}} {{.Runner.ID}} {{.Runner.Name}}

    @@ -69,7 +69,7 @@ {{range .Tasks}} - {{template "shared/actions/runner_id" .ID}} + {{.ID}} {{.Status.LocaleString $.locale}} {{.GetRepoName}} diff --git a/templates/shared/actions/runner_id.tmpl b/templates/shared/actions/runner_id.tmpl deleted file mode 100644 index be38fadcc9f57..0000000000000 --- a/templates/shared/actions/runner_id.tmpl +++ /dev/null @@ -1 +0,0 @@ -#{{.}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index ea91be80c807d..e47eeafb06250 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -48,7 +48,8 @@ {{.locale.Tr "actions.runners.status"}} {{.locale.Tr "actions.runners.id"}} - {{.locale.Tr "actions.runners.owner_type"}} + {{.locale.Tr "actions.runners.name"}} + {{.locale.Tr "actions.runners.owner_type"}} {{.locale.Tr "actions.runners.labels"}} {{.locale.Tr "actions.runners.last_online"}} @@ -61,12 +62,8 @@ {{.StatusLocaleName $.locale}} - -

    - {{template "shared/actions/runner_id" .ID}} - {{.Name}} -

    - + {{.ID}} +

    {{.Name}}

    {{.OwnType}} {{range .AllLabels}}{{.}}{{end}} From faad49e211b4a71031e48dde8a4bb607b1fd3de3 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 11:58:53 +0800 Subject: [PATCH 403/408] fix: number color --- templates/repo/header.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index bf1c66e57888e..29ae8d2840a63 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -187,7 +187,7 @@ {{svg "octicon-play"}} {{.locale.Tr "actions.actions"}} {{if .Repository.NumOpenActionRuns}} - {{CountFmt .Repository.NumOpenActionRuns}} + {{CountFmt .Repository.NumOpenActionRuns}} {{end}} {{end}} From 50300552ffbc76b2cba402a954124abd64281e98 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 14:33:40 +0800 Subject: [PATCH 404/408] Revert "fix: i18nCancel" This reverts commit 358d494c05a385705a19608c85858bdd424fd399. --- templates/base/head_script.tmpl | 2 +- web_src/js/components/RepoActionView.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl index 2d56d907bcae2..c4ac18a86ee5e 100644 --- a/templates/base/head_script.tmpl +++ b/templates/base/head_script.tmpl @@ -40,7 +40,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly. copy_success: '{{.locale.Tr "copy_success"}}', copy_error: '{{.locale.Tr "copy_error"}}', error_occurred: '{{.locale.Tr "error.occurred"}}', - cancel: '{{.locale.Tr "cancel"}}', + network_error: '{{.locale.Tr "error.network_error"}}', }, }; {{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}} diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 55164311ef06e..f4f9fc6b1fa08 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -23,7 +23,7 @@
    @@ -68,7 +68,7 @@ import {SvgIcon} from '../svg.js'; import {createApp} from 'vue'; import AnsiToHTML from 'ansi-to-html'; -const {csrfToken, i18n} = window.config; +const {csrfToken} = window.config; const sfc = { name: 'RepoActionView', @@ -84,7 +84,6 @@ const sfc = { data() { return { ansiToHTML: new AnsiToHTML({escapeXML: true}), - i18nCancel: i18n.cancel, // internal state loading: false, From 49c49e771e5ce59d61d00d5cc4b5168acfa7579c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 14:35:07 +0800 Subject: [PATCH 405/408] fix: use cancel icon --- web_src/js/components/RepoActionView.vue | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index f4f9fc6b1fa08..1bbbba91cacc5 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -3,6 +3,9 @@
    {{ run.title }} +
    @@ -22,9 +25,6 @@
    -
    @@ -287,7 +287,18 @@ export function initRepositoryActionView() { // action view header .action-view-header { - margin: 0 0 20px 20px; + margin: 0 20px 20px 20px; + button.run_cancel { + border: none; + color: var(--color-red); + background-color: transparent; + outline: none; + cursor: pointer; + transition:transform 0.2s; + }; + button.run_cancel:hover{ + transform:scale(130%); + }; } .action-info-summary { From 3b1fa7911fafeb6be85a0dbb51deaed0380b68ec Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 15:35:47 +0800 Subject: [PATCH 406/408] chore: lint code --- web_src/js/components/RepoActionView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 1bbbba91cacc5..673e5b0d8cf98 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -4,7 +4,7 @@
    {{ run.title }}
    From c70da27b939cec28835b9ecd7883ca76d0afbdf9 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 18 Jan 2023 16:18:58 +0800 Subject: [PATCH 407/408] fix: lint code --- templates/shared/actions/runner_list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index e47eeafb06250..eabddbb30cdce 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -48,8 +48,8 @@ {{.locale.Tr "actions.runners.status"}} {{.locale.Tr "actions.runners.id"}} - {{.locale.Tr "actions.runners.name"}} - {{.locale.Tr "actions.runners.owner_type"}} + {{.locale.Tr "actions.runners.name"}} + {{.locale.Tr "actions.runners.owner_type"}} {{.locale.Tr "actions.runners.labels"}} {{.locale.Tr "actions.runners.last_online"}} From dd319a987c490598f0eb584e1fa95ea9f5b8d207 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 28 Jan 2023 14:15:24 +0800 Subject: [PATCH 408/408] chore: follow new NotifyIssueChangeStatus --- services/actions/notifier.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 58224535a7a77..0ed69097dce9f 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -57,7 +57,7 @@ func (n *actionsNotifier) NotifyNewIssue(ctx context.Context, issue *issues_mode } // NotifyIssueChangeStatus notifies close or reopen issue to notifiers -func (n *actionsNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, _ *issues_model.Comment, isClosed bool) { +func (n *actionsNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, _ *issues_model.Comment, isClosed bool) { ctx = withMethod(ctx, "NotifyIssueChangeStatus") mode, _ := access_model.AccessLevel(ctx, issue.Poster, issue.Repo) if issue.IsPull { @@ -71,6 +71,7 @@ func (n *actionsNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *use PullRequest: convert.ToAPIPullRequest(db.DefaultContext, issue.PullRequest, nil), Repository: convert.ToRepo(ctx, issue.Repo, mode), Sender: convert.ToUser(doer, nil), + CommitID: commitID, } if isClosed { apiPullRequest.Action = api.HookIssueClosed