diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c14df07..413699a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,10 +15,10 @@ ```bash # Build docker environment -docker build -t gitea-sonarqube-pr-bot/dev -f contrib/Dockerfile contrib +docker build -t gitea-sonarqube-bot/dev -f contrib/Dockerfile contrib # Start the environment -docker run --rm -it -p 49182:3000 -v "$(pwd):/projects" gitea-sonarqube-pr-bot/dev +docker run --rm -it -p 49182:3000 -v "$(pwd):/projects" gitea-sonarqube-bot/dev ``` ## Build and Run @@ -55,7 +55,7 @@ make helm-params For local purposes ```bash -docker build -t gitea-sonarqube-pr-bot/prod . +docker build -t gitea-sonarqube-bot/prod . ``` **Docker image** diff --git a/cmd/gitea-sonarqube-bot/main.go b/cmd/gitea-sonarqube-bot/main.go index ed949bc..ccbbcee 100644 --- a/cmd/gitea-sonarqube-bot/main.go +++ b/cmd/gitea-sonarqube-bot/main.go @@ -11,10 +11,10 @@ import ( "syscall" "time" - "gitea-sonarqube-pr-bot/internal/api" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sonarQubeSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/api" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sonarQubeSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 4588f2a..ac4f1ae 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitea-sonarqube-pr-bot +module gitea-sonarqube-bot go 1.18 diff --git a/internal/api/gitea.go b/internal/api/gitea.go index d9b6d66..fbe2022 100644 --- a/internal/api/gitea.go +++ b/internal/api/gitea.go @@ -5,10 +5,10 @@ import ( "log" "net/http" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" - webhook "gitea-sonarqube-pr-bot/internal/webhooks/gitea" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" + webhook "gitea-sonarqube-bot/internal/webhooks/gitea" ) type GiteaWebhookHandlerInferface interface { diff --git a/internal/api/gitea_test.go b/internal/api/gitea_test.go index 5eade86..e82b05b 100644 --- a/internal/api/gitea_test.go +++ b/internal/api/gitea_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/settings" "github.com/stretchr/testify/assert" ) diff --git a/internal/api/main_test.go b/internal/api/main_test.go index 9fad173..6fdd816 100644 --- a/internal/api/main_test.go +++ b/internal/api/main_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" diff --git a/internal/api/sonarqube.go b/internal/api/sonarqube.go index 3b5bbad..48cf291 100644 --- a/internal/api/sonarqube.go +++ b/internal/api/sonarqube.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" - webhook "gitea-sonarqube-pr-bot/internal/webhooks/sonarqube" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" + webhook "gitea-sonarqube-bot/internal/webhooks/sonarqube" ) type SonarQubeWebhookHandlerInferface interface { diff --git a/internal/api/sonarqube_test.go b/internal/api/sonarqube_test.go index fbd7cee..8f71c6b 100644 --- a/internal/api/sonarqube_test.go +++ b/internal/api/sonarqube_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/settings" "github.com/stretchr/testify/assert" ) diff --git a/internal/clients/gitea/gitea.go b/internal/clients/gitea/gitea.go index d48e66c..4aba30d 100644 --- a/internal/clients/gitea/gitea.go +++ b/internal/clients/gitea/gitea.go @@ -2,7 +2,7 @@ package gitea import ( "fmt" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/settings" "log" "code.gitea.io/sdk/gitea" @@ -31,7 +31,7 @@ func (sdk *GiteaSdk) PostComment(repo settings.GiteaRepository, idx int, msg str func (sdk *GiteaSdk) UpdateStatus(repo settings.GiteaRepository, ref string, details StatusDetails) error { opt := gitea.CreateStatusOption{ TargetURL: details.Url, - Context: "gitea-sonarqube-pr-bot", + Context: "gitea-sonarqube-bot", Description: details.Message, State: gitea.StatusState(details.State), } diff --git a/internal/clients/sonarqube/sonarqube.go b/internal/clients/sonarqube/sonarqube.go index aecfb5f..4403e08 100644 --- a/internal/clients/sonarqube/sonarqube.go +++ b/internal/clients/sonarqube/sonarqube.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "gitea-sonarqube-pr-bot/internal/actions" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/actions" + "gitea-sonarqube-bot/internal/settings" ) func ParsePRIndex(name string) (int, error) { diff --git a/internal/clients/sonarqube/sonarqube_test.go b/internal/clients/sonarqube/sonarqube_test.go index d3ef651..928fce1 100644 --- a/internal/clients/sonarqube/sonarqube_test.go +++ b/internal/clients/sonarqube/sonarqube_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/settings" "github.com/stretchr/testify/assert" ) diff --git a/internal/settings/settings_test.go b/internal/settings/settings_test.go index 295ed36..9513e2e 100644 --- a/internal/settings/settings_test.go +++ b/internal/settings/settings_test.go @@ -26,7 +26,7 @@ sonarqube: additionalMetrics: [] projects: - sonarqube: - key: gitea-sonarqube-pr-bot + key: gitea-sonarqube-bot gitea: owner: example-organization name: pr-bot @@ -130,7 +130,7 @@ sonarqube: additionalMetrics: "new_security_hotspots" projects: - sonarqube: - key: gitea-sonarqube-pr-bot + key: gitea-sonarqube-bot gitea: owner: example-organization name: pr-bot @@ -203,7 +203,7 @@ sonarqube: value: fake-sonarqube-token projects: - sonarqube: - key: gitea-sonarqube-pr-bot + key: gitea-sonarqube-bot gitea: owner: example-organization name: pr-bot @@ -261,7 +261,7 @@ func TestLoadProjectsStructure(t *testing.T) { expectedProjects := []Project{ { SonarQube: struct{ Key string }{ - Key: "gitea-sonarqube-pr-bot", + Key: "gitea-sonarqube-bot", }, Gitea: GiteaRepository{ Owner: "example-organization", @@ -319,7 +319,7 @@ sonarqube: additionalMetrics: "new_security_hotspots" projects: - sonarqube: - key: gitea-sonarqube-pr-bot + key: gitea-sonarqube-bot gitea: owner: example-organization name: pr-bot diff --git a/internal/webhooks/gitea/comment.go b/internal/webhooks/gitea/comment.go index 4daf6c9..7aa121c 100644 --- a/internal/webhooks/gitea/comment.go +++ b/internal/webhooks/gitea/comment.go @@ -5,10 +5,10 @@ import ( "fmt" "log" - "gitea-sonarqube-pr-bot/internal/actions" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/actions" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" ) type issue struct { diff --git a/internal/webhooks/gitea/pull.go b/internal/webhooks/gitea/pull.go index 5a71ad1..9e6b6de 100644 --- a/internal/webhooks/gitea/pull.go +++ b/internal/webhooks/gitea/pull.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - giteaSdk "gitea-sonarqube-pr-bot/internal/clients/gitea" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" - "gitea-sonarqube-pr-bot/internal/settings" + giteaSdk "gitea-sonarqube-bot/internal/clients/gitea" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" + "gitea-sonarqube-bot/internal/settings" ) type pullRequest struct { diff --git a/internal/webhooks/sonarqube/webhook.go b/internal/webhooks/sonarqube/webhook.go index 40da644..555cdf9 100644 --- a/internal/webhooks/sonarqube/webhook.go +++ b/internal/webhooks/sonarqube/webhook.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - sqSdk "gitea-sonarqube-pr-bot/internal/clients/sonarqube" + sqSdk "gitea-sonarqube-bot/internal/clients/sonarqube" ) type properties struct { diff --git a/internal/webhooks/sonarqube/webhook_test.go b/internal/webhooks/sonarqube/webhook_test.go index 02b2010..58c555d 100644 --- a/internal/webhooks/sonarqube/webhook_test.go +++ b/internal/webhooks/sonarqube/webhook_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "gitea-sonarqube-pr-bot/internal/settings" + "gitea-sonarqube-bot/internal/settings" "github.com/stretchr/testify/assert" ) diff --git a/package-lock.json b/package-lock.json index 43e4f53..8cdf948 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "gitea-sonarqube-pr-bot", + "name": "gitea-sonarqube-bot", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "gitea-sonarqube-pr-bot", + "name": "gitea-sonarqube-bot", "license": "MIT", "devDependencies": { "readme-generator-for-helm": "https://github.com/bitnami-labs/readme-generator-for-helm/tarball/main" diff --git a/package.json b/package.json index 98aa01f..0f7b790 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "gitea-sonarqube-pr-bot", + "name": "gitea-sonarqube-bot", "description": "Integrate SonarQube analysis into Gitea Pull Requests", "author": "Steven Kriegler ", "license": "MIT",