From 81308eeb939890c6c2f1e4b8f6dcc13bb419de43 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Tue, 8 Aug 2023 14:15:19 +0200 Subject: [PATCH] feat: with main loop Signed-off-by: kjuulh --- .gitignore | 1 + cmd/contractor/main.go | 669 ++++++++++++++++++++++++++++++++++++++--- go.mod | 26 +- go.sum | 63 +++- main.go | 6 + 5 files changed, 702 insertions(+), 63 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/cmd/contractor/main.go b/cmd/contractor/main.go index 6e559ee..5ad8051 100644 --- a/cmd/contractor/main.go +++ b/cmd/contractor/main.go @@ -2,14 +2,22 @@ package contractor import ( "bytes" + "context" "encoding/json" + "errors" "fmt" + "html" "io" "log" "net/http" + "os" "strings" + "sync" + "time" + "dagger.io/dagger" "github.com/gin-gonic/gin" + "github.com/google/uuid" "github.com/spf13/cobra" ) @@ -36,57 +44,16 @@ func installCmd() *cobra.Command { Use: "install", Run: func(cmd *cobra.Command, args []string) { - client := http.DefaultClient - createHookOptions := createHook{ - Active: true, - AuthorizationHeader: "", - BranchFilter: "*", - Config: map[string]string{ - "url": "http://10.0.9.1:8080/gitea/webhook", - "content_type": "json", - }, - Events: []string{ - "pull_request_comment", - }, - Type: "gitea", - } - - body, err := json.Marshal(createHookOptions) - if err != nil { - log.Println("failed to marshal request body: %w", err) - return - } - bodyReader := bytes.NewReader(body) - - request, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/repos/%s/%s/hooks", strings.TrimSuffix(url, "/"), owner, repository), bodyReader) - if err != nil { - log.Println("failed to form create hook request: %s", err.Error()) - return - } - request.Header.Add("Authorization", fmt.Sprintf("token %s", token)) - request.Header.Add("Content-Type", "application/json") - - resp, err := client.Do(request) - if err != nil { - log.Printf("failed to register hook: %s", err.Error()) - return - } - - if resp.StatusCode > 299 { - log.Printf("failed to register with status code: %d", resp.StatusCode) - respBody, err := io.ReadAll(resp.Body) - if err != nil { - log.Printf("failed to read body of error response: %s", err.Error()) - } else { - log.Printf("request body: %s", string(respBody)) - } + if err := NewGiteaClient(&url, &token).CreateWebhook(owner, repository); err != nil { + log.Printf("failed to add create webhook: %s", err.Error()) } }, } cmd.Flags().StringVarP(&owner, "owner", "o", "", "the owner for which the repository belongs") cmd.Flags().StringVarP(&repository, "repository", "p", "", "the repository to install") - cmd.Flags().StringVar(&serverType, "server-type", "gitea", "the server type to use [gitea, github]") + cmd.Flags(). + StringVar(&serverType, "server-type", "gitea", "the server type to use [gitea, github]") cmd.MarkFlagRequired("owner") cmd.MarkFlagRequired("repository") @@ -102,6 +69,78 @@ func serverCmd() *cobra.Command { token string ) + giteaClient := NewGiteaClient(&url, &token) + renovateClient := NewRenovateClient("") + queue := NewGoQueue() + queue.Subscribe( + MessageTypeRefreshRepository, + func(ctx context.Context, item *QueueMessage) error { + log.Printf("handling message: %s, content: %s", item.Type, item.Content) + return nil + }, + ) + queue.Subscribe( + MessageTypeRefreshRepositoryDone, + func(ctx context.Context, item *QueueMessage) error { + log.Printf("handling message: %s, content: %s", item.Type, item.Content) + return nil + }, + ) + queue.Subscribe( + MessageTypeRefreshRepository, + func(ctx context.Context, item *QueueMessage) error { + var request RefreshRepositoryRequest + if err := json.Unmarshal([]byte(item.Content), &request); err != nil { + log.Printf("failed to unmarshal request body: %s", err.Error()) + return err + } + + cancelCtx, cancel := context.WithTimeout(ctx, time.Second*30) + defer cancel() + + if err := renovateClient.RefreshRepository(cancelCtx, request.Owner, request.Repository); err != nil { + queue.Insert(MessageTypeRefreshRepositoryDone, RefreshDoneRepositoryRequest{ + Repository: request.Repository, + Owner: request.Owner, + PullRequestID: request.PullRequestID, + CommentID: request.CommentID, + CommentBody: request.CommentBody, + ReportProgress: request.ReportProgress, + Status: "failed", + Error: err.Error(), + }) + + return err + } + + queue.Insert(MessageTypeRefreshRepositoryDone, RefreshDoneRepositoryRequest{ + Repository: request.Repository, + Owner: request.Owner, + PullRequestID: request.PullRequestID, + CommentID: request.CommentID, + CommentBody: request.CommentBody, + ReportProgress: request.ReportProgress, + Status: "done", + Error: "", + }) + + return nil + }, + ) + + queue.Subscribe( + MessageTypeRefreshRepositoryDone, + func(ctx context.Context, item *QueueMessage) error { + var doneRequest RefreshDoneRepositoryRequest + if err := json.Unmarshal([]byte(item.Content), &doneRequest); err != nil { + log.Printf("failed to unmarshal request body: %s", err.Error()) + return err + } + + return giteaClient.EditComment(ctx, &doneRequest) + }, + ) + cmd := &cobra.Command{ Use: "server", } @@ -109,12 +148,42 @@ func serverCmd() *cobra.Command { cmd.PersistentFlags().StringVar(&url, "url", "", "the api url of the server") cmd.PersistentFlags().StringVar(&token, "token", "", "the token to authenticate with") - cmd.AddCommand(serverServeCmd()) + cmd.AddCommand(serverServeCmd(&url, &token, queue, giteaClient)) return cmd } -func serverServeCmd() *cobra.Command { +const ( + MessageTypeRefreshRepository = "refresh_repository" + MessageTypeRefreshRepositoryDone = "refresh_repository_done" +) + +type RefreshRepositoryRequest struct { + Repository string `json:"repository"` + Owner string `json:"owner"` + PullRequestID int `json:"pullRequestId"` + CommentID int `json:"commentId"` + CommentBody string `json:"commentBody"` + ReportProgress bool `json:"reportProgress"` +} + +type RefreshDoneRepositoryRequest struct { + Repository string `json:"repository"` + Owner string `json:"owner"` + PullRequestID int `json:"pullRequestId"` + CommentID int `json:"commentId"` + CommentBody string `json:"commentBody"` + ReportProgress bool `json:"reportProgress"` + Status string `json:"status"` + Error string `json:"error"` +} + +func serverServeCmd( + url *string, + token *string, + queue *GoQueue, + giteaClient *GiteaClient, +) *cobra.Command { cmd := &cobra.Command{ Use: "serve", Run: func(cmd *cobra.Command, args []string) { @@ -149,9 +218,41 @@ func serverServeCmd() *cobra.Command { command, ok := validateBotComment(request.Comment.Body) if ok { log.Printf("got webhook request: contractor %s", command) - } - ctx.Status(204) + bot := NewBotHandler(giteaClient) + output, err := bot.Handle(command) + if err != nil { + log.Printf("failed to run bot handler with error: %s", err.Error()) + } + + parts := strings.Split(request.Repository.FullName, "/") + + comment, err := bot.AppendComment( + parts[0], + parts[1], + request.Issue.Number, + output, + ) + if err != nil { + ctx.AbortWithError(500, err) + return + } + + if err := queue.Insert(MessageTypeRefreshRepository, RefreshRepositoryRequest{ + Repository: parts[1], + Owner: parts[0], + PullRequestID: request.Issue.Number, + CommentID: comment.ID, + CommentBody: comment.Body, + ReportProgress: true, + }); err != nil { + ctx.AbortWithError(500, err) + return + } + + ctx.Status(204) + + } }) } @@ -177,3 +278,473 @@ func RootCmd() *cobra.Command { return cmd } + +type BotHandler struct { + giteaClient *GiteaClient +} + +func NewBotHandler(gitea *GiteaClient) *BotHandler { + return &BotHandler{giteaClient: gitea} +} + +func (b *BotHandler) Handle(input string) (output string, err error) { + innerHandle := func(input string) (output string, err error) { + if strings.HasPrefix(input, "help") { + return b.Help(), nil + } + + if strings.HasPrefix(input, "refresh") { + return ` +

Contractor triggered renovate refresh on this repository

+This comment will be updated with status + + + +`, nil + } + + return b.Help(), errors.New("could not recognize command") + } + + output, err = innerHandle(input) + output = fmt.Sprintf( + "%s\nThis comment was generated by Contractor", + output, + ) + return output, err +} + +func (b *BotHandler) Help() string { + return `
+

/contractor [command]

 + +Commands: + +* /contractor help + * triggers the help menu +* /contractor refresh + * triggers renovate to refresh the current pull request +
` +} + +type AddCommentResponse struct { + Body string `json:"body"` + ID int `json:"id"` +} + +func (b *BotHandler) AppendComment( + owner string, + repository string, + pullRequest int, + comment string, +) (*AddCommentResponse, error) { + return b.giteaClient.AddComment(owner, repository, pullRequest, comment) +} + +type QueueMessage struct { + Type string `json:"type"` + Content string `json:"content"` +} + +type GoQueue struct { + queue []*QueueMessage + queueLock sync.Mutex + subscribers map[string]map[string]func(ctx context.Context, item *QueueMessage) error + subscribersLock sync.RWMutex +} + +func NewGoQueue() *GoQueue { + return &GoQueue{ + queue: make([]*QueueMessage, 0), + subscribers: make( + map[string]map[string]func(ctx context.Context, item *QueueMessage) error, + ), + } +} + +func (gq *GoQueue) Subscribe( + messageType string, + callback func(ctx context.Context, item *QueueMessage) error, +) string { + gq.subscribersLock.Lock() + defer gq.subscribersLock.Unlock() + + uid, err := uuid.NewUUID() + if err != nil { + panic(err) + } + id := uid.String() + + _, ok := gq.subscribers[messageType] + if !ok { + messageTypeSubscribers := make( + map[string]func(ctx context.Context, item *QueueMessage) error, + ) + messageTypeSubscribers[id] = callback + gq.subscribers[messageType] = messageTypeSubscribers + } else { + gq.subscribers[messageType][id] = callback + } + + return id +} + +func (gq *GoQueue) Unsubscribe(messageType string, id string) { + gq.subscribersLock.Lock() + defer gq.subscribersLock.Unlock() + _, ok := gq.subscribers[messageType] + if !ok { + // No work to be done + return + } else { + delete(gq.subscribers[messageType], id) + } +} + +func (gq *GoQueue) Insert(messageType string, content any) error { + gq.queueLock.Lock() + defer gq.queueLock.Unlock() + + contents, err := json.Marshal(content) + if err != nil { + return err + } + + gq.queue = append(gq.queue, &QueueMessage{ + Type: messageType, + Content: string(contents), + }) + + go func() { + gq.handle(context.Background()) + }() + + return nil +} + +func (gq *GoQueue) handle(ctx context.Context) { + gq.queueLock.Lock() + defer gq.queueLock.Unlock() + + for { + if len(gq.queue) == 0 { + return + } + + item := gq.queue[0] + gq.queue = gq.queue[1:] + + gq.subscribersLock.RLock() + defer gq.subscribersLock.RUnlock() + + for id, callback := range gq.subscribers[item.Type] { + log.Printf("sending message to %s", id) + go callback(ctx, item) + } + } +} + +type GiteaClient struct { + url *string + token *string + + client *http.Client +} + +func NewGiteaClient(url, token *string) *GiteaClient { + return &GiteaClient{ + url: url, + token: token, + client: http.DefaultClient, + } +} + +func (gc *GiteaClient) EditComment( + ctx context.Context, + doneRequest *RefreshDoneRepositoryRequest, +) error { + commentBody := html.UnescapeString(doneRequest.CommentBody) + startCmnt := "" + startIdx := strings.Index(commentBody, startCmnt) + endIdx := strings.Index(commentBody, "") + if startIdx >= 0 && endIdx >= 0 { + log.Println("found comment to replace") + + var content string + + if doneRequest.Error != "" { + content = fmt.Sprintf("
ERROR: %s

", doneRequest.Error) + } + if doneRequest.Status != "" { + content = fmt.Sprintf("

%s

", doneRequest.Status) + } + + doneRequest.CommentBody = fmt.Sprintf( + "%s
%s

%s", + commentBody[:startIdx+len(startCmnt)], + content, + commentBody[endIdx:], + ) + } + + editComment := struct { + Body string `json:"body"` + }{ + Body: doneRequest.CommentBody, + } + + body, err := json.Marshal(editComment) + if err != nil { + log.Println("failed to marshal request body: %w", err) + return err + } + bodyReader := bytes.NewReader(body) + + request, err := http.NewRequest( + http.MethodPatch, + fmt.Sprintf( + "%s/repos/%s/%s/issues/comments/%d", + strings.TrimSuffix(*gc.url, "/"), + doneRequest.Owner, + doneRequest.Repository, + doneRequest.CommentID, + ), + bodyReader, + ) + if err != nil { + log.Printf("failed to form update comment request: %s", err.Error()) + return err + } + request.Header.Add("Authorization", fmt.Sprintf("token %s", *gc.token)) + request.Header.Add("Content-Type", "application/json") + + resp, err := gc.client.Do(request) + if err != nil { + log.Printf("failed to update comment: %s", err.Error()) + return err + } + + if resp.StatusCode > 299 { + log.Printf("failed to update comment with status code: %d", resp.StatusCode) + respBody, err := io.ReadAll(resp.Body) + if err != nil { + log.Printf("failed to read body of error response: %s", err.Error()) + } else { + log.Printf("request body: %s", string(respBody)) + } + } + + return nil +} + +func (gc *GiteaClient) CreateWebhook(owner, repository string) error { + createHookOptions := createHook{ + Active: true, + AuthorizationHeader: "", + BranchFilter: "*", + Config: map[string]string{ + "url": "http://10.0.9.1:8080/gitea/webhook", + "content_type": "json", + }, + Events: []string{ + "pull_request_comment", + }, + Type: "gitea", + } + + body, err := json.Marshal(createHookOptions) + if err != nil { + log.Println("failed to marshal request body: %w", err) + return err + } + bodyReader := bytes.NewReader(body) + request, err := http.NewRequest( + http.MethodPost, + fmt.Sprintf( + "%s/repos/%s/%s/hooks", + strings.TrimSuffix(*gc.url, "/"), + owner, + repository, + ), + bodyReader, + ) + if err != nil { + log.Printf("failed to form create hook request: %s", err.Error()) + return err + } + request.Header.Add("Authorization", fmt.Sprintf("token %s", *gc.token)) + request.Header.Add("Content-Type", "application/json") + + resp, err := gc.client.Do(request) + if err != nil { + log.Printf("failed to register hook: %s", err.Error()) + return err + } + + if resp.StatusCode > 299 { + log.Printf("failed to register with status code: %d", resp.StatusCode) + respBody, err := io.ReadAll(resp.Body) + if err != nil { + log.Printf("failed to read body of error response: %s", err.Error()) + } else { + log.Printf("request body: %s", string(respBody)) + } + } + + return nil +} + +func (gc *GiteaClient) AddComment( + owner, repository string, + pullRequest int, + comment string, +) (*AddCommentResponse, error) { + addComment := struct { + Body string `json:"body"` + }{ + Body: comment, + } + + body, err := json.Marshal(addComment) + if err != nil { + return nil, err + } + bodyReader := bytes.NewReader(body) + + request, err := http.NewRequest( + http.MethodPost, + fmt.Sprintf( + "%s/repos/%s/%s/issues/%d/comments", + strings.TrimSuffix(*gc.url, "/"), + owner, + repository, + pullRequest, + ), + bodyReader, + ) + if err != nil { + return nil, err + } + request.Header.Add("Authorization", fmt.Sprintf("token %s", *gc.token)) + request.Header.Add("Content-Type", "application/json") + + resp, err := gc.client.Do(request) + if err != nil { + return nil, err + } + + if resp.StatusCode > 299 { + log.Printf("failed to register with status code: %d", resp.StatusCode) + respBody, err := io.ReadAll(resp.Body) + if err != nil { + return nil, err + } else { + log.Printf("request body: %s", string(respBody)) + } + } + + respBody, err := io.ReadAll(resp.Body) + if err != nil { + return nil, err + } + + var response AddCommentResponse + if err := json.Unmarshal(respBody, &response); err != nil { + return nil, err + } + + return &response, nil +} + +type RenovateClient struct { + config string +} + +func NewRenovateClient(config string) *RenovateClient { + return &RenovateClient{config: config} +} + +func (rc *RenovateClient) RefreshRepository(ctx context.Context, owner, repository string) error { + client, err := dagger.Connect(ctx, dagger.WithLogOutput(os.Stdout)) + if err != nil { + return err + } + + envRenovateToken := os.Getenv("GITEA_RENOVATE_TOKEN") + log.Println(envRenovateToken) + + renovateToken := client.SetSecret("RENOVATE_TOKEN", envRenovateToken) + githubComToken := client.SetSecret("GITHUB_COM_TOKEN", os.Getenv("GITHUB_COM_TOKEN")) + renovateSecret := client.SetSecret("RENOVATE_SECRETS", os.Getenv("RENOVATE_SECRETS")) + + output, err := client.Container(). + From("renovate/renovate:latest"). + WithNewFile("/opts/renovate/config.json", dagger.ContainerWithNewFileOpts{ + Contents: `{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "platform": "gitea", + "endpoint": "https://git.front.kjuulh.io/api/v1/", + "automerge": true, + "automergeType": "pr", + "extends": [ + "config:base" + ], + "hostRules": [ + { + "hostType": "docker", + "matchHost": "harbor.front.kjuulh.io", + "username": "service", + "password": "{{ secrets.HARBOR_SERVER_PASSWORD }}" + } + ], + "packageRules": [ + { + "matchDatasources": ["docker"], + "registryUrls": ["https://harbor.front.kjuulh.io/docker-proxy/library/"] + }, + { + "groupName": "all dependencies", + "separateMajorMinor": false, + "groupSlug": "all", + "packageRules": [ + { + "matchPackagePatterns": [ + "*" + ], + "groupName": "all dependencies", + "groupSlug": "all" + } + ], + "lockFileMaintenance": { + "enabled": false + } + } + ] +}`, + Permissions: 755, + Owner: "root", + }). + WithSecretVariable("RENOVATE_TOKEN", renovateToken). + WithSecretVariable("GITHUB_COM_TOKEN", githubComToken). + WithSecretVariable("RENOVATE_SECRETS", renovateSecret). + WithEnvVariable("LOG_LEVEL", "warn"). + WithEnvVariable("RENOVATE_CONFIG_FILE", "/opts/renovate/config.json"). + WithExec([]string{ + fmt.Sprintf("%s/%s", owner, repository), + }). + Sync(ctx) + + stdout, outerr := output.Stdout(ctx) + if outerr == nil { + log.Printf("stdout: %s", stdout) + } + stderr, outerr := output.Stderr(ctx) + if outerr == nil { + log.Printf("stderr: %s", stderr) + } + if err != nil { + return fmt.Errorf("error: %w, \nstderr: %s\nstdout: %s", err, stderr, stdout) + } + + return nil +} diff --git a/go.mod b/go.mod index ddde2ba..eb76840 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,26 @@ module git.front.kjuulh.io/kjuulh/contractor go 1.20 require ( + dagger.io/dagger v0.8.1 + github.com/gin-gonic/gin v1.9.1 + github.com/google/uuid v1.3.0 + github.com/joho/godotenv v1.5.1 + github.com/spf13/cobra v1.7.0 +) + +require ( + github.com/99designs/gqlgen v0.17.31 // indirect + github.com/Khan/genqlient v0.6.0 // indirect + github.com/adrg/xdg v0.4.0 // indirect github.com/bytedance/sonic v1.9.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/gin-gonic/gin v1.9.1 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.14.0 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect @@ -20,15 +31,18 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect + github.com/vektah/gqlparser/v2 v2.5.6 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + golang.org/x/tools v0.11.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 8b0e31f..4a41eac 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,16 @@ +dagger.io/dagger v0.8.1 h1:jLNPGubxrLWUfsX+snjaw913B1lxVmWftzdVehB+RQU= +dagger.io/dagger v0.8.1/go.mod h1:CZwYt0FfVsEEYTFytzf2ihESB2P4H1S3/UfnrVxjBsE= +github.com/99designs/gqlgen v0.17.31 h1:VncSQ82VxieHkea8tz11p7h/zSbvHSxSDZfywqWt158= +github.com/99designs/gqlgen v0.17.31/go.mod h1:i4rEatMrzzu6RXaHydq1nmEPZkb3bKQsnxNRHS4DQB4= +github.com/Khan/genqlient v0.6.0 h1:Bwb1170ekuNIVIwTJEqvO8y7RxBxXu639VJOkKSrwAk= +github.com/Khan/genqlient v0.6.0/go.mod h1:rvChwWVTqXhiapdhLDV4bp9tz/Xvtewwkon4DpWWCRM= +github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= +github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= +github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= +github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= @@ -6,13 +19,16 @@ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhD github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -22,15 +38,27 @@ github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QX github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +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/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= @@ -42,8 +70,11 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -52,34 +83,50 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/vektah/gqlparser/v2 v2.5.6 h1:Ou14T0N1s191eRMZ1gARVqohcbe1e8FrcONScsq8cRU= +github.com/vektah/gqlparser/v2 v2.5.6/go.mod h1:z8xXUff237NntSuH8mLFijZ+1tjV1swDbpDqjJmk6ME= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= +golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index efd59d9..56dcde2 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,15 @@ import ( "log" "git.front.kjuulh.io/kjuulh/contractor/cmd/contractor" + "github.com/joho/godotenv" ) func main() { + err := godotenv.Load() + if err != nil { + log.Println("DEBUG: no .env file found") + } + if err := contractor.RootCmd().Execute(); err != nil { log.Fatal(err) }