From 1ddf283dc96f6d8f3dd570e7aabee0e7ac74963e Mon Sep 17 00:00:00 2001 From: Yoni Bettan Date: Wed, 14 Aug 2024 12:05:16 +0300 Subject: [PATCH] Replacing all references of `qbarrand` with `rh-ecosystem-edge`. The project was migrated from `github.com/qbarrand/gitstream` to `github.com/rh-ecosystem-edge/gitstream`, therefore, all import path were needed to be updated. Also building the new `ghcr.io/rh-ecosystem-edge/gitstream` image. Signed-off-by: Yoni Bettan --- .github/workflows/container-image.yml | 2 +- README.md | 6 +++--- cmd/cli/root.go | 14 +++++++------- go.mod | 2 +- internal/github/data.go | 2 +- internal/github/issue.go | 2 +- internal/github/issue_test.go | 4 ++-- internal/github/pr.go | 2 +- internal/github/pr_test.go | 2 +- internal/github/templates/issue.tmpl | 2 +- internal/github/templates/pr.tmpl | 2 +- internal/github/user_test.go | 2 +- internal/gitstream/assign.go | 12 ++++++------ internal/gitstream/assign_test.go | 12 ++++++------ internal/gitstream/branches.go | 4 ++-- internal/gitstream/diff.go | 6 +++--- internal/gitstream/sync.go | 10 +++++----- internal/gitstream/sync_test.go | 8 ++++---- internal/gitstream/undraft.go | 10 +++++----- internal/gitutils/cherrypick.go | 2 +- internal/gitutils/cherrypick_test.go | 4 ++-- internal/gitutils/differ.go | 8 ++++---- internal/gitutils/differ_test.go | 8 ++++---- internal/gitutils/mock_differ.go | 4 ++-- internal/intents/getter.go | 6 +++--- internal/intents/getter_test.go | 6 +++--- internal/intents/mock_getter.go | 2 +- internal/markup/finder_test.go | 2 +- main.go | 2 +- 29 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index 804add0..71f75d0 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -20,7 +20,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ghcr.io/qbarrand/gitstream + images: ghcr.io/rh-ecosystem-edge/gitstream tags: | type=ref,event=branch type=semver,pattern={{version}} diff --git a/README.md b/README.md index 9b8d317..5a67229 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # gitstream Sync two repositories by cherry-picking upstream commits into downstream -[![Go Reference](https://pkg.go.dev/badge/github.com/qbarrand/gitstream.svg)](https://pkg.go.dev/github.com/qbarrand/gitstream) -[![codecov](https://codecov.io/gh/qbarrand/gitstream/branch/main/graph/badge.svg?token=T1QT6I9VNZ)](https://codecov.io/gh/qbarrand/gitstream) -[![Go Report Card](https://goreportcard.com/badge/github.com/qbarrand/gitstream)](https://goreportcard.com/report/github.com/qbarrand/gitstream) \ No newline at end of file +[![Go Reference](https://pkg.go.dev/badge/github.com/rh-ecosystem-edge/gitstream.svg)](https://pkg.go.dev/github.com/rh-ecosystem-edge/gitstream) +[![codecov](https://codecov.io/gh/rh-ecosystem-edge/gitstream/branch/main/graph/badge.svg?token=T1QT6I9VNZ)](https://codecov.io/gh/rh-ecosystem-edge/gitstream) +[![Go Report Card](https://goreportcard.com/badge/github.com/rh-ecosystem-edge/gitstream)](https://goreportcard.com/report/github.com/rh-ecosystem-edge/gitstream) \ No newline at end of file diff --git a/cmd/cli/root.go b/cmd/cli/root.go index bfb3763..b706f14 100644 --- a/cmd/cli/root.go +++ b/cmd/cli/root.go @@ -11,13 +11,13 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-logr/logr" "github.com/go-logr/stdr" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitstream" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/intents" - "github.com/qbarrand/gitstream/internal/markup" - "github.com/qbarrand/gitstream/internal/owners" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitstream" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/intents" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal/owners" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 34a9f32..7330857 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/qbarrand/gitstream +module github.com/rh-ecosystem-edge/gitstream go 1.21 diff --git a/internal/github/data.go b/internal/github/data.go index 4fdf328..0d21290 100644 --- a/internal/github/data.go +++ b/internal/github/data.go @@ -3,7 +3,7 @@ package github import ( "errors" - "github.com/qbarrand/gitstream/internal/process" + "github.com/rh-ecosystem-edge/gitstream/internal/process" ) type Commit struct { diff --git a/internal/github/issue.go b/internal/github/issue.go index 4b283bd..e37a76e 100644 --- a/internal/github/issue.go +++ b/internal/github/issue.go @@ -7,7 +7,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal" ) //go:generate mockgen -source=issue.go -package=github -destination=mock_issue.go diff --git a/internal/github/issue_test.go b/internal/github/issue_test.go index a59b920..1671d1e 100644 --- a/internal/github/issue_test.go +++ b/internal/github/issue_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/google/go-github/v47/github" "github.com/migueleliasweb/go-github-mock/src/mock" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/process" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/process" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/github/pr.go b/internal/github/pr.go index cd654d8..e25c78b 100644 --- a/internal/github/pr.go +++ b/internal/github/pr.go @@ -9,7 +9,7 @@ import ( "github.com/cli/go-gh/pkg/api" "github.com/go-git/go-git/v5/plumbing/object" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal" "github.com/shurcooL/githubv4" ) diff --git a/internal/github/pr_test.go b/internal/github/pr_test.go index b093611..2201f6d 100644 --- a/internal/github/pr_test.go +++ b/internal/github/pr_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/google/go-github/v47/github" "github.com/migueleliasweb/go-github-mock/src/mock" - gh "github.com/qbarrand/gitstream/internal/github" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" "github.com/stretchr/testify/assert" ) diff --git a/internal/github/templates/issue.tmpl b/internal/github/templates/issue.tmpl index 12d2fb8..fd7857e 100644 --- a/internal/github/templates/issue.tmpl +++ b/internal/github/templates/issue.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/qbarrand/gitstream/internal/github.IssueData*/ -}} +{{- /*gotype: github.com/rh-ecosystem-edge/gitstream/internal/github.IssueData*/ -}} {{ .AppName }} tried to cherry-pick commit `{{ .Commit.SHA }}` from `{{ .UpstreamURL }}` but was unable to do so. Commit message: diff --git a/internal/github/templates/pr.tmpl b/internal/github/templates/pr.tmpl index 7935fda..0e43b09 100644 --- a/internal/github/templates/pr.tmpl +++ b/internal/github/templates/pr.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/qbarrand/gitstream/internal/github.PRData*/ -}} +{{- /*gotype: github.com/rh-ecosystem-edge/gitstream/internal/github.PRData*/ -}} This is an automated cherry-pick by {{ .AppName }} of `{{ .Commit.SHA }}` from `{{ .UpstreamURL }}`. Commit message: diff --git a/internal/github/user_test.go b/internal/github/user_test.go index c95ea67..68742bb 100644 --- a/internal/github/user_test.go +++ b/internal/github/user_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-github/v47/github" "github.com/migueleliasweb/go-github-mock/src/mock" - gh "github.com/qbarrand/gitstream/internal/github" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" "github.com/stretchr/testify/assert" ) diff --git a/internal/gitstream/assign.go b/internal/gitstream/assign.go index 092b26d..c6a26b6 100644 --- a/internal/gitstream/assign.go +++ b/internal/gitstream/assign.go @@ -9,12 +9,12 @@ import ( "github.com/go-logr/logr" "github.com/google/go-github/v47/github" "github.com/hashicorp/go-multierror" - "github.com/qbarrand/gitstream/internal" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/markup" - "github.com/qbarrand/gitstream/internal/owners" + "github.com/rh-ecosystem-edge/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal/owners" ) type Assign struct { diff --git a/internal/gitstream/assign_test.go b/internal/gitstream/assign_test.go index d1c3700..bde4c71 100644 --- a/internal/gitstream/assign_test.go +++ b/internal/gitstream/assign_test.go @@ -9,12 +9,12 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/markup" - "github.com/qbarrand/gitstream/internal/owners" - "github.com/qbarrand/gitstream/internal/test" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal/owners" + "github.com/rh-ecosystem-edge/gitstream/internal/test" "github.com/stretchr/testify/assert" ) diff --git a/internal/gitstream/branches.go b/internal/gitstream/branches.go index 66d1220..caa6084 100644 --- a/internal/gitstream/branches.go +++ b/internal/gitstream/branches.go @@ -9,8 +9,8 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/config" "github.com/go-logr/logr" - "github.com/qbarrand/gitstream/internal" - "github.com/qbarrand/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" ) type DeleteRemoteBranches struct { diff --git a/internal/gitstream/diff.go b/internal/gitstream/diff.go index 9a9390c..d2fe7ef 100644 --- a/internal/gitstream/diff.go +++ b/internal/gitstream/diff.go @@ -6,9 +6,9 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-logr/logr" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" ) type Diff struct { diff --git a/internal/gitstream/sync.go b/internal/gitstream/sync.go index 9e1fc2a..8a6c772 100644 --- a/internal/gitstream/sync.go +++ b/internal/gitstream/sync.go @@ -10,11 +10,11 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-logr/logr" - "github.com/qbarrand/gitstream/internal" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/process" + "github.com/rh-ecosystem-edge/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/process" ) type Sync struct { diff --git a/internal/gitstream/sync_test.go b/internal/gitstream/sync_test.go index c45f5a5..94c9529 100644 --- a/internal/gitstream/sync_test.go +++ b/internal/gitstream/sync_test.go @@ -12,10 +12,10 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/test" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/gitstream/undraft.go b/internal/gitstream/undraft.go index de4daac..7837ea5 100644 --- a/internal/gitstream/undraft.go +++ b/internal/gitstream/undraft.go @@ -8,11 +8,11 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-logr/logr" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/gitutils" - "github.com/qbarrand/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/gitutils" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" ) type Undraft struct { diff --git a/internal/gitutils/cherrypick.go b/internal/gitutils/cherrypick.go index eb0dbe9..b0ff3f9 100644 --- a/internal/gitutils/cherrypick.go +++ b/internal/gitutils/cherrypick.go @@ -9,7 +9,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-logr/logr" - "github.com/qbarrand/gitstream/internal/process" + "github.com/rh-ecosystem-edge/gitstream/internal/process" ) //go:generate mockgen -source=cherrypick.go -package=gitutils -destination=mock_cherrypick.go diff --git a/internal/gitutils/cherrypick_test.go b/internal/gitutils/cherrypick_test.go index 35b8f6d..d8edd06 100644 --- a/internal/gitutils/cherrypick_test.go +++ b/internal/gitutils/cherrypick_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/qbarrand/gitstream/internal/process" - "github.com/qbarrand/gitstream/internal/test" + "github.com/rh-ecosystem-edge/gitstream/internal/process" + "github.com/rh-ecosystem-edge/gitstream/internal/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/gitutils/differ.go b/internal/gitutils/differ.go index 36b0b1d..8c06945 100644 --- a/internal/gitutils/differ.go +++ b/internal/gitutils/differ.go @@ -8,10 +8,10 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-logr/logr" - "github.com/qbarrand/gitstream/internal" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/intents" + "github.com/rh-ecosystem-edge/gitstream/internal" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/intents" ) //go:generate mockgen -source=differ.go -package=gitutils -destination=mock_differ.go diff --git a/internal/gitutils/differ_test.go b/internal/gitutils/differ_test.go index c6747a1..773bfe4 100644 --- a/internal/gitutils/differ_test.go +++ b/internal/gitutils/differ_test.go @@ -8,10 +8,10 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/qbarrand/gitstream/internal/config" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/intents" - "github.com/qbarrand/gitstream/internal/test" + "github.com/rh-ecosystem-edge/gitstream/internal/config" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/intents" + "github.com/rh-ecosystem-edge/gitstream/internal/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/gitutils/mock_differ.go b/internal/gitutils/mock_differ.go index 227f8d6..f1039e4 100644 --- a/internal/gitutils/mock_differ.go +++ b/internal/gitutils/mock_differ.go @@ -12,8 +12,8 @@ import ( git "github.com/go-git/go-git/v5" object "github.com/go-git/go-git/v5/plumbing/object" gomock "github.com/golang/mock/gomock" - config "github.com/qbarrand/gitstream/internal/config" - github "github.com/qbarrand/gitstream/internal/github" + config "github.com/rh-ecosystem-edge/gitstream/internal/config" + github "github.com/rh-ecosystem-edge/gitstream/internal/github" ) // MockDiffer is a mock of Differ interface. diff --git a/internal/intents/getter.go b/internal/intents/getter.go index 97462df..616d294 100644 --- a/internal/intents/getter.go +++ b/internal/intents/getter.go @@ -10,9 +10,9 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-logr/logr" "github.com/google/go-github/v47/github" - "github.com/qbarrand/gitstream/internal" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" ) type CommitIntents map[plumbing.Hash]string diff --git a/internal/intents/getter_test.go b/internal/intents/getter_test.go index 6c9abb0..3d0348f 100644 --- a/internal/intents/getter_test.go +++ b/internal/intents/getter_test.go @@ -10,9 +10,9 @@ import ( "github.com/golang/mock/gomock" "github.com/google/go-github/v47/github" "github.com/migueleliasweb/go-github-mock/src/mock" - gh "github.com/qbarrand/gitstream/internal/github" - "github.com/qbarrand/gitstream/internal/intents" - "github.com/qbarrand/gitstream/internal/markup" + gh "github.com/rh-ecosystem-edge/gitstream/internal/github" + "github.com/rh-ecosystem-edge/gitstream/internal/intents" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" "github.com/stretchr/testify/assert" ) diff --git a/internal/intents/mock_getter.go b/internal/intents/mock_getter.go index 1c93868..445669e 100644 --- a/internal/intents/mock_getter.go +++ b/internal/intents/mock_getter.go @@ -12,7 +12,7 @@ import ( v5 "github.com/go-git/go-git/v5" plumbing "github.com/go-git/go-git/v5/plumbing" gomock "github.com/golang/mock/gomock" - github "github.com/qbarrand/gitstream/internal/github" + github "github.com/rh-ecosystem-edge/gitstream/internal/github" ) // MockGetter is a mock of Getter interface. diff --git a/internal/markup/finder_test.go b/internal/markup/finder_test.go index 3b3c49d..554ed2f 100644 --- a/internal/markup/finder_test.go +++ b/internal/markup/finder_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-git/go-git/v5/plumbing" - "github.com/qbarrand/gitstream/internal/markup" + "github.com/rh-ecosystem-edge/gitstream/internal/markup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/main.go b/main.go index 01e10d0..fd4fa3d 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "os/signal" "github.com/go-logr/stdr" - "github.com/qbarrand/gitstream/cmd/cli" + "github.com/rh-ecosystem-edge/gitstream/cmd/cli" ) func main() {