allanger/shoebill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

WIP: Move public objects to the pkg dir

Browse Source
This commit is contained in:
Nikolai Rodionov 2023-10-12 11:53:58 +02:00
parent 6b4b170be1
commit 6a7e541b82
No known key found for this signature in database
GPG Key ID: 906851F91B1DA3EF
15 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/controller/controller.go
View File

@ -4,9 +4,6 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"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/providers"
"git.badhouseplants.net/allanger/shoebill/internal/utils/diff" "git.badhouseplants.net/allanger/shoebill/internal/utils/diff"
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
@ -14,6 +11,9 @@ import (
"git.badhouseplants.net/allanger/shoebill/internal/utils/kustomize" "git.badhouseplants.net/allanger/shoebill/internal/utils/kustomize"
"git.badhouseplants.net/allanger/shoebill/internal/utils/sopshelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/sopshelper"
"git.badhouseplants.net/allanger/shoebill/internal/utils/workdir" "git.badhouseplants.net/allanger/shoebill/internal/utils/workdir"
"git.badhouseplants.net/allanger/shoebill/pkg/config"
"git.badhouseplants.net/allanger/shoebill/pkg/lockfile"
"git.badhouseplants.net/allanger/shoebill/pkg/release"
) )
func ReadTheConfig(path string) (*config.Config, error) { func ReadTheConfig(path string) (*config.Config, error) {

5
internal/providers/flux.go
View File

@ -8,13 +8,12 @@ import (
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"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/diff"
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
"git.badhouseplants.net/allanger/shoebill/pkg/release"
"git.badhouseplants.net/allanger/shoebill/pkg/repository"
release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2" helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

6
internal/utils/diff/diff.go
View File

@ -3,9 +3,9 @@ package diff
import ( import (
"reflect" "reflect"
"git.badhouseplants.net/allanger/shoebill/internal/config/release" "git.badhouseplants.net/allanger/shoebill/pkg/lockfile"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/release"
"git.badhouseplants.net/allanger/shoebill/internal/lockfile" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
internal/utils/helmhelper/helm.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/action"

2
internal/utils/helmhelper/mock.go
View File

@ -1,6 +1,6 @@
package helmhelper package helmhelper
import "git.badhouseplants.net/allanger/shoebill/internal/config/repository" import "git.badhouseplants.net/allanger/shoebill/pkg/repository"
const MOCK_LATEST_VERSION = "v1.12.1" const MOCK_LATEST_VERSION = "v1.12.1"

2
internal/utils/helmhelper/types.go
View File

@ -1,6 +1,6 @@
package helmhelper package helmhelper
import "git.badhouseplants.net/allanger/shoebill/internal/config/repository" import "git.badhouseplants.net/allanger/shoebill/pkg/repository"
type Helmhelper interface { type Helmhelper interface {
FindLatestVersion(dir, chart string, repository repository.Repository) (string, error) FindLatestVersion(dir, chart string, repository repository.Repository) (string, error)

4
internal/config/cluster/cluster.go → pkg/cluster/cluster.go
View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"os" "os"
"git.badhouseplants.net/allanger/shoebill/internal/config/release"
"git.badhouseplants.net/allanger/shoebill/internal/lockfile"
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
"git.badhouseplants.net/allanger/shoebill/pkg/lockfile"
"git.badhouseplants.net/allanger/shoebill/pkg/release"
) )
type Cluster struct { type Cluster struct {

0
internal/config/cluster/cluster_test.go → pkg/cluster/cluster_test.go
View File

6
internal/config/config.go → pkg/config/config.go
View File

@ -3,9 +3,9 @@ package config
import ( import (
"os" "os"
"git.badhouseplants.net/allanger/shoebill/internal/config/cluster" "git.badhouseplants.net/allanger/shoebill/pkg/cluster"
"git.badhouseplants.net/allanger/shoebill/internal/config/release" "git.badhouseplants.net/allanger/shoebill/pkg/release"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

4
internal/config/config_test.go → pkg/config/config_test.go
View File

@ -4,8 +4,8 @@ import (
"os" "os"
"testing" "testing"
"git.badhouseplants.net/allanger/shoebill/internal/config" "git.badhouseplants.net/allanger/shoebill/pkg/config"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
internal/lockfile/lockfile.go → pkg/lockfile/lockfile.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

4
internal/config/release/release.go → pkg/release/release.go
View File

@ -5,10 +5,10 @@ import (
"reflect" "reflect"
"strings" "strings"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository"
"git.badhouseplants.net/allanger/shoebill/internal/lockfile"
"git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper"
"git.badhouseplants.net/allanger/shoebill/internal/utils/sopshelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/sopshelper"
"git.badhouseplants.net/allanger/shoebill/pkg/lockfile"
"git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
internal/config/release/release_test.go → pkg/release/release_test.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"testing" "testing"
"git.badhouseplants.net/allanger/shoebill/internal/config/release"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository"
"git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/helmhelper"
"git.badhouseplants.net/allanger/shoebill/pkg/release"
"git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

0
internal/config/repository/repository.go → pkg/repository/repository.go
View File

2
internal/config/repository/repository_test.go → pkg/repository/repository_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"git.badhouseplants.net/allanger/shoebill/internal/config/repository" "git.badhouseplants.net/allanger/shoebill/pkg/repository"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )