From 272584a34c4068d2c825c772acf0d9d08490130a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <66256922+daniel-weisse@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:27:04 +0100 Subject: [PATCH] constellation-lib: move state and featureset packages (#2682) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- CODEOWNERS | 4 ++-- cli/internal/cloudcmd/BUILD.bazel | 4 ++-- cli/internal/cloudcmd/apply.go | 2 +- cli/internal/cloudcmd/clients.go | 2 +- cli/internal/cloudcmd/clients_test.go | 2 +- cli/internal/cmd/BUILD.bazel | 6 +++--- cli/internal/cmd/apply.go | 2 +- cli/internal/cmd/apply_test.go | 2 +- cli/internal/cmd/applyhelm.go | 2 +- cli/internal/cmd/applyinit.go | 2 +- cli/internal/cmd/applyterraform.go | 2 +- cli/internal/cmd/cloud.go | 2 +- cli/internal/cmd/cloud_test.go | 2 +- cli/internal/cmd/configfetchmeasurements.go | 2 +- cli/internal/cmd/configgenerate.go | 2 +- cli/internal/cmd/configgenerate_test.go | 2 +- cli/internal/cmd/create_test.go | 2 +- cli/internal/cmd/init_test.go | 2 +- cli/internal/cmd/minidown.go | 2 +- cli/internal/cmd/miniup.go | 2 +- cli/internal/cmd/recover.go | 2 +- cli/internal/cmd/terminate_test.go | 2 +- cli/internal/cmd/upgradeapply_test.go | 2 +- cli/internal/cmd/upgradecheck.go | 2 +- cli/internal/cmd/verify.go | 2 +- cli/internal/cmd/verify_test.go | 2 +- cli/internal/terraform/BUILD.bazel | 4 ++-- cli/internal/terraform/terraform.go | 2 +- cli/internal/terraform/terraform_test.go | 2 +- hack/gocoverage/main_test.go | 6 +++--- internal/constellation/BUILD.bazel | 4 ++-- internal/constellation/applyinit.go | 2 +- internal/constellation/applyinit_test.go | 2 +- internal/{ => constellation}/featureset/BUILD.bazel | 2 +- internal/{ => constellation}/featureset/featureset.go | 0 .../{ => constellation}/featureset/featureset_enterprise.go | 0 internal/{ => constellation}/featureset/featureset_oss.go | 0 internal/constellation/helm.go | 2 +- internal/constellation/helm/BUILD.bazel | 4 ++-- internal/constellation/helm/helm.go | 2 +- internal/constellation/helm/helm_test.go | 2 +- internal/constellation/helm/loader.go | 2 +- internal/constellation/helm/loader_test.go | 2 +- internal/constellation/helm/overrides.go | 2 +- internal/{ => constellation}/state/BUILD.bazel | 2 +- internal/{ => constellation}/state/state.go | 0 internal/{ => constellation}/state/state_doc.go | 0 internal/{ => constellation}/state/state_test.go | 0 internal/{ => constellation}/state/validation_test.go | 0 49 files changed, 51 insertions(+), 51 deletions(-) rename internal/{ => constellation}/featureset/BUILD.bazel (91%) rename internal/{ => constellation}/featureset/featureset.go (100%) rename internal/{ => constellation}/featureset/featureset_enterprise.go (100%) rename internal/{ => constellation}/featureset/featureset_oss.go (100%) rename internal/{ => constellation}/state/BUILD.bazel (97%) rename internal/{ => constellation}/state/state.go (100%) rename internal/{ => constellation}/state/state_doc.go (100%) rename internal/{ => constellation}/state/state_test.go (100%) rename internal/{ => constellation}/state/validation_test.go (100%) diff --git a/CODEOWNERS b/CODEOWNERS index d67d0be49..88eebbd9a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -37,7 +37,7 @@ /internal/containerimage @malt3 /internal/crypto @thomasten /internal/cryptsetup @daniel-weisse -/internal/featureset @malt3 +/internal/constellation/featureset @malt3 /internal/file @daniel-weisse /internal/grpc @thomasten /internal/constellation/helm @derpsteb @@ -52,7 +52,7 @@ /internal/retry @katexochen /internal/semver @derpsteb /internal/sigstore @elchead -/internal/state @elchead +/internal/constellation/state @elchead /internal/staticupload @malt3 /internal/versions @3u13r /joinservice @daniel-weisse diff --git a/cli/internal/cloudcmd/BUILD.bazel b/cli/internal/cloudcmd/BUILD.bazel index c52a64755..8883e5ced 100644 --- a/cli/internal/cloudcmd/BUILD.bazel +++ b/cli/internal/cloudcmd/BUILD.bazel @@ -27,12 +27,12 @@ go_library( "//internal/cloud/openstack", "//internal/config", "//internal/constants", + "//internal/constellation/state", "//internal/file", "//internal/imagefetcher", "//internal/maa", "//internal/mpimage", "//internal/role", - "//internal/state", ], ) @@ -55,8 +55,8 @@ go_test( "//internal/cloud/gcpshared", "//internal/config", "//internal/constants", + "//internal/constellation/state", "//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 index 2398f2b7c..2f419d41a 100644 --- a/cli/internal/cloudcmd/apply.go +++ b/cli/internal/cloudcmd/apply.go @@ -18,10 +18,10 @@ import ( "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/constellation/state" "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 index e3e20b02f..75858f19c 100644 --- a/cli/internal/cloudcmd/clients.go +++ b/cli/internal/cloudcmd/clients.go @@ -13,7 +13,7 @@ import ( "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" + "github.com/edgelesssys/constellation/v2/internal/constellation/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 index 7bd82f286..ec229156c 100644 --- a/cli/internal/cloudcmd/clients_test.go +++ b/cli/internal/cloudcmd/clients_test.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "go.uber.org/goleak" ) diff --git a/cli/internal/cmd/BUILD.bazel b/cli/internal/cmd/BUILD.bazel index c3cc87385..925e021a5 100644 --- a/cli/internal/cmd/BUILD.bazel +++ b/cli/internal/cmd/BUILD.bazel @@ -73,10 +73,11 @@ go_library( "//internal/config/migration", "//internal/constants", "//internal/constellation", + "//internal/constellation/featureset", "//internal/constellation/helm", "//internal/constellation/kubecmd", + "//internal/constellation/state", "//internal/crypto", - "//internal/featureset", "//internal/file", "//internal/grpc/dialer", "//internal/grpc/retry", @@ -90,7 +91,6 @@ go_library( "//internal/semver", "//internal/sigstore", "//internal/sigstore/keyselect", - "//internal/state", "//internal/verify", "//internal/versions", "//verify/verifyproto", @@ -167,6 +167,7 @@ go_test( "//internal/constellation", "//internal/constellation/helm", "//internal/constellation/kubecmd", + "//internal/constellation/state", "//internal/crypto", "//internal/crypto/testvector", "//internal/file", @@ -176,7 +177,6 @@ go_test( "//internal/kms/uri", "//internal/logger", "//internal/semver", - "//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 index e72966798..a54efb072 100644 --- a/cli/internal/cmd/apply.go +++ b/cli/internal/cmd/apply.go @@ -32,12 +32,12 @@ import ( "github.com/edgelesssys/constellation/v2/internal/constellation" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" "github.com/edgelesssys/constellation/v2/internal/constellation/kubecmd" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" "github.com/edgelesssys/constellation/v2/internal/imagefetcher" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "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/spf13/cobra" diff --git a/cli/internal/cmd/apply_test.go b/cli/internal/cmd/apply_test.go index c8a7a5e96..26ba1e376 100644 --- a/cli/internal/cmd/apply_test.go +++ b/cli/internal/cmd/apply_test.go @@ -25,10 +25,10 @@ import ( "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "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 index 00be7491b..74e65ff5a 100644 --- a/cli/internal/cmd/applyhelm.go +++ b/cli/internal/cmd/applyhelm.go @@ -17,8 +17,8 @@ import ( "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "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 index 88479da0e..bcb8da3db 100644 --- a/cli/internal/cmd/applyinit.go +++ b/cli/internal/cmd/applyinit.go @@ -22,9 +22,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/kms/uri" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" ) diff --git a/cli/internal/cmd/applyterraform.go b/cli/internal/cmd/applyterraform.go index ad0f44888..fe65d8627 100644 --- a/cli/internal/cmd/applyterraform.go +++ b/cli/internal/cmd/applyterraform.go @@ -16,7 +16,7 @@ import ( "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/edgelesssys/constellation/v2/internal/constellation/state" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/cloud.go b/cli/internal/cmd/cloud.go index be75d0de2..1783713e9 100644 --- a/cli/internal/cmd/cloud.go +++ b/cli/internal/cmd/cloud.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" ) type cloudApplier interface { diff --git a/cli/internal/cmd/cloud_test.go b/cli/internal/cmd/cloud_test.go index 9049d3839..ceb8636a5 100644 --- a/cli/internal/cmd/cloud_test.go +++ b/cli/internal/cmd/cloud_test.go @@ -15,7 +15,7 @@ import ( "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" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "go.uber.org/goleak" ) diff --git a/cli/internal/cmd/configfetchmeasurements.go b/cli/internal/cmd/configfetchmeasurements.go index 705076846..14dd11c87 100644 --- a/cli/internal/cmd/configfetchmeasurements.go +++ b/cli/internal/cmd/configfetchmeasurements.go @@ -21,7 +21,7 @@ import ( "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/featureset" + "github.com/edgelesssys/constellation/v2/internal/constellation/featureset" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/sigstore" "github.com/spf13/afero" diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go index e85cb2bb7..d2268cfef 100644 --- a/cli/internal/cmd/configgenerate.go +++ b/cli/internal/cmd/configgenerate.go @@ -14,8 +14,8 @@ import ( "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/constellation/state" "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 index 5247ec615..d3ffbff18 100644 --- a/cli/internal/cmd/configgenerate_test.go +++ b/cli/internal/cmd/configgenerate_test.go @@ -15,9 +15,9 @@ import ( "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/constellation/state" "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 index 53376513f..fe3119ee3 100644 --- a/cli/internal/cmd/create_test.go +++ b/cli/internal/cmd/create_test.go @@ -14,10 +14,10 @@ import ( "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/constellation/state" "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_test.go b/cli/internal/cmd/init_test.go index 75bc1ab1b..147222e42 100644 --- a/cli/internal/cmd/init_test.go +++ b/cli/internal/cmd/init_test.go @@ -24,11 +24,11 @@ import ( "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "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" diff --git a/cli/internal/cmd/minidown.go b/cli/internal/cmd/minidown.go index f5bde4c3a..594312e28 100644 --- a/cli/internal/cmd/minidown.go +++ b/cli/internal/cmd/minidown.go @@ -12,8 +12,8 @@ import ( "os" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/miniup.go b/cli/internal/cmd/miniup.go index 30352e1ca..ffe254e90 100644 --- a/cli/internal/cmd/miniup.go +++ b/cli/internal/cmd/miniup.go @@ -17,7 +17,7 @@ import ( "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/featureset" + "github.com/edgelesssys/constellation/v2/internal/constellation/featureset" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/spf13/cobra" diff --git a/cli/internal/cmd/recover.go b/cli/internal/cmd/recover.go index 1ba8ff9d4..3a490bc89 100644 --- a/cli/internal/cmd/recover.go +++ b/cli/internal/cmd/recover.go @@ -22,12 +22,12 @@ import ( "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/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" 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/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/internal/cmd/terminate_test.go b/cli/internal/cmd/terminate_test.go index b56767cbc..e2888d4b0 100644 --- a/cli/internal/cmd/terminate_test.go +++ b/cli/internal/cmd/terminate_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/logger" - "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/upgradeapply_test.go b/cli/internal/cmd/upgradeapply_test.go index 6c5462561..68f740753 100644 --- a/cli/internal/cmd/upgradeapply_test.go +++ b/cli/internal/cmd/upgradeapply_test.go @@ -18,11 +18,11 @@ import ( "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" "github.com/edgelesssys/constellation/v2/internal/constellation/kubecmd" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "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" diff --git a/cli/internal/cmd/upgradecheck.go b/cli/internal/cmd/upgradecheck.go index a3be54e4d..491648074 100644 --- a/cli/internal/cmd/upgradecheck.go +++ b/cli/internal/cmd/upgradecheck.go @@ -26,9 +26,9 @@ import ( "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/constellation/featureset" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" "github.com/edgelesssys/constellation/v2/internal/constellation/kubecmd" - "github.com/edgelesssys/constellation/v2/internal/featureset" "github.com/edgelesssys/constellation/v2/internal/file" consemver "github.com/edgelesssys/constellation/v2/internal/semver" "github.com/edgelesssys/constellation/v2/internal/sigstore" diff --git a/cli/internal/cmd/verify.go b/cli/internal/cmd/verify.go index 99068ec0c..b9f7708a4 100644 --- a/cli/internal/cmd/verify.go +++ b/cli/internal/cmd/verify.go @@ -33,10 +33,10 @@ import ( "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/constellation/state" "github.com/edgelesssys/constellation/v2/internal/crypto" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/edgelesssys/constellation/v2/internal/verify" "github.com/edgelesssys/constellation/v2/verify/verifyproto" "github.com/spf13/afero" diff --git a/cli/internal/cmd/verify_test.go b/cli/internal/cmd/verify_test.go index 2719154e6..60a17aedc 100644 --- a/cli/internal/cmd/verify_test.go +++ b/cli/internal/cmd/verify_test.go @@ -25,11 +25,11 @@ import ( "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/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" "github.com/edgelesssys/constellation/v2/internal/logger" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/edgelesssys/constellation/v2/verify/verifyproto" tpmProto "github.com/google/go-tpm-tools/proto/tpm" "github.com/spf13/afero" diff --git a/cli/internal/terraform/BUILD.bazel b/cli/internal/terraform/BUILD.bazel index 90208fd43..919f87979 100644 --- a/cli/internal/terraform/BUILD.bazel +++ b/cli/internal/terraform/BUILD.bazel @@ -14,8 +14,8 @@ go_library( deps = [ "//internal/cloud/cloudprovider", "//internal/constants", + "//internal/constellation/state", "//internal/file", - "//internal/state", "//terraform", "@com_github_hashicorp_go_version//:go-version", "@com_github_hashicorp_hc_install//:hc-install", @@ -44,9 +44,9 @@ go_test( deps = [ "//internal/cloud/cloudprovider", "//internal/constants", + "//internal/constellation/state", "//internal/file", "//internal/role", - "//internal/state", "@com_github_azure_azure_sdk_for_go_sdk_azcore//to", "@com_github_hashicorp_terraform_exec//tfexec", "@com_github_hashicorp_terraform_json//:terraform-json", diff --git a/cli/internal/terraform/terraform.go b/cli/internal/terraform/terraform.go index 5b9226882..8d64f73ba 100644 --- a/cli/internal/terraform/terraform.go +++ b/cli/internal/terraform/terraform.go @@ -26,8 +26,8 @@ import ( "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/hashicorp/go-version" install "github.com/hashicorp/hc-install" "github.com/hashicorp/hc-install/fs" diff --git a/cli/internal/terraform/terraform_test.go b/cli/internal/terraform/terraform_test.go index 880a1d568..25192a022 100644 --- a/cli/internal/terraform/terraform_test.go +++ b/cli/internal/terraform/terraform_test.go @@ -18,9 +18,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/role" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/hashicorp/terraform-exec/tfexec" tfjson "github.com/hashicorp/terraform-json" "github.com/spf13/afero" diff --git a/hack/gocoverage/main_test.go b/hack/gocoverage/main_test.go index de1f1c9c4..18c9fe139 100644 --- a/hack/gocoverage/main_test.go +++ b/hack/gocoverage/main_test.go @@ -38,7 +38,7 @@ ok github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd (cached) cove ok github.com/edgelesssys/constellation/v2/cli/internal/clusterid (cached) coverage: 56.2% of statements ? github.com/edgelesssys/constellation/v2/cli/internal/cmd/pathprefix [no test files] ok github.com/edgelesssys/constellation/v2/cli/internal/cmd (cached) coverage: 54.3% of statements -? github.com/edgelesssys/constellation/v2/internal/featureset [no test files] +? github.com/edgelesssys/constellation/v2/internal/constellation/featureset [no test files] ? github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion [no test files] ? github.com/edgelesssys/constellation/v2/cli/internal/libvirt [no test files] ? github.com/edgelesssys/constellation/v2/debugd/cmd/cdbg [no test files] @@ -226,8 +226,8 @@ ok github.com/edgelesssys/constellation/v2/operators/constellation-node-operat ` const ( - exampleReportCLI = `{"Metadate":{"Created":"2023-08-24T16:09:02Z"},"Coverage":{"github.com/edgelesssys/constellation/v2/cli":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/cmd":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd":{"Coverage":65.5,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/clusterid":{"Coverage":56.2,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd":{"Coverage":53.5,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd/pathprefix":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/featureset":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm":{"Coverage":47.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/kubecmd":{"Coverage":54.1,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/libvirt":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/terraform":{"Coverage":71.3,"Notest":false,"Nostmt":false}}}` - exampleReportCLIOld = `{"Metadate":{"Created":"2023-08-24T16:48:39Z"},"Coverage":{"github.com/edgelesssys/constellation/v2/cli":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/cmd":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd":{"Coverage":73.1,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/clusterid":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd":{"Coverage":61.6,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/featureset":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm":{"Coverage":51.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/iamid":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/kubernetes":{"Coverage":49.8,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/libvirt":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/terraform":{"Coverage":66.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/upgrade":{"Coverage":83,"Notest":false,"Nostmt":false}}}` + exampleReportCLI = `{"Metadate":{"Created":"2023-08-24T16:09:02Z"},"Coverage":{"github.com/edgelesssys/constellation/v2/cli":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/cmd":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd":{"Coverage":65.5,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/clusterid":{"Coverage":56.2,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd":{"Coverage":53.5,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd/pathprefix":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/featureset":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm":{"Coverage":47.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/kubecmd":{"Coverage":54.1,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/libvirt":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/terraform":{"Coverage":71.3,"Notest":false,"Nostmt":false}}}` + exampleReportCLIOld = `{"Metadate":{"Created":"2023-08-24T16:48:39Z"},"Coverage":{"github.com/edgelesssys/constellation/v2/cli":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/cmd":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd":{"Coverage":73.1,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/clusterid":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/cmd":{"Coverage":61.6,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/featureset":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm":{"Coverage":51.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/iamid":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/kubernetes":{"Coverage":49.8,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/libvirt":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/terraform":{"Coverage":66.7,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/cli/internal/upgrade":{"Coverage":83,"Notest":false,"Nostmt":false}}}` exampleReportDisk = `{"Metadate":{"Created":"2023-08-24T16:40:25Z"},"Coverage":{"github.com/edgelesssys/constellation/v2/disk-mapper/cmd":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/internal/diskencryption":{"Coverage":0,"Notest":true,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/internal/recoveryserver":{"Coverage":89.1,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/internal/rejoinclient":{"Coverage":91.8,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/internal/setup":{"Coverage":68.9,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/internal/systemd":{"Coverage":25.8,"Notest":false,"Nostmt":false},"github.com/edgelesssys/constellation/v2/disk-mapper/recoverproto":{"Coverage":0,"Notest":true,"Nostmt":false}}}` ) diff --git a/internal/constellation/BUILD.bazel b/internal/constellation/BUILD.bazel index 5f1e7a598..c1fdd64dd 100644 --- a/internal/constellation/BUILD.bazel +++ b/internal/constellation/BUILD.bazel @@ -21,6 +21,7 @@ go_library( "//internal/constants", "//internal/constellation/helm", "//internal/constellation/kubecmd", + "//internal/constellation/state", "//internal/crypto", "//internal/file", "//internal/grpc/dialer", @@ -30,7 +31,6 @@ go_library( "//internal/license", "//internal/retry", "//internal/semver", - "//internal/state", "//internal/versions", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:apiextensions", "@org_golang_google_grpc//:go_default_library", @@ -52,6 +52,7 @@ go_test( "//internal/cloud/cloudprovider", "//internal/config", "//internal/constants", + "//internal/constellation/state", "//internal/crypto", "//internal/grpc/atlscredentials", "//internal/grpc/dialer", @@ -59,7 +60,6 @@ go_test( "//internal/kms/uri", "//internal/license", "//internal/logger", - "//internal/state", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@org_golang_google_grpc//:go_default_library", diff --git a/internal/constellation/applyinit.go b/internal/constellation/applyinit.go index ab231f75f..37029131b 100644 --- a/internal/constellation/applyinit.go +++ b/internal/constellation/applyinit.go @@ -19,11 +19,11 @@ import ( "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" "github.com/edgelesssys/constellation/v2/internal/atls" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" 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" "google.golang.org/grpc" ) diff --git a/internal/constellation/applyinit_test.go b/internal/constellation/applyinit_test.go index 270861fec..ecb5f1458 100644 --- a/internal/constellation/applyinit_test.go +++ b/internal/constellation/applyinit_test.go @@ -23,12 +23,12 @@ import ( "github.com/edgelesssys/constellation/v2/internal/attestation/variant" "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "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/kms/uri" "github.com/edgelesssys/constellation/v2/internal/logger" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" diff --git a/internal/featureset/BUILD.bazel b/internal/constellation/featureset/BUILD.bazel similarity index 91% rename from internal/featureset/BUILD.bazel rename to internal/constellation/featureset/BUILD.bazel index 72a70e244..b9f777800 100644 --- a/internal/featureset/BUILD.bazel +++ b/internal/constellation/featureset/BUILD.bazel @@ -9,6 +9,6 @@ go_library( # keep "featureset_oss.go", ], - importpath = "github.com/edgelesssys/constellation/v2/internal/featureset", + importpath = "github.com/edgelesssys/constellation/v2/internal/constellation/featureset", visibility = ["//cli:__subpackages__"], ) diff --git a/internal/featureset/featureset.go b/internal/constellation/featureset/featureset.go similarity index 100% rename from internal/featureset/featureset.go rename to internal/constellation/featureset/featureset.go diff --git a/internal/featureset/featureset_enterprise.go b/internal/constellation/featureset/featureset_enterprise.go similarity index 100% rename from internal/featureset/featureset_enterprise.go rename to internal/constellation/featureset/featureset_enterprise.go diff --git a/internal/featureset/featureset_oss.go b/internal/constellation/featureset/featureset_oss.go similarity index 100% rename from internal/featureset/featureset_oss.go rename to internal/constellation/featureset/featureset_oss.go diff --git a/internal/constellation/helm.go b/internal/constellation/helm.go index bf6fcf7f3..e8b9a815f 100644 --- a/internal/constellation/helm.go +++ b/internal/constellation/helm.go @@ -11,8 +11,8 @@ import ( "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constellation/helm" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/kms/uri" - "github.com/edgelesssys/constellation/v2/internal/state" ) // PrepareHelmCharts loads Helm charts for Constellation and returns an executor to apply them. diff --git a/internal/constellation/helm/BUILD.bazel b/internal/constellation/helm/BUILD.bazel index 58c97f172..0fe869470 100644 --- a/internal/constellation/helm/BUILD.bazel +++ b/internal/constellation/helm/BUILD.bazel @@ -466,12 +466,12 @@ go_library( "//internal/config", "//internal/constants", "//internal/constellation/helm/imageversion", + "//internal/constellation/state", "//internal/file", "//internal/kms/uri", "//internal/kubernetes/kubectl", "//internal/retry", "//internal/semver", - "//internal/state", "//internal/versions", "@com_github_pkg_errors//:errors", "@io_k8s_apimachinery//pkg/api/meta", @@ -508,10 +508,10 @@ go_test( "//internal/cloud/gcpshared", "//internal/compatibility", "//internal/config", + "//internal/constellation/state", "//internal/kms/uri", "//internal/logger", "//internal/semver", - "//internal/state", "//internal/versions", "@com_github_pkg_errors//:errors", "@com_github_stretchr_testify//assert", diff --git a/internal/constellation/helm/helm.go b/internal/constellation/helm/helm.go index 85dcfb759..990ec2b2b 100644 --- a/internal/constellation/helm/helm.go +++ b/internal/constellation/helm/helm.go @@ -37,11 +37,11 @@ import ( "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/constellation/state" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "github.com/edgelesssys/constellation/v2/internal/kubernetes/kubectl" "github.com/edgelesssys/constellation/v2/internal/semver" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/edgelesssys/constellation/v2/internal/versions" ) diff --git a/internal/constellation/helm/helm_test.go b/internal/constellation/helm/helm_test.go index bf47cfa99..828428b38 100644 --- a/internal/constellation/helm/helm_test.go +++ b/internal/constellation/helm/helm_test.go @@ -13,10 +13,10 @@ import ( "github.com/edgelesssys/constellation/v2/internal/attestation/variant" "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/v2/internal/compatibility" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "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/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/constellation/helm/loader.go b/internal/constellation/helm/loader.go index a0eb68195..9ecd4540b 100644 --- a/internal/constellation/helm/loader.go +++ b/internal/constellation/helm/loader.go @@ -24,9 +24,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constellation/helm/imageversion" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "github.com/edgelesssys/constellation/v2/internal/semver" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/edgelesssys/constellation/v2/internal/versions" ) diff --git a/internal/constellation/helm/loader_test.go b/internal/constellation/helm/loader_test.go index ab0cb058d..2d069589a 100644 --- a/internal/constellation/helm/loader_test.go +++ b/internal/constellation/helm/loader_test.go @@ -28,9 +28,9 @@ import ( "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/constellation/state" "github.com/edgelesssys/constellation/v2/internal/kms/uri" "github.com/edgelesssys/constellation/v2/internal/semver" - "github.com/edgelesssys/constellation/v2/internal/state" "github.com/edgelesssys/constellation/v2/internal/versions" ) diff --git a/internal/constellation/helm/overrides.go b/internal/constellation/helm/overrides.go index 8f0dbd959..1e18e7e31 100644 --- a/internal/constellation/helm/overrides.go +++ b/internal/constellation/helm/overrides.go @@ -20,8 +20,8 @@ import ( "github.com/edgelesssys/constellation/v2/internal/cloud/openstack" "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constellation/state" "github.com/edgelesssys/constellation/v2/internal/kms/uri" - "github.com/edgelesssys/constellation/v2/internal/state" ) // TODO(malt3): switch over to DNS name on AWS and Azure diff --git a/internal/state/BUILD.bazel b/internal/constellation/state/BUILD.bazel similarity index 97% rename from internal/state/BUILD.bazel rename to internal/constellation/state/BUILD.bazel index a1633d319..a3cac2577 100644 --- a/internal/state/BUILD.bazel +++ b/internal/constellation/state/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "state.go", "state_doc.go", ], - importpath = "github.com/edgelesssys/constellation/v2/internal/state", + importpath = "github.com/edgelesssys/constellation/v2/internal/constellation/state", visibility = ["//:__subpackages__"], deps = [ "//internal/cloud/cloudprovider", diff --git a/internal/state/state.go b/internal/constellation/state/state.go similarity index 100% rename from internal/state/state.go rename to internal/constellation/state/state.go diff --git a/internal/state/state_doc.go b/internal/constellation/state/state_doc.go similarity index 100% rename from internal/state/state_doc.go rename to internal/constellation/state/state_doc.go diff --git a/internal/state/state_test.go b/internal/constellation/state/state_test.go similarity index 100% rename from internal/state/state_test.go rename to internal/constellation/state/state_test.go diff --git a/internal/state/validation_test.go b/internal/constellation/state/validation_test.go similarity index 100% rename from internal/state/validation_test.go rename to internal/constellation/state/validation_test.go