cli: move cli/internal libraries (#2623)

* cli: move internal packages Signed-off-by: Moritz Sanft <[email protected]> * cli: fix buildfiles Signed-off-by: Moritz Sanft <[email protected]> * bazel: fix exclude dir Signed-off-by: Moritz Sanft <[email protected]> * cli: move back libraries that will not be used by TF provider Signed-off-by: Moritz Sanft <[email protected]> --------- Signed-off-by: Moritz Sanft <[email protected]>
edgelesssys · Nov 22, 2023 · 968cdc1 · 968cdc1
1 parent d3ce6ff
commit 968cdc1
Show file tree

Hide file tree

Showing 741 changed files with 122 additions and 101 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Link Checker
         uses: lycheeverse/lychee-action@ec3ed119d4f44ad2673a7232460dc7dff59d2421 # v1.8.0
         with:
-          args: "--verbose --no-progress --max-concurrency 5 --exclude-path './cli/internal/helm/charts/cilium' './**/*.md' './**/*.html'"
+          args: "--verbose --no-progress --max-concurrency 5 --exclude-path './internal/helm/charts/cilium' './**/*.md' './**/*.html'"
           fail: true
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/test-unittest.yml b/.github/workflows/test-unittest.yml
@@ -14,7 +14,7 @@ on:
       - ".github/workflows/test-unittest.yml"
   pull_request:
     paths:
-      - "cli/internal/helm/**"
+      - "internal/helm/**"
       - "**.go"
       - "**/go.mod"
       - "**/go.sum"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -5,15 +5,15 @@
 /bazel/container @katexochen
 /bazel/sh @katexochen
 /bootstrapper @3u13r
-/cli/internal/cloudcmd @daniel-weisse
-/cli/internal/cmd/upgrade* @derpsteb
-/cli/internal/featureset @malt3
-/cli/internal/helm @derpsteb
-/cli/internal/kubecmd @daniel-weisse
-/cli/internal/libvirt @daniel-weisse
-/cli/internal/terraform @elchead
-/cli/internal/upgrade @elchead
-/cli/internal/state @elchead
+/internal/cloudcmd @daniel-weisse
+/internal/cmd/upgrade* @derpsteb
+/internal/featureset @malt3
+/internal/helm @derpsteb
+/internal/kubecmd @daniel-weisse
+/internal/libvirt @daniel-weisse
+/internal/terraform @elchead
+/internal/upgrade @elchead
+/internal/state @elchead
 /csi @daniel-weisse
 /debugd @malt3
 /disk-mapper @daniel-weisse

diff --git a/bazel/ci/shellcheck.sh.in b/bazel/ci/shellcheck.sh.in
@@ -25,7 +25,7 @@ readarray -t <<< "${scriptsStr}"
 scripts=("${MAPFILE[@]}")
 
 excludeDirs=(
-  "cli/internal/helm/charts/cilium"
+  "internal/helm/charts/cilium"
   "build"
   "docs/node_modules"
 )

diff --git a/bazel/ci/shfmt.sh.in b/bazel/ci/shfmt.sh.in
@@ -23,7 +23,7 @@ readarray -t <<< "${scriptsStr}"
 scripts=("${MAPFILE[@]}")
 
 excludeDirs=(
-  "cli/internal/helm/charts/cilium"
+  "internal/helm/charts/cilium"
   "build"
   "docs/node_modules"
 )

diff --git a/cli/internal/cloudcmd/BUILD.bazel b/cli/internal/cloudcmd/BUILD.bazel
@@ -20,7 +20,6 @@ go_library(
     visibility = ["//cli:__subpackages__"],
     deps = [
         "//cli/internal/libvirt",
-        "//cli/internal/state",
         "//cli/internal/terraform",
         "//internal/atls",
         "//internal/attestation/choose",
@@ -36,6 +35,7 @@ go_library(
         "//internal/imagefetcher",
         "//internal/maa",
         "//internal/role",
+        "//internal/state",
         "@com_github_spf13_cobra//:cobra",
     ],
 )
@@ -54,7 +54,6 @@ go_test(
     ],
     embed = [":cloudcmd"],
     deps = [
-        "//cli/internal/state",
         "//cli/internal/terraform",
         "//internal/attestation/measurements",
         "//internal/attestation/variant",
@@ -63,6 +62,7 @@ go_test(
         "//internal/config",
         "//internal/constants",
         "//internal/file",
+        "//internal/state",
         "@com_github_spf13_afero//:afero",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",

diff --git a/cli/internal/cloudcmd/apply.go b/cli/internal/cloudcmd/apply.go
@@ -14,14 +14,14 @@ import (
 	"strings"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/libvirt"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/imagefetcher"
 	"github.com/edgelesssys/constellation/v2/internal/maa"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 )
 
 const (

diff --git a/cli/internal/cloudcmd/clients.go b/cli/internal/cloudcmd/clients.go
@@ -10,10 +10,10 @@ import (
 	"context"
 	"io"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 )
 
 // imageFetcher gets an image reference from the versionsapi.

diff --git a/cli/internal/cloudcmd/clients_test.go b/cli/internal/cloudcmd/clients_test.go
@@ -11,10 +11,10 @@ import (
 	"io"
 	"testing"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 
 	"go.uber.org/goleak"
 )

diff --git a/cli/internal/cmd/BUILD.bazel b/cli/internal/cmd/BUILD.bazel
@@ -50,11 +50,7 @@ go_library(
         "//bootstrapper/initproto",
         "//cli/internal/cloudcmd",
         "//cli/internal/cmd/pathprefix",
-        "//cli/internal/featureset",
-        "//cli/internal/helm",
-        "//cli/internal/kubecmd",
         "//cli/internal/libvirt",
-        "//cli/internal/state",
         "//cli/internal/terraform",
         "//disk-mapper/recoverproto",
         "//internal/api/attestationconfigapi",
@@ -72,18 +68,22 @@ go_library(
         "//internal/config/migration",
         "//internal/constants",
         "//internal/crypto",
+        "//internal/featureset",
         "//internal/file",
         "//internal/grpc/dialer",
         "//internal/grpc/grpclog",
         "//internal/grpc/retry",
+        "//internal/helm",
         "//internal/kms/uri",
+        "//internal/kubecmd",
         "//internal/license",
         "//internal/logger",
         "//internal/maa",
         "//internal/retry",
         "//internal/semver",
         "//internal/sigstore",
         "//internal/sigstore/keyselect",
+        "//internal/state",
         "//internal/verify",
         "//internal/versions",
         "//verify/verifyproto",
@@ -149,9 +149,6 @@ go_test(
         "//bootstrapper/initproto",
         "//cli/internal/cloudcmd",
         "//cli/internal/cmd/pathprefix",
-        "//cli/internal/helm",
-        "//cli/internal/kubecmd",
-        "//cli/internal/state",
         "//cli/internal/terraform",
         "//disk-mapper/recoverproto",
         "//internal/api/attestationconfigapi",
@@ -169,11 +166,14 @@ go_test(
         "//internal/grpc/atlscredentials",
         "//internal/grpc/dialer",
         "//internal/grpc/testdialer",
+        "//internal/helm",
         "//internal/kms/uri",
+        "//internal/kubecmd",
         "//internal/license",
         "//internal/logger",
         "//internal/semver",
         "//internal/sigstore",
+        "//internal/state",
         "//internal/versions",
         "//operators/constellation-node-operator/api/v1alpha1",
         "//verify/verifyproto",

diff --git a/cli/internal/cmd/apply.go b/cli/internal/cmd/apply.go
@@ -20,9 +20,6 @@ import (
 	"time"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/helm"
-	"github.com/edgelesssys/constellation/v2/cli/internal/kubecmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi"
 	"github.com/edgelesssys/constellation/v2/internal/atls"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
@@ -32,7 +29,10 @@ import (
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/dialer"
+	"github.com/edgelesssys/constellation/v2/internal/helm"
+	"github.com/edgelesssys/constellation/v2/internal/kubecmd"
 	"github.com/edgelesssys/constellation/v2/internal/license"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

diff --git a/cli/internal/cmd/apply_test.go b/cli/internal/cmd/apply_test.go
@@ -16,15 +16,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/helm"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/gcpshared"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
+	"github.com/edgelesssys/constellation/v2/internal/helm"
 	"github.com/edgelesssys/constellation/v2/internal/kms/uri"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/spf13/afero"
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"

diff --git a/cli/internal/cmd/applyhelm.go b/cli/internal/cmd/applyhelm.go
@@ -13,12 +13,12 @@ import (
 	"path/filepath"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/helm"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/compatibility"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
+	"github.com/edgelesssys/constellation/v2/internal/helm"
 	"github.com/edgelesssys/constellation/v2/internal/kms/uri"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cli/internal/cmd/applyinit.go b/cli/internal/cmd/applyinit.go
@@ -22,14 +22,14 @@ import (
 
 	"github.com/edgelesssys/constellation/v2/bootstrapper/initproto"
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/crypto"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	grpcRetry "github.com/edgelesssys/constellation/v2/internal/grpc/retry"
 	"github.com/edgelesssys/constellation/v2/internal/kms/uri"
 	"github.com/edgelesssys/constellation/v2/internal/retry"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

diff --git a/cli/internal/cmd/applyterraform.go b/cli/internal/cmd/applyterraform.go
@@ -13,10 +13,10 @@ import (
 	"path/filepath"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cli/internal/cmd/cloud.go b/cli/internal/cmd/cloud.go
@@ -10,11 +10,11 @@ import (
 	"context"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/gcpshared"
 	"github.com/edgelesssys/constellation/v2/internal/config"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 )
 
 type cloudApplier interface {

diff --git a/cli/internal/cmd/cloud_test.go b/cli/internal/cmd/cloud_test.go
@@ -11,11 +11,11 @@ import (
 	"testing"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/gcpshared"
 	"github.com/edgelesssys/constellation/v2/internal/config"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"go.uber.org/goleak"
 )
 

diff --git a/cli/internal/cmd/configfetchmeasurements.go b/cli/internal/cmd/configfetchmeasurements.go
@@ -14,12 +14,12 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/featureset"
 	"github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi"
 	"github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/measurements"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
+	"github.com/edgelesssys/constellation/v2/internal/featureset"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/sigstore"
 	"github.com/edgelesssys/constellation/v2/internal/sigstore/keyselect"

diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go
@@ -10,12 +10,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

diff --git a/cli/internal/cmd/configgenerate_test.go b/cli/internal/cmd/configgenerate_test.go
@@ -11,13 +11,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"

diff --git a/cli/internal/cmd/create_test.go b/cli/internal/cmd/create_test.go
@@ -11,13 +11,13 @@ import (
 	"context"
 	"testing"
 
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
 	consemver "github.com/edgelesssys/constellation/v2/internal/semver"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/cli/internal/cmd/init.go b/cli/internal/cmd/init.go
@@ -23,13 +23,13 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/edgelesssys/constellation/v2/bootstrapper/initproto"
-	"github.com/edgelesssys/constellation/v2/cli/internal/helm"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/file"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/grpclog"
+	"github.com/edgelesssys/constellation/v2/internal/helm"
 	"github.com/edgelesssys/constellation/v2/internal/kms/uri"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 )
 
 // NewInitCmd returns a new cobra.Command for the init command.

diff --git a/cli/internal/cmd/init_test.go b/cli/internal/cmd/init_test.go
@@ -22,8 +22,6 @@ import (
 
 	"github.com/edgelesssys/constellation/v2/bootstrapper/initproto"
 	"github.com/edgelesssys/constellation/v2/cli/internal/cmd/pathprefix"
-	"github.com/edgelesssys/constellation/v2/cli/internal/helm"
-	"github.com/edgelesssys/constellation/v2/cli/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/atls"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/measurements"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
@@ -35,10 +33,12 @@ import (
 	"github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/dialer"
 	"github.com/edgelesssys/constellation/v2/internal/grpc/testdialer"
+	"github.com/edgelesssys/constellation/v2/internal/helm"
 	"github.com/edgelesssys/constellation/v2/internal/kms/uri"
 	"github.com/edgelesssys/constellation/v2/internal/license"
 	"github.com/edgelesssys/constellation/v2/internal/logger"
 	"github.com/edgelesssys/constellation/v2/internal/semver"
+	"github.com/edgelesssys/constellation/v2/internal/state"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"