From 936d9f132dacda4d575cb2f672c8349ccd4e8792 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 2 Aug 2023 17:00:34 +0200 Subject: [PATCH] Rename the project to shoebill --- .drone.yml | 10 +++++----- .gitignore | 2 +- README.md | 2 +- cmd/root.go | 8 ++++---- cmd/sync.go | 2 +- examples/one-config/giops.config.yaml | 4 ++-- go.mod | 2 +- internal/config/cluster/cluster.go | 8 ++++---- internal/config/config.go | 6 +++--- internal/config/config_test.go | 4 ++-- internal/config/release/release.go | 6 +++--- internal/config/release/release_test.go | 6 +++--- internal/config/repository/repository_test.go | 2 +- internal/controller/controller.go | 18 +++++++++--------- internal/lockfile/lockfile.go | 4 ++-- internal/providers/flux.go | 8 ++++---- internal/providers/types.go | 4 ++-- internal/utils/diff/diff.go | 6 +++--- internal/utils/helmhelper/helm.go | 2 +- internal/utils/helmhelper/mock.go | 2 +- internal/utils/helmhelper/types.go | 2 +- internal/utils/kustomize/kustomize.go | 2 +- internal/utils/workdir/workdir.go | 2 +- main.go | 2 +- scripts/build | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.drone.yml b/.drone.yml index ab10cf0..ee9ec7c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,22 +40,22 @@ steps: environment: GITEA_TOKEN: from_secret: GITEA_TOKEN - BUILDAH_REG: git.badhouseplants.net/allanger/giops-builder + BUILDAH_REG: git.badhouseplants.net/allanger/shoebill-builder commands: - ./build/build - name: Cleanup the registry - image: git.badhouseplants.net/allanger/giops-builder:${DRONE_COMMIT_SHA} + image: git.badhouseplants.net/allanger/shoebill-builder:${DRONE_COMMIT_SHA} privileged: true environment: GITEA_TOKEN: from_secret: GITEA_TOKEN - GITEA_PACKAGE: giops-builder + GITEA_PACKAGE: shoebill-builder commands: - cleanup - - name: Build giops container and cleanuo the registry - image: git.badhouseplants.net/allanger/giops-builder:${DRONE_COMMIT_SHA} + - name: Build shoebill container and cleanuo the registry + image: git.badhouseplants.net/allanger/shoebill-builder:${DRONE_COMMIT_SHA} privileged: true environment: GITEA_TOKEN: diff --git a/.gitignore b/.gitignore index 717b83e..5f32ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.dll *.so *.dylib -giops +shoebill # Test binary, built with `go test -c` *.test diff --git a/README.md b/README.md index 1ace70e..c4c3b00 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# giops +# shoebill A templater for the gitops setup diff --git a/cmd/root.go b/cmd/root.go index f2c0550..7ccfc00 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,13 +5,13 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/build" + "git.badhouseplants.net/allanger/shoebill/internal/build" "github.com/spf13/cobra" ) var fullVersion = fmt.Sprintf("%s - %s", build.Version, build.CommitHash) var longDescription = `--- -Giops is just GitOps with a glottal T +shoebill is just GitOps with a glottal T It's a tool that is supposed to help engineers follow the GitOps practies without fighting with GitOps being inapplicable to the real world. @@ -28,8 +28,8 @@ Version: %s (build on %s) var ( rootCmd = &cobra.Command{ - Use: "giops", - Short: "giops – GitOps without pain, kinda", + Use: "shoebill", + Short: "shoebill – GitOps without pain, kinda", Long: fmt.Sprintf(longDescription, fullVersion, build.BuildTime), SilenceErrors: true, SilenceUsage: true, diff --git a/cmd/sync.go b/cmd/sync.go index 2a18732..706c1f0 100644 --- a/cmd/sync.go +++ b/cmd/sync.go @@ -1,7 +1,7 @@ package cmd import ( - "git.badhouseplants.net/allanger/giops/internal/controller" + "git.badhouseplants.net/allanger/shoebill/internal/controller" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/examples/one-config/giops.config.yaml b/examples/one-config/giops.config.yaml index ecc8a31..b20da88 100644 --- a/examples/one-config/giops.config.yaml +++ b/examples/one-config/giops.config.yaml @@ -23,8 +23,8 @@ releases: version: latest clusters: - - name: cluster-giops-test - git: git@git.badhouseplants.net:allanger/giops-test.git + - name: cluster-shoebill-test + git: git@git.badhouseplants.net:allanger/shoebill-test.git provider: flux releases: - postgresql-server diff --git a/go.mod b/go.mod index b88ba82..be838d7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.badhouseplants.net/allanger/giops +module git.badhouseplants.net/allanger/shoebill go 1.20 diff --git a/internal/config/cluster/cluster.go b/internal/config/cluster/cluster.go index 4645835..db4fea4 100644 --- a/internal/config/cluster/cluster.go +++ b/internal/config/cluster/cluster.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/lockfile" - "git.badhouseplants.net/allanger/giops/internal/utils/githelper" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/lockfile" + "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" ) type Cluster struct { @@ -46,7 +46,7 @@ func (c *Cluster) BootstrapRepo(gh githelper.Githelper, workdir string, dry bool if err != nil { return err } - if err := gh.AddAllAndCommit(workdir, "Bootstrap the Giops repo"); err != nil { + if err := gh.AddAllAndCommit(workdir, "Bootstrap the shoebill repo"); err != nil { return err } if !dry { diff --git a/internal/config/config.go b/internal/config/config.go index 9e5048d..3b18262 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,9 +3,9 @@ package config import ( "os" - "git.badhouseplants.net/allanger/giops/internal/config/cluster" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/config/cluster" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 6b72e98..01feb51 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "git.badhouseplants.net/allanger/giops/internal/config" - "git.badhouseplants.net/allanger/giops/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/config" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" "github.com/stretchr/testify/assert" ) diff --git a/internal/config/release/release.go b/internal/config/release/release.go index 12aa2b2..41b3211 100644 --- a/internal/config/release/release.go +++ b/internal/config/release/release.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "git.badhouseplants.net/allanger/giops/internal/config/repository" - "git.badhouseplants.net/allanger/giops/internal/lockfile" - "git.badhouseplants.net/allanger/giops/internal/utils/helmhelper" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/lockfile" + "git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper" "github.com/sirupsen/logrus" ) diff --git a/internal/config/release/release_test.go b/internal/config/release/release_test.go index ac3c0f5..786d9ae 100644 --- a/internal/config/release/release_test.go +++ b/internal/config/release/release_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/config/repository" - "git.badhouseplants.net/allanger/giops/internal/utils/helmhelper" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" ) diff --git a/internal/config/repository/repository_test.go b/internal/config/repository/repository_test.go index e67190a..1e3849c 100644 --- a/internal/config/repository/repository_test.go +++ b/internal/config/repository/repository_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "git.badhouseplants.net/allanger/giops/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 4dbf27e..563f77f 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -3,15 +3,15 @@ package controller import ( "fmt" - "git.badhouseplants.net/allanger/giops/internal/config" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/lockfile" - "git.badhouseplants.net/allanger/giops/internal/providers" - "git.badhouseplants.net/allanger/giops/internal/utils/diff" - "git.badhouseplants.net/allanger/giops/internal/utils/githelper" - "git.badhouseplants.net/allanger/giops/internal/utils/helmhelper" - "git.badhouseplants.net/allanger/giops/internal/utils/kustomize" - "git.badhouseplants.net/allanger/giops/internal/utils/workdir" + "git.badhouseplants.net/allanger/shoebill/internal/config" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/lockfile" + "git.badhouseplants.net/allanger/shoebill/internal/providers" + "git.badhouseplants.net/allanger/shoebill/internal/utils/diff" + "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" + "git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper" + "git.badhouseplants.net/allanger/shoebill/internal/utils/kustomize" + "git.badhouseplants.net/allanger/shoebill/internal/utils/workdir" ) func ReadTheConfig(path string) (*config.Config, error) { diff --git a/internal/lockfile/lockfile.go b/internal/lockfile/lockfile.go index db55750..9a2f463 100644 --- a/internal/lockfile/lockfile.go +++ b/internal/lockfile/lockfile.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) -const LOCKFILE_NAME = "giops.lock.yaml" +const LOCKFILE_NAME = "shoebill.lock.yaml" type LockEntry struct { Chart string diff --git a/internal/providers/flux.go b/internal/providers/flux.go index 68c7632..52ddcb7 100644 --- a/internal/providers/flux.go +++ b/internal/providers/flux.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/config/repository" - "git.badhouseplants.net/allanger/giops/internal/utils/diff" - "git.badhouseplants.net/allanger/giops/internal/utils/githelper" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/utils/diff" + "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/providers/types.go b/internal/providers/types.go index 4e300b6..41bf2dd 100644 --- a/internal/providers/types.go +++ b/internal/providers/types.go @@ -3,8 +3,8 @@ package providers import ( "fmt" - "git.badhouseplants.net/allanger/giops/internal/utils/diff" - "git.badhouseplants.net/allanger/giops/internal/utils/githelper" + "git.badhouseplants.net/allanger/shoebill/internal/utils/diff" + "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" ) type Provider interface { diff --git a/internal/utils/diff/diff.go b/internal/utils/diff/diff.go index 45774d6..5e6b2b1 100644 --- a/internal/utils/diff/diff.go +++ b/internal/utils/diff/diff.go @@ -3,9 +3,9 @@ package diff import ( "reflect" - "git.badhouseplants.net/allanger/giops/internal/config/release" - "git.badhouseplants.net/allanger/giops/internal/config/repository" - "git.badhouseplants.net/allanger/giops/internal/lockfile" + "git.badhouseplants.net/allanger/shoebill/internal/config/release" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/lockfile" "github.com/sirupsen/logrus" ) diff --git a/internal/utils/helmhelper/helm.go b/internal/utils/helmhelper/helm.go index dff4509..3367471 100644 --- a/internal/utils/helmhelper/helm.go +++ b/internal/utils/helmhelper/helm.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/config/repository" + "git.badhouseplants.net/allanger/shoebill/internal/config/repository" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" "helm.sh/helm/v3/pkg/action" diff --git a/internal/utils/helmhelper/mock.go b/internal/utils/helmhelper/mock.go index 4998bb0..48dfea2 100644 --- a/internal/utils/helmhelper/mock.go +++ b/internal/utils/helmhelper/mock.go @@ -1,6 +1,6 @@ package helmhelper -import "git.badhouseplants.net/allanger/giops/internal/config/repository" +import "git.badhouseplants.net/allanger/shoebill/internal/config/repository" const MOCK_LATEST_VERSION = "v1.12.1" diff --git a/internal/utils/helmhelper/types.go b/internal/utils/helmhelper/types.go index 2dde836..dc7dc57 100644 --- a/internal/utils/helmhelper/types.go +++ b/internal/utils/helmhelper/types.go @@ -1,6 +1,6 @@ package helmhelper -import "git.badhouseplants.net/allanger/giops/internal/config/repository" +import "git.badhouseplants.net/allanger/shoebill/internal/config/repository" type Helmhelper interface { FindLatestVersion(dir, chart string, repository repository.Repository) (string, error) diff --git a/internal/utils/kustomize/kustomize.go b/internal/utils/kustomize/kustomize.go index 0438090..b1fb203 100644 --- a/internal/utils/kustomize/kustomize.go +++ b/internal/utils/kustomize/kustomize.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "git.badhouseplants.net/allanger/giops/internal/utils/githelper" + "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" kustomize_types "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/yaml" ) diff --git a/internal/utils/workdir/workdir.go b/internal/utils/workdir/workdir.go index be362c4..b044d9a 100644 --- a/internal/utils/workdir/workdir.go +++ b/internal/utils/workdir/workdir.go @@ -14,7 +14,7 @@ func CreateWorkdir(path string) (workdir string, err error) { } else { // Create a temporary dir // It should be removed after the execution - workdir, err = os.MkdirTemp("", "giops") + workdir, err = os.MkdirTemp("", "shoebill") if err != nil { return "", err } diff --git a/main.go b/main.go index 2dd9c7a..d26347f 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "context" - "git.badhouseplants.net/allanger/giops/cmd" + "git.badhouseplants.net/allanger/shoebill/cmd" "github.com/sirupsen/logrus" ) diff --git a/scripts/build b/scripts/build index 6ac11fc..1ca7e4f 100755 --- a/scripts/build +++ b/scripts/build @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PACKAGE="git.badhouseplants.net/allanger/giops" +PACKAGE="git.badhouseplants.net/allanger/shoebill" VERSION="$(git describe --tags --always --abbrev=0 --match='v[0-9]*.[0-9]*.[0-9]*' 2> /dev/null | sed 's/^.//')" COMMIT_HASH="$(git rev-parse --short HEAD)" BUILD_TIMESTAMP=$(date '+%Y-%m-%dT%H:%M:%S')