Merge pull request #718 from opendevstack/fix/module-name

Fix Go module name
opendevstack · Jul 24, 2023 · d649596 · d649596
2 parents 35dce3b + 7af5de5
commit d649596
Show file tree

Hide file tree

Showing 99 changed files with 249 additions and 248 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ listed in the changelog.
 ### Fixed
 
 - ods.yaml branch trigger patterns must be lowercase ([#713](https://github.com/opendevstack/ods-pipeline/issues/713))
+- Go module name was incorrectly set to `github.com/opendevstack/pipeline`
 
 - sonar-scanner invocations stderr not captured ([#719](https://github.com/opendevstack/ods-pipeline/issues/719))
 

diff --git a/cmd/aqua-scan/aqua.go b/cmd/aqua-scan/aqua.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/internal/image"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 const (

diff --git a/cmd/aqua-scan/bitbucket.go b/cmd/aqua-scan/bitbucket.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/opendevstack/pipeline/pkg/bitbucket"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/bitbucket"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 // createBitbucketInsightReport attaches a code insight report to the Git commit

diff --git a/cmd/aqua-scan/main.go b/cmd/aqua-scan/main.go
@@ -4,8 +4,8 @@ import (
 	"flag"
 	"os"
 
-	"github.com/opendevstack/pipeline/internal/image"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 	"golang.org/x/exp/slog"
 )
 

diff --git a/cmd/aqua-scan/steps.go b/cmd/aqua-scan/steps.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/image"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 	"golang.org/x/exp/slog"
 )
 

diff --git a/cmd/artifact-download/artifact_download.go b/cmd/artifact-download/artifact_download.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/pkg/artifact"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/cmd/artifact-download/artifact_download_test.go b/cmd/artifact-download/artifact_download_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/opendevstack/pipeline/internal/gittest"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/gittest"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 func TestGetODSContextFromDir(t *testing.T) {

diff --git a/cmd/artifact-download/main.go b/cmd/artifact-download/main.go
@@ -17,9 +17,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/installation"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/internal/installation"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 )

diff --git a/cmd/deploy-helm/helm.go b/cmd/deploy-helm/helm.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/google/shlex"
-	"github.com/opendevstack/pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/command"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/cmd/deploy-helm/main.go b/cmd/deploy-helm/main.go
@@ -5,8 +5,8 @@ import (
 	"io/fs"
 	"os"
 
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/cmd/deploy-helm/skopeo.go b/cmd/deploy-helm/skopeo.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
 )
 
 func (d *deployHelm) copyImage(imageArtifact artifact.Image, destRegistryToken string, outWriter, errWriter io.Writer) error {

diff --git a/cmd/deploy-helm/steps.go b/cmd/deploy-helm/steps.go
@@ -12,12 +12,12 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/internal/directory"
-	"github.com/opendevstack/pipeline/internal/file"
-	k "github.com/opendevstack/pipeline/internal/kubernetes"
-	"github.com/opendevstack/pipeline/pkg/artifact"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/directory"
+	"github.com/opendevstack/ods-pipeline/internal/file"
+	k "github.com/opendevstack/ods-pipeline/internal/kubernetes"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )

diff --git a/cmd/deploy-helm/steps_test.go b/cmd/deploy-helm/steps_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/opendevstack/pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
 )
 
 func TestArtifactFilename(t *testing.T) {

diff --git a/cmd/docs/main.go b/cmd/docs/main.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/docs"
-	"github.com/opendevstack/pipeline/internal/projectpath"
+	"github.com/opendevstack/ods-pipeline/internal/docs"
+	"github.com/opendevstack/ods-pipeline/internal/projectpath"
 )
 
 func main() {

diff --git a/cmd/finish/main.go b/cmd/finish/main.go
@@ -8,15 +8,15 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/kubernetes"
-	"github.com/opendevstack/pipeline/internal/notification"
-	"github.com/opendevstack/pipeline/internal/tekton"
-	"github.com/opendevstack/pipeline/pkg/artifact"
-	"github.com/opendevstack/pipeline/pkg/bitbucket"
-	"github.com/opendevstack/pipeline/pkg/config"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/kubernetes"
+	"github.com/opendevstack/ods-pipeline/internal/notification"
+	"github.com/opendevstack/ods-pipeline/internal/tekton"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/pkg/bitbucket"
+	"github.com/opendevstack/ods-pipeline/pkg/config"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 type options struct {

diff --git a/cmd/finish/main_test.go b/cmd/finish/main_test.go
@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/opendevstack/pipeline/pkg/config"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/config"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 func TestUploadArtifacts(t *testing.T) {

diff --git a/cmd/package-image/buildah.go b/cmd/package-image/buildah.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/google/shlex"
-	"github.com/opendevstack/pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/command"
 )
 
 const (

diff --git a/cmd/package-image/main.go b/cmd/package-image/main.go
@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/image"
-	"github.com/opendevstack/pipeline/pkg/artifact"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/pkg/artifact"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 const (

diff --git a/cmd/package-image/skopeo_tag.go b/cmd/package-image/skopeo_tag.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/image"
 )
 
 func (p *packageImage) skopeoTag(idt *image.IdentityWithTag, outWriter, errWriter io.Writer) error {

diff --git a/cmd/package-image/steps.go b/cmd/package-image/steps.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/google/shlex"
-	"github.com/opendevstack/pipeline/internal/directory"
-	"github.com/opendevstack/pipeline/internal/image"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/directory"
+	"github.com/opendevstack/ods-pipeline/internal/image"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 type PackageStep func(d *packageImage) (*packageImage, error)

diff --git a/cmd/package-image/trivy.go b/cmd/package-image/trivy.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/google/shlex"
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 const (

diff --git a/cmd/pipeline-manager/main.go b/cmd/pipeline-manager/main.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	kubernetesClient "github.com/opendevstack/pipeline/internal/kubernetes"
-	"github.com/opendevstack/pipeline/internal/manager"
-	tektonClient "github.com/opendevstack/pipeline/internal/tekton"
-	"github.com/opendevstack/pipeline/pkg/bitbucket"
-	"github.com/opendevstack/pipeline/pkg/logging"
+	kubernetesClient "github.com/opendevstack/ods-pipeline/internal/kubernetes"
+	"github.com/opendevstack/ods-pipeline/internal/manager"
+	tektonClient "github.com/opendevstack/ods-pipeline/internal/tekton"
+	"github.com/opendevstack/ods-pipeline/pkg/bitbucket"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
 	tekton "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 )
 

diff --git a/cmd/sonar/main.go b/cmd/sonar/main.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
-	"github.com/opendevstack/pipeline/pkg/sonar"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/sonar"
 )
 
 type options struct {

diff --git a/cmd/sonar/main_test.go b/cmd/sonar/main_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
-	"github.com/opendevstack/pipeline/pkg/sonar"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/sonar"
 )
 
 type fakeClient struct {

diff --git a/cmd/start/git.go b/cmd/start/git.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/command"
-	"github.com/opendevstack/pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
 )
 
 // gitCheckoutParams holds the parameters configuring the checkout.

diff --git a/cmd/start/main.go b/cmd/start/main.go
@@ -8,12 +8,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/opendevstack/pipeline/internal/tekton"
-	"github.com/opendevstack/pipeline/pkg/bitbucket"
-	"github.com/opendevstack/pipeline/pkg/config"
-	"github.com/opendevstack/pipeline/pkg/logging"
-	"github.com/opendevstack/pipeline/pkg/nexus"
-	"github.com/opendevstack/pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/internal/tekton"
+	"github.com/opendevstack/ods-pipeline/pkg/bitbucket"
+	"github.com/opendevstack/ods-pipeline/pkg/config"
+	"github.com/opendevstack/ods-pipeline/pkg/logging"
+	"github.com/opendevstack/ods-pipeline/pkg/nexus"
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
 )
 
 type options struct {

diff --git a/cmd/tasks/main.go b/cmd/tasks/main.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/opendevstack/pipeline/internal/projectpath"
-	"github.com/opendevstack/pipeline/internal/tasks"
+	"github.com/opendevstack/ods-pipeline/internal/projectpath"
+	"github.com/opendevstack/ods-pipeline/internal/tasks"
 )
 
 func main() {

diff --git a/docs/authoring-tasks.adoc b/docs/authoring-tasks.adoc
@@ -79,7 +79,7 @@ Of course this doesn't do anything useful in the CI pipeline. Typically, you'd n
 
 === Using pipeline context
 
-The pipeline generated by ODS is automatically fed with a few parameters which can be passed to each task. However, that would lead to a lot of boilerplate in `ods.yaml` as many parameters would need to be passed over and over again to each task. To avoid this, the parameters are cached by the `ods-start` task in the workspace in a `.ods` directory. For example, the `repository` parameter value is written to a file `.ods/repository`. This file and other similar files are forming the "pipeline context", which can be read by task authors to access this type of information easily. If you are writing your task logic in Go, you can conveniently read this cache into an `ODSContext` struct using `ReadCache` from the `github.com/opendevstack/pipeline/pkg/pipelinectxt` package.
+The pipeline generated by ODS is automatically fed with a few parameters which can be passed to each task. However, that would lead to a lot of boilerplate in `ods.yaml` as many parameters would need to be passed over and over again to each task. To avoid this, the parameters are cached by the `ods-start` task in the workspace in a `.ods` directory. For example, the `repository` parameter value is written to a file `.ods/repository`. This file and other similar files are forming the "pipeline context", which can be read by task authors to access this type of information easily. If you are writing your task logic in Go, you can conveniently read this cache into an `ODSContext` struct using `ReadCache` from the `github.com/opendevstack/ods-pipeline/pkg/pipelinectxt` package.
 
 === Handling artifacts
 

diff --git a/docs/development.adoc b/docs/development.adoc
@@ -32,12 +32,12 @@ As mentioned above, `make test` will run all tests. You may also run only a subs
 
 Individual task test can be executed like this:
 ```
-go test -run ^TestTaskODSBuildImage github.com/opendevstack/pipeline/test/tasks -v -count=1
+go test -run ^TestTaskODSBuildImage github.com/opendevstack/ods-pipeline/test/tasks -v -count=1
 ```
 
 Further, if you only want to run one test case from the map of test cases, this can be done like this:
 ```
-go test -run ^TestTaskODSBuildNPM/build_backend_javascript_app$ github.com/opendevstack/pipeline/test/tasks -v -count=1
+go test -run ^TestTaskODSBuildNPM/build_backend_javascript_app$ github.com/opendevstack/ods-pipeline/test/tasks -v -count=1
 ```
 
 Be aware that depending on the tested task, some local services (e.g. Bitbucket) need to run for the test to succeed. These are all started via `make prepare-local-env`, but more fine-grained control is possible too.
@@ -73,7 +73,7 @@ If you place this file in the root of the `ods-pipeline` repository, it will aut
 Finally, you need to run the tests, passing the configuration created earlier and the token of a serviceaccount with enough permissions in the target namespace:
 
 ```
-go test --tags=external -run ^TestTaskODSDeployHelmExternal$ github.com/opendevstack/pipeline/test/tasks -count=1 -v -external-cluster-token=*** -external-cluster-config=ods.external.yaml
+go test --tags=external -run ^TestTaskODSDeployHelmExternal$ github.com/opendevstack/ods-pipeline/test/tasks -count=1 -v -external-cluster-token=*** -external-cluster-config=ods.external.yaml
 ```
 
 The above command runs only the external deployment test, but you may also remove this limitation (by removing `-run ^TestTaskODSDeployHelmExternal$`) and run the whole test suite including the external deployment test.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/opendevstack/pipeline
+module github.com/opendevstack/ods-pipeline
 
 go 1.19
 

diff --git a/internal/docs/tasks.go b/internal/docs/tasks.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/opendevstack/pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/command"
 	tekton "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"sigs.k8s.io/yaml"
 )