Merge pull request #2 from wtam2018/rename-package-name

wtam2018 · web-flow · commit 86b0d21e3f6c · 2020-12-10T21:34:53.000-05:00
rename package name to new org name
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /go/src
 COPY . /go/src
 RUN GIT_COMMIT=$(git rev-parse HEAD) && \
   CGO_ENABLED=0 GOOS=linux go build -a \
-  -ldflags "-X github.com/rhd-gitops-example/gitops-backend/pkg/health.GitRevision=${GIT_COMMIT}" ./cmd/backend-http
+  -ldflags "-X github.com/redhat-developer/gitops-backend/pkg/health.GitRevision=${GIT_COMMIT}" ./cmd/backend-http
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal
 WORKDIR /root/
diff --git a/cmd/backend-http/main.go b/cmd/backend-http/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/rhd-gitops-example/gitops-backend/pkg/cmd"
+	"github.com/redhat-developer/gitops-backend/pkg/cmd"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rhd-gitops-example/gitops-backend
+module github.com/redhat-developer/gitops-backend
 
 go 1.14
 
@@ -28,6 +28,7 @@ require (
 	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
 	github.com/prometheus/common v0.7.0 // indirect
 	github.com/prometheus/procfs v0.0.5 // indirect
+	github.com/rhd-gitops-example/gitops-backend v0.0.0-20200922164111-e3fd3401e6cd
 	github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.0.0
diff --git a/go.sum b/go.sum
@@ -319,6 +319,8 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rhd-gitops-example/gitops-backend v0.0.0-20200922164111-e3fd3401e6cd h1:5zjKaYoTfzqls/2CydXM8ls7ggGBu188x9Wcvj00vto=
+github.com/rhd-gitops-example/gitops-backend v0.0.0-20200922164111-e3fd3401e6cd/go.mod h1:ENI/IrBm31kY23IiYK/Q1aC6CK5lgkm4NGoXOY+JQj4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
@@ -10,11 +10,11 @@ import (
 	"k8s.io/client-go/rest"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/git"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/health"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/httpapi"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/httpapi/secrets"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/metrics"
+	"github.com/redhat-developer/gitops-backend/pkg/git"
+	"github.com/redhat-developer/gitops-backend/pkg/health"
+	"github.com/redhat-developer/gitops-backend/pkg/httpapi"
+	"github.com/redhat-developer/gitops-backend/pkg/httpapi/secrets"
+	"github.com/redhat-developer/gitops-backend/pkg/metrics"
 )
 
 const (
diff --git a/pkg/git/client.go b/pkg/git/client.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/jenkins-x/go-scm/scm"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/metrics"
+	"github.com/redhat-developer/gitops-backend/pkg/metrics"
 )
 
 // New creates and returns a new SCMClient.
diff --git a/pkg/git/client_test.go b/pkg/git/client_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/jenkins-x/go-scm/scm/factory"
 
-	"github.com/rhd-gitops-example/gitops-backend/pkg/metrics"
-	"github.com/rhd-gitops-example/gitops-backend/test"
+	"github.com/redhat-developer/gitops-backend/pkg/metrics"
+	"github.com/redhat-developer/gitops-backend/test"
 )
 
 func TestFileContents(t *testing.T) {
diff --git a/pkg/git/scm_factory.go b/pkg/git/scm_factory.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 
 	scmfactory "github.com/jenkins-x/go-scm/scm/factory"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/metrics"
+	"github.com/redhat-developer/gitops-backend/pkg/metrics"
 )
 
 // SCMClientFactory is an implementation of the GitClientFactory interface that can
diff --git a/pkg/git/scm_factory_test.go b/pkg/git/scm_factory_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/jenkins-x/go-scm/scm"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/metrics"
-	"github.com/rhd-gitops-example/gitops-backend/test"
+	"github.com/redhat-developer/gitops-backend/pkg/metrics"
+	"github.com/redhat-developer/gitops-backend/test"
 )
 
 var _ ClientFactory = (*SCMClientFactory)(nil)
diff --git a/pkg/gitfs/gitfs_test.go b/pkg/gitfs/gitfs_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/kustomize/pkg/fs"
 
-	"github.com/rhd-gitops-example/gitops-backend/test"
+	"github.com/redhat-developer/gitops-backend/test"
 )
 
 var _ fs.FileSystem = gitFS{}
diff --git a/pkg/httpapi/api.go b/pkg/httpapi/api.go
@@ -13,9 +13,9 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/yaml"
 
-	"github.com/rhd-gitops-example/gitops-backend/pkg/git"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/httpapi/secrets"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/parser"
+	"github.com/redhat-developer/gitops-backend/pkg/git"
+	"github.com/redhat-developer/gitops-backend/pkg/httpapi/secrets"
+	"github.com/redhat-developer/gitops-backend/pkg/parser"
 )
 
 // DefaultSecretRef is the name looked up if none is provided in the URL.
diff --git a/pkg/httpapi/api_test.go b/pkg/httpapi/api_test.go
@@ -14,9 +14,9 @@ import (
 
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/google/go-cmp/cmp"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/git"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/parser"
-	"github.com/rhd-gitops-example/gitops-backend/test"
+	"github.com/redhat-developer/gitops-backend/pkg/git"
+	"github.com/redhat-developer/gitops-backend/pkg/parser"
+	"github.com/redhat-developer/gitops-backend/test"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/yaml"
 )
diff --git a/pkg/httpapi/application.go b/pkg/httpapi/application.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/parser"
+	"github.com/redhat-developer/gitops-backend/pkg/parser"
 )
 
 const nameLabel = "app.kubernetes.io/name"
diff --git a/pkg/httpapi/application_test.go b/pkg/httpapi/application_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/rhd-gitops-example/gitops-backend/pkg/parser"
+	"github.com/redhat-developer/gitops-backend/pkg/parser"
 )
 
 const (
diff --git a/pkg/parser/extracts.go b/pkg/parser/extracts.go
@@ -7,7 +7,7 @@ import (
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/rhd-gitops-example/gitops-backend/internal/sets"
+	"github.com/redhat-developer/gitops-backend/internal/sets"
 )
 
 // Deployments, DeploymentConfigs, StatefulSets, DaemonSets, Jobs, CronJobs
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/pkg/resource"
 	"sigs.k8s.io/kustomize/pkg/target"
 
-	"github.com/rhd-gitops-example/gitops-backend/pkg/gitfs"
+	"github.com/redhat-developer/gitops-backend/pkg/gitfs"
 )
 
 // ParseFromGit takes a go-git CloneOptions struct and a filepath, and extracts
diff --git a/pkg/parser/parser_test.go b/pkg/parser/parser_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/rhd-gitops-example/gitops-backend/test"
+	"github.com/redhat-developer/gitops-backend/test"
 )
 
 const (
diff --git a/test/clone_options.go b/test/clone_options.go
@@ -16,7 +16,7 @@ func MakeCloneOptions() *git.CloneOptions {
 	}
 	if b := os.Getenv("TRAVIS_PULL_REQUEST_BRANCH"); b != "" {
 		o.ReferenceName = plumbing.NewBranchReferenceName(b)
-		o.URL = "https://github.com/rhd-gitops-example/gitops-backend.git"
+		o.URL = "https://github.com/redhat-developer/gitops-backend.git"
 	}
 	return o
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/rhd-gitops-example/gitops-backend/pkg/cmd"`
	`4`	`+ "github.com/redhat-developer/gitops-backend/pkg/cmd"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/jenkins-x/go-scm/scm"`
`8`		`- "github.com/rhd-gitops-example/gitops-backend/pkg/metrics"`
	`8`	`+ "github.com/redhat-developer/gitops-backend/pkg/metrics"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// New creates and returns a new SCMClient.`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"github.com/google/go-cmp/cmp"`
`11`	`11`	`"github.com/jenkins-x/go-scm/scm/factory"`
`12`	`12`
`13`		`- "github.com/rhd-gitops-example/gitops-backend/pkg/metrics"`
`14`		`- "github.com/rhd-gitops-example/gitops-backend/test"`
	`13`	`+ "github.com/redhat-developer/gitops-backend/pkg/metrics"`
	`14`	`+ "github.com/redhat-developer/gitops-backend/test"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func TestFileContents(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net/url"`
`6`	`6`
`7`	`7`	`scmfactory "github.com/jenkins-x/go-scm/scm/factory"`
`8`		`- "github.com/rhd-gitops-example/gitops-backend/pkg/metrics"`
	`8`	`+ "github.com/redhat-developer/gitops-backend/pkg/metrics"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// SCMClientFactory is an implementation of the GitClientFactory interface that can`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/jenkins-x/go-scm/scm"`
`7`		`- "github.com/rhd-gitops-example/gitops-backend/pkg/metrics"`
`8`		`- "github.com/rhd-gitops-example/gitops-backend/test"`
	`7`	`+ "github.com/redhat-developer/gitops-backend/pkg/metrics"`
	`8`	`+ "github.com/redhat-developer/gitops-backend/test"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var _ ClientFactory = (*SCMClientFactory)(nil)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/google/go-cmp/cmp"`
`8`	`8`	`"sigs.k8s.io/kustomize/pkg/fs"`
`9`	`9`
`10`		`- "github.com/rhd-gitops-example/gitops-backend/test"`
	`10`	`+ "github.com/redhat-developer/gitops-backend/test"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var _ fs.FileSystem = gitFS{}`