diff --git a/access_manager/access_manager.go b/access_manager/access_manager.go index ea38d6170..3642cf8a3 100644 --- a/access_manager/access_manager.go +++ b/access_manager/access_manager.go @@ -17,9 +17,9 @@ import ( "syscall" "time" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/deploy/user" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/deploy/user" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "go.uber.org/zap" diff --git a/access_manager/access_manager_test.go b/access_manager/access_manager_test.go index 941cc695c..d615a07e5 100644 --- a/access_manager/access_manager_test.go +++ b/access_manager/access_manager_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/deploy/user" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/deploy/user" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/bootstrapper/cmd/bootstrapper/main.go b/bootstrapper/cmd/bootstrapper/main.go index 4019e0480..3d15fb4ba 100644 --- a/bootstrapper/cmd/bootstrapper/main.go +++ b/bootstrapper/cmd/bootstrapper/main.go @@ -14,27 +14,27 @@ import ( "os" "strconv" - "github.com/edgelesssys/constellation/bootstrapper/internal/initserver" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/kubectl" - "github.com/edgelesssys/constellation/bootstrapper/internal/logging" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure/snp" - "github.com/edgelesssys/constellation/internal/attestation/azure/trustedlaunch" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/attestation/simulator" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp" - qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu" - "github.com/edgelesssys/constellation/internal/cloud/vmtype" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/initserver" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/kubectl" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/logging" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/snp" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/trustedlaunch" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + azurecloud "github.com/edgelesssys/constellation/v2/internal/cloud/azure" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + gcpcloud "github.com/edgelesssys/constellation/v2/internal/cloud/gcp" + qemucloud "github.com/edgelesssys/constellation/v2/internal/cloud/qemu" + "github.com/edgelesssys/constellation/v2/internal/cloud/vmtype" + "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/oid" "github.com/spf13/afero" "go.uber.org/zap" ) diff --git a/bootstrapper/cmd/bootstrapper/run.go b/bootstrapper/cmd/bootstrapper/run.go index 9b670b35b..77cae0a87 100644 --- a/bootstrapper/cmd/bootstrapper/run.go +++ b/bootstrapper/cmd/bootstrapper/run.go @@ -10,16 +10,16 @@ import ( "context" "net" - "github.com/edgelesssys/constellation/bootstrapper/internal/clean" - "github.com/edgelesssys/constellation/bootstrapper/internal/diskencryption" - "github.com/edgelesssys/constellation/bootstrapper/internal/initserver" - "github.com/edgelesssys/constellation/bootstrapper/internal/joinclient" - "github.com/edgelesssys/constellation/bootstrapper/internal/logging" - "github.com/edgelesssys/constellation/bootstrapper/internal/nodelock" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/clean" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/diskencryption" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/initserver" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/joinclient" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/logging" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/nodelock" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" ) diff --git a/bootstrapper/cmd/bootstrapper/test.go b/bootstrapper/cmd/bootstrapper/test.go index cfb397e94..2d6be9d2e 100644 --- a/bootstrapper/cmd/bootstrapper/test.go +++ b/bootstrapper/cmd/bootstrapper/test.go @@ -9,10 +9,10 @@ package main import ( "context" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" ) diff --git a/bootstrapper/internal/initserver/initserver.go b/bootstrapper/internal/initserver/initserver.go index 5c5cf4fd6..be2e1c8bb 100644 --- a/bootstrapper/internal/initserver/initserver.go +++ b/bootstrapper/internal/initserver/initserver.go @@ -13,19 +13,19 @@ import ( "strings" "time" - "github.com/edgelesssys/constellation/bootstrapper/initproto" - "github.com/edgelesssys/constellation/bootstrapper/internal/diskencryption" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/cloud/vmtype" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/grpclog" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/nodestate" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/diskencryption" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "github.com/edgelesssys/constellation/v2/internal/cloud/vmtype" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" + "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/nodestate" + "github.com/edgelesssys/constellation/v2/internal/role" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/bootstrapper/internal/initserver/initserver_test.go b/bootstrapper/internal/initserver/initserver_test.go index 0c34c760b..ff7c2beff 100644 --- a/bootstrapper/internal/initserver/initserver_test.go +++ b/bootstrapper/internal/initserver/initserver_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/bootstrapper/initproto" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/crypto/testvector" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/crypto/testvector" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/bootstrapper/internal/joinclient/client.go b/bootstrapper/internal/joinclient/client.go index 00acf8df6..507d34b81 100644 --- a/bootstrapper/internal/joinclient/client.go +++ b/bootstrapper/internal/joinclient/client.go @@ -16,16 +16,16 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/bootstrapper/internal/diskencryption" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubelet" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/nodestate" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/diskencryption" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubelet" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "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/nodestate" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "github.com/spf13/afero" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/bootstrapper/internal/joinclient/client_test.go b/bootstrapper/internal/joinclient/client_test.go index 878871b34..df83da353 100644 --- a/bootstrapper/internal/joinclient/client_test.go +++ b/bootstrapper/internal/joinclient/client_test.go @@ -15,15 +15,15 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "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/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/bootstrapper/internal/kubelet/kubelet.go b/bootstrapper/internal/kubelet/kubelet.go index e04f4cfb6..8c8209b88 100644 --- a/bootstrapper/internal/kubelet/kubelet.go +++ b/bootstrapper/internal/kubelet/kubelet.go @@ -11,7 +11,7 @@ import ( "crypto/x509/pkix" "net" - "github.com/edgelesssys/constellation/bootstrapper/internal/certificate" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/certificate" "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) diff --git a/bootstrapper/internal/kubernetes/cloud_provider.go b/bootstrapper/internal/kubernetes/cloud_provider.go index e0f981b58..48261241c 100644 --- a/bootstrapper/internal/kubernetes/cloud_provider.go +++ b/bootstrapper/internal/kubernetes/cloud_provider.go @@ -9,9 +9,9 @@ package kubernetes import ( "context" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" k8s "k8s.io/api/core/v1" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/install.go b/bootstrapper/internal/kubernetes/k8sapi/install.go index 23190c5ef..7a508d8a1 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/install.go +++ b/bootstrapper/internal/kubernetes/k8sapi/install.go @@ -19,7 +19,7 @@ import ( "path" "time" - "github.com/edgelesssys/constellation/internal/retry" + "github.com/edgelesssys/constellation/v2/internal/retry" "github.com/spf13/afero" "golang.org/x/text/transform" "k8s.io/utils/clock" diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go b/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go index 06d01fb80..c824be957 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go @@ -9,10 +9,10 @@ package k8sapi import ( "path/filepath" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubelet" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubelet" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeletconf "k8s.io/kubelet/config/v1beta1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config_test.go b/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config_test.go index 9048a4234..a77a4f0cc 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubeadm_config_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go b/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go index 2f7efcdad..0aa5e4830 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go @@ -11,7 +11,7 @@ import ( "context" "fmt" - kubernetesshared "github.com/edgelesssys/constellation/internal/kubernetes" + kubernetesshared "github.com/edgelesssys/constellation/v2/internal/kubernetes" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go b/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go index 701af49e6..f9bffc3d6 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go @@ -14,8 +14,8 @@ import ( "net/http" "testing" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubectl/generator.go b/bootstrapper/internal/kubernetes/k8sapi/kubectl/generator.go index f0f9238f7..54d5c74ba 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubectl/generator.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubectl/generator.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package kubectl -import "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/kubectl/client" +import "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/kubectl/client" // generator implements clientGenerator interface. type generator struct{} diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl.go b/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl.go index 91e4dd858..ba39164a9 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl.go @@ -11,7 +11,7 @@ import ( "errors" "fmt" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" corev1 "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/resource" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl_test.go b/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl_test.go index 3d6552bdb..3cfe3848d 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/kubectl/kubectl_test.go @@ -11,7 +11,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "go.uber.org/goleak" corev1 "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager.go b/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager.go index 66be2f21e..c5e5951c8 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager.go @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only package resources import ( - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" "google.golang.org/protobuf/proto" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager_test.go index e0d7d0ec1..33e53a2c6 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/access_manager_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy.go b/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy.go index d4cb89ec6..a8e96ce29 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package resources import ( - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy_test.go index 3ffd9c3ea..6889cec05 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/auditpolicy_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go index 0ebe8f830..6042792b4 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go @@ -9,7 +9,7 @@ package resources import ( "fmt" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager_test.go index 5d2823cd1..0b2f1074b 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" k8s "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager.go index 99e800968..ff33e0433 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package resources import ( - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager_test.go index 40db1ebf7..d6d92361d 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cloudnodemanager_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler.go index 3bd484868..789987f60 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler.go @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only package resources import ( - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" "google.golang.org/protobuf/proto" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler_test.go index 611604981..6210d412e 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/cluster_autoscaler_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/gcp_guest_agent.go b/bootstrapper/internal/kubernetes/k8sapi/resources/gcp_guest_agent.go index d19937008..2ea168c1c 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/gcp_guest_agent.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/gcp_guest_agent.go @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only package resources import ( - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go b/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go index 756fa84c1..d1bab3c43 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go @@ -9,10 +9,10 @@ package resources import ( "fmt" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice_test.go index 054fd5a8f..d0be2c163 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/joinservice_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/kms.go b/bootstrapper/internal/kubernetes/k8sapi/resources/kms.go index 161660a39..d60f30ce6 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/kms.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/kms.go @@ -9,9 +9,9 @@ package resources import ( "fmt" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/kms_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/kms_test.go index bd3d160c2..9e300ad37 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/kms_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/kms_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity.go b/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity.go index e32d2a035..1e1d8a0eb 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity.go @@ -10,9 +10,9 @@ import ( "crypto/x509" "crypto/x509/pkix" - "github.com/edgelesssys/constellation/bootstrapper/internal/certificate" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/certificate" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity_test.go index 3f006994c..5f90c3b90 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator.go b/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator.go index 04dc5d270..5a2625f64 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator.go @@ -9,8 +9,8 @@ package resources import ( "time" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" operatorsv1 "github.com/operator-framework/api/pkg/operators/v1" operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator_test.go index b2e43fc76..827b636fc 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/node_maintenance_operator_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator.go b/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator.go index 67c8bcee1..5dfe90e01 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator.go @@ -10,8 +10,8 @@ import ( _ "embed" "time" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" operatorsv1 "github.com/operator-framework/api/pkg/operators/v1" operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" corev1 "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator_test.go index 1ad29e391..2cb711442 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/node_operator_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/operator_lifecycle_manager.go b/bootstrapper/internal/kubernetes/k8sapi/resources/operator_lifecycle_manager.go index adb510a8a..75f6b18b9 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/operator_lifecycle_manager.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/operator_lifecycle_manager.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package resources -import "github.com/edgelesssys/constellation/internal/crds" +import "github.com/edgelesssys/constellation/v2/internal/crds" // OLMCRDNames are the names of the custom resource definitions that are used by the olm operator. var OLMCRDNames = []string{ diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/verification.go b/bootstrapper/internal/kubernetes/k8sapi/resources/verification.go index 60efb1214..5caadf35b 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/verification.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/verification.go @@ -11,9 +11,9 @@ import ( "net" "strings" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" "google.golang.org/protobuf/proto" apps "k8s.io/api/apps/v1" k8s "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/k8sapi/resources/verification_test.go b/bootstrapper/internal/kubernetes/k8sapi/resources/verification_test.go index 8cab76af9..0f49a7b2a 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/resources/verification_test.go +++ b/bootstrapper/internal/kubernetes/k8sapi/resources/verification_test.go @@ -9,7 +9,7 @@ package resources import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/util.go b/bootstrapper/internal/kubernetes/k8sapi/util.go index 7960d8352..dfb9588e1 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/util.go +++ b/bootstrapper/internal/kubernetes/k8sapi/util.go @@ -24,18 +24,18 @@ import ( "strings" "time" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubelet" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubelet" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/role" kubeconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/deploy/helm" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/deploy/helm" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/icholy/replace" "github.com/spf13/afero" "go.uber.org/zap" diff --git a/bootstrapper/internal/kubernetes/k8sutil.go b/bootstrapper/internal/kubernetes/k8sutil.go index 3bedaa995..367edc64d 100644 --- a/bootstrapper/internal/kubernetes/k8sutil.go +++ b/bootstrapper/internal/kubernetes/k8sutil.go @@ -10,11 +10,11 @@ import ( "context" "net" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/internal/versions" ) type clusterUtil interface { diff --git a/bootstrapper/internal/kubernetes/kubernetes.go b/bootstrapper/internal/kubernetes/kubernetes.go index eebab8da3..1026e2f05 100644 --- a/bootstrapper/internal/kubernetes/kubernetes.go +++ b/bootstrapper/internal/kubernetes/kubernetes.go @@ -15,13 +15,13 @@ import ( "strconv" "strings" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/spf13/afero" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" diff --git a/bootstrapper/internal/kubernetes/kubernetes_test.go b/bootstrapper/internal/kubernetes/kubernetes_test.go index eefadd35c..211fbde90 100644 --- a/bootstrapper/internal/kubernetes/kubernetes_test.go +++ b/bootstrapper/internal/kubernetes/kubernetes_test.go @@ -14,14 +14,14 @@ import ( "strconv" "testing" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi" - "github.com/edgelesssys/constellation/bootstrapper/internal/kubernetes/k8sapi/resources" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi" + "github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi/resources" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/bootstrapper/internal/nodelock/nodelock.go b/bootstrapper/internal/nodelock/nodelock.go index 1ed0c9b1e..2d5f1b0ae 100644 --- a/bootstrapper/internal/nodelock/nodelock.go +++ b/bootstrapper/internal/nodelock/nodelock.go @@ -9,7 +9,7 @@ package nodelock import ( "sync" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" ) // Lock locks the node once there the join or the init is at a point diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 169f88aaf..8b3c74875 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -12,8 +12,8 @@ import ( "os" "os/signal" - "github.com/edgelesssys/constellation/cli/internal/cmd" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/cli/internal/cmd" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/spf13/cobra" ) diff --git a/cli/internal/azure/client/client.go b/cli/internal/azure/client/client.go index 0b739d2e1..068f469c9 100644 --- a/cli/internal/azure/client/client.go +++ b/cli/internal/azure/client/client.go @@ -21,9 +21,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure/auth" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" ) const ( diff --git a/cli/internal/azure/client/client_test.go b/cli/internal/azure/client/client_test.go index 3c93cb91f..8b7dfb9ca 100644 --- a/cli/internal/azure/client/client_test.go +++ b/cli/internal/azure/client/client_test.go @@ -9,9 +9,9 @@ package client import ( "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/cli/internal/azure/client/compute.go b/cli/internal/azure/client/compute.go index f145e02ff..4c03f8629 100644 --- a/cli/internal/azure/client/compute.go +++ b/cli/internal/azure/client/compute.go @@ -17,9 +17,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/cli/internal/azure" - "github.com/edgelesssys/constellation/cli/internal/azure/internal/poller" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/cli/internal/azure" + "github.com/edgelesssys/constellation/v2/cli/internal/azure/internal/poller" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" ) const ( diff --git a/cli/internal/azure/client/compute_test.go b/cli/internal/azure/client/compute_test.go index 0d60679c6..b90a5f4c8 100644 --- a/cli/internal/azure/client/compute_test.go +++ b/cli/internal/azure/client/compute_test.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/azure/client/network.go b/cli/internal/azure/client/network.go index b83e02da5..a6ad501dc 100644 --- a/cli/internal/azure/client/network.go +++ b/cli/internal/azure/client/network.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/edgelesssys/constellation/cli/internal/azure" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/cli/internal/azure" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" ) type createNetworkInput struct { diff --git a/cli/internal/azure/client/network_test.go b/cli/internal/azure/client/network_test.go index 6806703b9..5e9b9c5c3 100644 --- a/cli/internal/azure/client/network_test.go +++ b/cli/internal/azure/client/network_test.go @@ -11,7 +11,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/azure/loadbalancer.go b/cli/internal/azure/loadbalancer.go index 96a95ad0f..d56e5b7a5 100644 --- a/cli/internal/azure/loadbalancer.go +++ b/cli/internal/azure/loadbalancer.go @@ -9,7 +9,7 @@ package azure import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" ) // LoadBalancer defines a Azure load balancer. diff --git a/cli/internal/azure/scaleset.go b/cli/internal/azure/scaleset.go index 16fb8c35d..0686ad53c 100644 --- a/cli/internal/azure/scaleset.go +++ b/cli/internal/azure/scaleset.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/internal/cloud/azure" + "github.com/edgelesssys/constellation/v2/internal/cloud/azure" ) // ScaleSet defines a Azure scale set. diff --git a/cli/internal/cloudcmd/clients.go b/cli/internal/cloudcmd/clients.go index e591deaf2..ddfc7e477 100644 --- a/cli/internal/cloudcmd/clients.go +++ b/cli/internal/cloudcmd/clients.go @@ -9,9 +9,9 @@ package cloudcmd import ( "context" - azurecl "github.com/edgelesssys/constellation/cli/internal/azure/client" - gcpcl "github.com/edgelesssys/constellation/cli/internal/gcp/client" - "github.com/edgelesssys/constellation/internal/state" + azurecl "github.com/edgelesssys/constellation/v2/cli/internal/azure/client" + gcpcl "github.com/edgelesssys/constellation/v2/cli/internal/gcp/client" + "github.com/edgelesssys/constellation/v2/internal/state" ) type gcpclient interface { diff --git a/cli/internal/cloudcmd/clients_test.go b/cli/internal/cloudcmd/clients_test.go index 7a1ad48e3..8cb65a926 100644 --- a/cli/internal/cloudcmd/clients_test.go +++ b/cli/internal/cloudcmd/clients_test.go @@ -12,12 +12,12 @@ import ( "strconv" "testing" - azurecl "github.com/edgelesssys/constellation/cli/internal/azure/client" - gcpcl "github.com/edgelesssys/constellation/cli/internal/gcp/client" - "github.com/edgelesssys/constellation/internal/azureshared" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + azurecl "github.com/edgelesssys/constellation/v2/cli/internal/azure/client" + gcpcl "github.com/edgelesssys/constellation/v2/cli/internal/gcp/client" + "github.com/edgelesssys/constellation/v2/internal/azureshared" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" "go.uber.org/goleak" ) diff --git a/cli/internal/cloudcmd/create.go b/cli/internal/cloudcmd/create.go index 7e3cd3312..cdea60bf4 100644 --- a/cli/internal/cloudcmd/create.go +++ b/cli/internal/cloudcmd/create.go @@ -11,14 +11,14 @@ import ( "fmt" "io" - azurecl "github.com/edgelesssys/constellation/cli/internal/azure/client" - "github.com/edgelesssys/constellation/cli/internal/gcp" - gcpcl "github.com/edgelesssys/constellation/cli/internal/gcp/client" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/state" + azurecl "github.com/edgelesssys/constellation/v2/cli/internal/azure/client" + "github.com/edgelesssys/constellation/v2/cli/internal/gcp" + gcpcl "github.com/edgelesssys/constellation/v2/cli/internal/gcp/client" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/state" ) // Creator creates cloud resources. diff --git a/cli/internal/cloudcmd/create_test.go b/cli/internal/cloudcmd/create_test.go index 984098bf4..7de442571 100644 --- a/cli/internal/cloudcmd/create_test.go +++ b/cli/internal/cloudcmd/create_test.go @@ -12,10 +12,10 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/state" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/cloudcmd/terminate.go b/cli/internal/cloudcmd/terminate.go index 9659e3351..05151ed09 100644 --- a/cli/internal/cloudcmd/terminate.go +++ b/cli/internal/cloudcmd/terminate.go @@ -10,10 +10,10 @@ import ( "context" "fmt" - azurecl "github.com/edgelesssys/constellation/cli/internal/azure/client" - gcpcl "github.com/edgelesssys/constellation/cli/internal/gcp/client" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/state" + azurecl "github.com/edgelesssys/constellation/v2/cli/internal/azure/client" + gcpcl "github.com/edgelesssys/constellation/v2/cli/internal/gcp/client" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/state" ) // Terminator deletes cloud provider resources. diff --git a/cli/internal/cloudcmd/terminate_test.go b/cli/internal/cloudcmd/terminate_test.go index fc6d7a983..16c08624a 100644 --- a/cli/internal/cloudcmd/terminate_test.go +++ b/cli/internal/cloudcmd/terminate_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/cloudcmd/upgrade.go b/cli/internal/cloudcmd/upgrade.go index 409eb2c26..d35a684af 100644 --- a/cli/internal/cloudcmd/upgrade.go +++ b/cli/internal/cloudcmd/upgrade.go @@ -14,7 +14,7 @@ import ( "fmt" "io" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/cli/internal/cloudcmd/upgrade_test.go b/cli/internal/cloudcmd/upgrade_test.go index c5610da83..c0371ebaf 100644 --- a/cli/internal/cloudcmd/upgrade_test.go +++ b/cli/internal/cloudcmd/upgrade_test.go @@ -13,7 +13,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/cli/internal/cloudcmd/validators.go b/cli/internal/cloudcmd/validators.go index 270c6d0be..733808e25 100644 --- a/cli/internal/cloudcmd/validators.go +++ b/cli/internal/cloudcmd/validators.go @@ -13,14 +13,14 @@ import ( "errors" "fmt" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure/snp" - "github.com/edgelesssys/constellation/internal/attestation/azure/trustedlaunch" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/snp" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/trustedlaunch" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config" "github.com/spf13/cobra" ) diff --git a/cli/internal/cloudcmd/validators_test.go b/cli/internal/cloudcmd/validators_test.go index 9fd594f61..0884b9fd7 100644 --- a/cli/internal/cloudcmd/validators_test.go +++ b/cli/internal/cloudcmd/validators_test.go @@ -11,14 +11,14 @@ import ( "encoding/base64" "testing" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure/snp" - "github.com/edgelesssys/constellation/internal/attestation/azure/trustedlaunch" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/snp" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/trustedlaunch" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/cmd/cloud.go b/cli/internal/cmd/cloud.go index 59c5ee35e..f2bda090f 100644 --- a/cli/internal/cmd/cloud.go +++ b/cli/internal/cmd/cloud.go @@ -9,9 +9,9 @@ package cmd import ( "context" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/state" ) type cloudCreator interface { diff --git a/cli/internal/cmd/cloud_test.go b/cli/internal/cmd/cloud_test.go index 2425960b8..de80e4010 100644 --- a/cli/internal/cmd/cloud_test.go +++ b/cli/internal/cmd/cloud_test.go @@ -10,9 +10,9 @@ import ( "context" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "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 index 2a412872e..486f1c5a3 100644 --- a/cli/internal/cmd/configfetchmeasurements.go +++ b/cli/internal/cmd/configfetchmeasurements.go @@ -13,9 +13,9 @@ import ( "net/url" "time" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/configfetchmeasurements_test.go b/cli/internal/cmd/configfetchmeasurements_test.go index 0b1818e53..621c90ffe 100644 --- a/cli/internal/cmd/configfetchmeasurements_test.go +++ b/cli/internal/cmd/configfetchmeasurements_test.go @@ -13,10 +13,10 @@ import ( "net/url" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "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/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go index 2cda16750..817d62914 100644 --- a/cli/internal/cmd/configgenerate.go +++ b/cli/internal/cmd/configgenerate.go @@ -9,10 +9,10 @@ package cmd import ( "fmt" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "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/spf13/afero" "github.com/spf13/cobra" "github.com/talos-systems/talos/pkg/machinery/config/encoder" diff --git a/cli/internal/cmd/configgenerate_test.go b/cli/internal/cmd/configgenerate_test.go index 533319f04..256a7f8b1 100644 --- a/cli/internal/cmd/configgenerate_test.go +++ b/cli/internal/cmd/configgenerate_test.go @@ -10,10 +10,10 @@ import ( "bytes" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "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/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/configinstancetypes.go b/cli/internal/cmd/configinstancetypes.go index 422ce4a40..689295948 100644 --- a/cli/internal/cmd/configinstancetypes.go +++ b/cli/internal/cmd/configinstancetypes.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/edgelesssys/constellation/internal/config/instancetypes" + "github.com/edgelesssys/constellation/v2/internal/config/instancetypes" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/create.go b/cli/internal/cmd/create.go index d0f974295..6d0dbc962 100644 --- a/cli/internal/cmd/create.go +++ b/cli/internal/cmd/create.go @@ -11,11 +11,11 @@ import ( "fmt" "io/fs" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/constants" + "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/create_test.go b/cli/internal/cmd/create_test.go index 9f95ceb2c..25ef89700 100644 --- a/cli/internal/cmd/create_test.go +++ b/cli/internal/cmd/create_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "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 index f7c5bb04d..2822ba0f1 100644 --- a/cli/internal/cmd/init.go +++ b/cli/internal/cmd/init.go @@ -16,23 +16,23 @@ import ( "text/tabwriter" "time" - "github.com/edgelesssys/constellation/bootstrapper/initproto" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/cli/internal/helm" - "github.com/edgelesssys/constellation/internal/azureshared" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/gcpshared" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - grpcRetry "github.com/edgelesssys/constellation/internal/grpc/retry" - "github.com/edgelesssys/constellation/internal/license" - "github.com/edgelesssys/constellation/internal/retry" - "github.com/edgelesssys/constellation/internal/versions" - kms "github.com/edgelesssys/constellation/kms/setup" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/cli/internal/helm" + "github.com/edgelesssys/constellation/v2/internal/azureshared" + "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/crypto" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" + grpcRetry "github.com/edgelesssys/constellation/v2/internal/grpc/retry" + "github.com/edgelesssys/constellation/v2/internal/license" + "github.com/edgelesssys/constellation/v2/internal/retry" + "github.com/edgelesssys/constellation/v2/internal/versions" + kms "github.com/edgelesssys/constellation/v2/kms/setup" "github.com/spf13/afero" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/cli/internal/cmd/init_test.go b/cli/internal/cmd/init_test.go index ce4fa633e..e1500073c 100644 --- a/cli/internal/cmd/init_test.go +++ b/cli/internal/cmd/init_test.go @@ -18,20 +18,20 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/bootstrapper/initproto" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/gcpshared" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/license" - "github.com/edgelesssys/constellation/internal/oid" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "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/gcpshared" + "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/license" + "github.com/edgelesssys/constellation/v2/internal/oid" + "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/readconfig.go b/cli/internal/cmd/readconfig.go index 66b9626a1..ea1ee37da 100644 --- a/cli/internal/cmd/readconfig.go +++ b/cli/internal/cmd/readconfig.go @@ -11,8 +11,8 @@ import ( "fmt" "io" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/file" ) func readConfig(out io.Writer, fileHandler file.Handler, name string) (*config.Config, error) { diff --git a/cli/internal/cmd/readconfig_test.go b/cli/internal/cmd/readconfig_test.go index 1b98cdb01..58585fea9 100644 --- a/cli/internal/cmd/readconfig_test.go +++ b/cli/internal/cmd/readconfig_test.go @@ -10,8 +10,8 @@ import ( "bytes" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cli/internal/cmd/recover.go b/cli/internal/cmd/recover.go index 253747f46..abb4ecf35 100644 --- a/cli/internal/cmd/recover.go +++ b/cli/internal/cmd/recover.go @@ -14,17 +14,17 @@ import ( "net" "time" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/disk-mapper/recoverproto" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - grpcRetry "github.com/edgelesssys/constellation/internal/grpc/retry" - "github.com/edgelesssys/constellation/internal/retry" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/disk-mapper/recoverproto" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "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/retry" + "github.com/edgelesssys/constellation/v2/internal/state" "github.com/spf13/afero" "github.com/spf13/cobra" "go.uber.org/multierr" diff --git a/cli/internal/cmd/recover_test.go b/cli/internal/cmd/recover_test.go index 1be6e258c..73b8ffa11 100644 --- a/cli/internal/cmd/recover_test.go +++ b/cli/internal/cmd/recover_test.go @@ -14,17 +14,17 @@ import ( "strconv" "testing" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/disk-mapper/recoverproto" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto/testvector" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/disk-mapper/recoverproto" + "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/crypto/testvector" + "github.com/edgelesssys/constellation/v2/internal/file" + "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/state" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/terminate.go b/cli/internal/cmd/terminate.go index 7dfb0e36b..5530e7d47 100644 --- a/cli/internal/cmd/terminate.go +++ b/cli/internal/cmd/terminate.go @@ -15,10 +15,10 @@ import ( "github.com/spf13/cobra" "go.uber.org/multierr" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/state" ) // NewTerminateCmd returns a new cobra.Command for the terminate command. diff --git a/cli/internal/cmd/terminate_test.go b/cli/internal/cmd/terminate_test.go index 8307cde93..b8b011db8 100644 --- a/cli/internal/cmd/terminate_test.go +++ b/cli/internal/cmd/terminate_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "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/upgradeexecute.go b/cli/internal/cmd/upgradeexecute.go index 8bcd0e33d..edf5ef8bf 100644 --- a/cli/internal/cmd/upgradeexecute.go +++ b/cli/internal/cmd/upgradeexecute.go @@ -9,9 +9,9 @@ package cmd import ( "context" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/upgradeexecute_test.go b/cli/internal/cmd/upgradeexecute_test.go index cdc983403..834220310 100644 --- a/cli/internal/cmd/upgradeexecute_test.go +++ b/cli/internal/cmd/upgradeexecute_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/upgradeplan.go b/cli/internal/cmd/upgradeplan.go index d5c3961dd..bcdaf392d 100644 --- a/cli/internal/cmd/upgradeplan.go +++ b/cli/internal/cmd/upgradeplan.go @@ -16,11 +16,11 @@ import ( "regexp" "strings" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "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/manifoldco/promptui" "github.com/spf13/afero" "github.com/spf13/cobra" diff --git a/cli/internal/cmd/upgradeplan_test.go b/cli/internal/cmd/upgradeplan_test.go index 7d9fd15db..5f71b01e9 100644 --- a/cli/internal/cmd/upgradeplan_test.go +++ b/cli/internal/cmd/upgradeplan_test.go @@ -16,10 +16,10 @@ import ( "strings" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "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/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/validargs.go b/cli/internal/cmd/validargs.go index f169e48a7..5545b83cf 100644 --- a/cli/internal/cmd/validargs.go +++ b/cli/internal/cmd/validargs.go @@ -10,7 +10,7 @@ import ( "errors" "fmt" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/verify.go b/cli/internal/cmd/verify.go index 26b41a3b1..a3e170c80 100644 --- a/cli/internal/cmd/verify.go +++ b/cli/internal/cmd/verify.go @@ -16,13 +16,13 @@ import ( "strconv" "strings" - "github.com/edgelesssys/constellation/cli/internal/cloudcmd" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/verify/verifyproto" + "github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/constants" + "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/verify/verifyproto" "github.com/spf13/afero" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/cli/internal/cmd/verify_test.go b/cli/internal/cmd/verify_test.go index 841536a1b..6df8bc041 100644 --- a/cli/internal/cmd/verify_test.go +++ b/cli/internal/cmd/verify_test.go @@ -16,15 +16,15 @@ import ( "strconv" "testing" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/oid" - "github.com/edgelesssys/constellation/verify/verifyproto" + "github.com/edgelesssys/constellation/v2/internal/atls" + "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/grpc/dialer" + "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" + "github.com/edgelesssys/constellation/v2/internal/oid" + "github.com/edgelesssys/constellation/v2/verify/verifyproto" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/internal/cmd/version.go b/cli/internal/cmd/version.go index 884749e83..9a38625d6 100644 --- a/cli/internal/cmd/version.go +++ b/cli/internal/cmd/version.go @@ -9,7 +9,7 @@ package cmd import ( "runtime/debug" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/spf13/cobra" ) diff --git a/cli/internal/cmd/version_test.go b/cli/internal/cmd/version_test.go index c69231da4..4cb06c70f 100644 --- a/cli/internal/cmd/version_test.go +++ b/cli/internal/cmd/version_test.go @@ -12,7 +12,7 @@ import ( "runtime/debug" "testing" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/gcp/client/client.go b/cli/internal/gcp/client/client.go index fe9960e8c..b44d4e1b7 100644 --- a/cli/internal/gcp/client/client.go +++ b/cli/internal/gcp/client/client.go @@ -17,9 +17,9 @@ import ( compute "cloud.google.com/go/compute/apiv1" admin "cloud.google.com/go/iam/admin/apiv1" resourcemanager "cloud.google.com/go/resourcemanager/apiv3" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" "go.uber.org/multierr" "google.golang.org/api/googleapi" ) diff --git a/cli/internal/gcp/client/client_test.go b/cli/internal/gcp/client/client_test.go index 9f017b50a..e5842dd53 100644 --- a/cli/internal/gcp/client/client_test.go +++ b/cli/internal/gcp/client/client_test.go @@ -11,9 +11,9 @@ import ( "net/http" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/cli/internal/gcp/client/instances.go b/cli/internal/gcp/client/instances.go index 9ddffc5ee..41644f1f8 100644 --- a/cli/internal/gcp/client/instances.go +++ b/cli/internal/gcp/client/instances.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/role" "google.golang.org/api/iterator" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" diff --git a/cli/internal/gcp/client/instances_test.go b/cli/internal/gcp/client/instances_test.go index 455e2622d..3ebc3fbe0 100644 --- a/cli/internal/gcp/client/instances_test.go +++ b/cli/internal/gcp/client/instances_test.go @@ -12,7 +12,7 @@ import ( "net/http" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" "github.com/stretchr/testify/assert" "google.golang.org/api/googleapi" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" diff --git a/cli/internal/gcp/client/loadbalancer.go b/cli/internal/gcp/client/loadbalancer.go index 16b91e229..bec9a0ef4 100644 --- a/cli/internal/gcp/client/loadbalancer.go +++ b/cli/internal/gcp/client/loadbalancer.go @@ -12,7 +12,7 @@ import ( "fmt" "strconv" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "go.uber.org/multierr" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" diff --git a/cli/internal/gcp/client/network.go b/cli/internal/gcp/client/network.go index ab03332b4..609c5bdae 100644 --- a/cli/internal/gcp/client/network.go +++ b/cli/internal/gcp/client/network.go @@ -10,7 +10,7 @@ import ( "context" "errors" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/cli/internal/gcp/client/network_test.go b/cli/internal/gcp/client/network_test.go index ac03acee2..3087cb099 100644 --- a/cli/internal/gcp/client/network_test.go +++ b/cli/internal/gcp/client/network_test.go @@ -12,7 +12,7 @@ import ( "net/http" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" "github.com/stretchr/testify/assert" "google.golang.org/api/googleapi" ) diff --git a/cli/internal/helm/loader.go b/cli/internal/helm/loader.go index 46fcedf29..3f8a46cda 100644 --- a/cli/internal/helm/loader.go +++ b/cli/internal/helm/loader.go @@ -15,8 +15,8 @@ import ( "path/filepath" "strings" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/deploy/helm" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/deploy/helm" "github.com/pkg/errors" "helm.sh/helm/pkg/ignore" "helm.sh/helm/v3/pkg/chart" diff --git a/cli/main.go b/cli/main.go index 86338364b..7687463bd 100644 --- a/cli/main.go +++ b/cli/main.go @@ -9,7 +9,7 @@ package main import ( "os" - "github.com/edgelesssys/constellation/cli/cmd" + "github.com/edgelesssys/constellation/v2/cli/cmd" ) func main() { diff --git a/csi/cryptmapper/cryptmapper.go b/csi/cryptmapper/cryptmapper.go index 8bcb207fb..b5c1c6b76 100644 --- a/csi/cryptmapper/cryptmapper.go +++ b/csi/cryptmapper/cryptmapper.go @@ -16,7 +16,7 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/crypto" cryptsetup "github.com/martinjungblut/go-cryptsetup" mount "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" diff --git a/csi/kms/constellation.go b/csi/kms/constellation.go index dbb83401a..63164da83 100644 --- a/csi/kms/constellation.go +++ b/csi/kms/constellation.go @@ -10,7 +10,7 @@ import ( "context" "fmt" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/csi/kms/constellation_test.go b/csi/kms/constellation_test.go index 8a0de87c3..455b9e51d 100644 --- a/csi/kms/constellation_test.go +++ b/csi/kms/constellation_test.go @@ -11,7 +11,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "github.com/stretchr/testify/assert" "go.uber.org/goleak" "google.golang.org/grpc" diff --git a/csi/test/mount_integration_test.go b/csi/test/mount_integration_test.go index 385263294..3c467159d 100644 --- a/csi/test/mount_integration_test.go +++ b/csi/test/mount_integration_test.go @@ -15,7 +15,7 @@ import ( "os/exec" "testing" - "github.com/edgelesssys/constellation/csi/cryptmapper" + "github.com/edgelesssys/constellation/v2/csi/cryptmapper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/debugd/cmd/cdbg/cdbg.go b/debugd/cmd/cdbg/cdbg.go index 7aec4f3a9..24d00f21f 100644 --- a/debugd/cmd/cdbg/cdbg.go +++ b/debugd/cmd/cdbg/cdbg.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package main -import "github.com/edgelesssys/constellation/debugd/internal/cdbg/cmd" +import "github.com/edgelesssys/constellation/v2/debugd/internal/cdbg/cmd" func main() { cmd.Execute() diff --git a/debugd/cmd/debugd/debugd.go b/debugd/cmd/debugd/debugd.go index 2f8c6a8fa..af424bf97 100644 --- a/debugd/cmd/debugd/debugd.go +++ b/debugd/cmd/debugd/debugd.go @@ -14,16 +14,16 @@ import ( "os" "sync" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" - "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata" - "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/cloudprovider" - "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/fallback" - "github.com/edgelesssys/constellation/debugd/internal/debugd/server" - platform "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/deploy/user" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/deploy" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/metadata" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/metadata/cloudprovider" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/metadata/fallback" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/server" + platform "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/deploy/user" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" ) diff --git a/debugd/internal/bootstrapper/streamer.go b/debugd/internal/bootstrapper/streamer.go index 3d17a8a6e..ca8314556 100644 --- a/debugd/internal/bootstrapper/streamer.go +++ b/debugd/internal/bootstrapper/streamer.go @@ -13,7 +13,7 @@ import ( "os" "sync" - pb "github.com/edgelesssys/constellation/debugd/service" + pb "github.com/edgelesssys/constellation/v2/debugd/service" "github.com/schollz/progressbar/v3" "github.com/spf13/afero" ) diff --git a/debugd/internal/bootstrapper/streamer_test.go b/debugd/internal/bootstrapper/streamer_test.go index 5c4d5519b..3d3e32c13 100644 --- a/debugd/internal/bootstrapper/streamer_test.go +++ b/debugd/internal/bootstrapper/streamer_test.go @@ -11,7 +11,7 @@ import ( "io" "testing" - pb "github.com/edgelesssys/constellation/debugd/service" + pb "github.com/edgelesssys/constellation/v2/debugd/service" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/debugd/internal/cdbg/cmd/deploy.go b/debugd/internal/cdbg/cmd/deploy.go index 1793c755a..c89b1587f 100644 --- a/debugd/internal/cdbg/cmd/deploy.go +++ b/debugd/internal/cdbg/cmd/deploy.go @@ -13,12 +13,12 @@ import ( "net" "strconv" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - pb "github.com/edgelesssys/constellation/debugd/service" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + pb "github.com/edgelesssys/constellation/v2/debugd/service" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/debugd/internal/cdbg/cmd/root.go b/debugd/internal/cdbg/cmd/root.go index 0b4691ba3..bdee15004 100644 --- a/debugd/internal/cdbg/cmd/root.go +++ b/debugd/internal/cdbg/cmd/root.go @@ -9,7 +9,7 @@ package cmd import ( "os" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/spf13/cobra" ) diff --git a/debugd/internal/cdbg/state/state.go b/debugd/internal/cdbg/state/state.go index 8e785b238..5947a8825 100644 --- a/debugd/internal/cdbg/state/state.go +++ b/debugd/internal/cdbg/state/state.go @@ -9,9 +9,9 @@ package state import ( "errors" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/state" ) // Code in this file is mostly copied from constellation-controlPlane diff --git a/debugd/internal/debugd/deploy/download.go b/debugd/internal/debugd/deploy/download.go index a59af9614..aede9a1c9 100644 --- a/debugd/internal/debugd/deploy/download.go +++ b/debugd/internal/debugd/deploy/download.go @@ -13,12 +13,12 @@ import ( "strconv" "time" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - pb "github.com/edgelesssys/constellation/debugd/service" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + pb "github.com/edgelesssys/constellation/v2/debugd/service" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/debugd/internal/debugd/deploy/download_test.go b/debugd/internal/debugd/deploy/download_test.go index 870f2e4d5..a2f282386 100644 --- a/debugd/internal/debugd/deploy/download_test.go +++ b/debugd/internal/debugd/deploy/download_test.go @@ -16,13 +16,13 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - pb "github.com/edgelesssys/constellation/debugd/service" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + pb "github.com/edgelesssys/constellation/v2/debugd/service" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/stretchr/testify/assert" "go.uber.org/goleak" "google.golang.org/grpc" diff --git a/debugd/internal/debugd/deploy/service.go b/debugd/internal/debugd/deploy/service.go index 11430ad02..c2da717b8 100644 --- a/debugd/internal/debugd/deploy/service.go +++ b/debugd/internal/debugd/deploy/service.go @@ -11,8 +11,8 @@ import ( "fmt" "sync" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "go.uber.org/zap" ) diff --git a/debugd/internal/debugd/deploy/service_test.go b/debugd/internal/debugd/deploy/service_test.go index 49b648de3..f7e458c02 100644 --- a/debugd/internal/debugd/deploy/service_test.go +++ b/debugd/internal/debugd/deploy/service_test.go @@ -13,7 +13,7 @@ import ( "sync" "testing" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go index 81feedc81..abf2d6628 100644 --- a/debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go +++ b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go @@ -11,12 +11,12 @@ import ( "fmt" "net" - azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure" - gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/role" + azurecloud "github.com/edgelesssys/constellation/v2/internal/cloud/azure" + gcpcloud "github.com/edgelesssys/constellation/v2/internal/cloud/gcp" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + qemucloud "github.com/edgelesssys/constellation/v2/internal/cloud/qemu" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/role" ) type providerMetadata interface { diff --git a/debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go index 0036cc2c0..a5f791886 100644 --- a/debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go +++ b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/role" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/debugd/internal/debugd/metadata/fallback/fallback.go b/debugd/internal/debugd/metadata/fallback/fallback.go index 40e9f9577..6e2f3ea82 100644 --- a/debugd/internal/debugd/metadata/fallback/fallback.go +++ b/debugd/internal/debugd/metadata/fallback/fallback.go @@ -9,8 +9,8 @@ package fallback import ( "context" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/role" ) // Fetcher implements metadata.Fetcher interface but does not actually fetch cloud provider metadata. diff --git a/debugd/internal/debugd/metadata/scheduler.go b/debugd/internal/debugd/metadata/scheduler.go index deedc59c0..209be776d 100644 --- a/debugd/internal/debugd/metadata/scheduler.go +++ b/debugd/internal/debugd/metadata/scheduler.go @@ -13,10 +13,10 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" "go.uber.org/zap" ) diff --git a/debugd/internal/debugd/metadata/scheduler_test.go b/debugd/internal/debugd/metadata/scheduler_test.go index b38c23760..ccb733a2e 100644 --- a/debugd/internal/debugd/metadata/scheduler_test.go +++ b/debugd/internal/debugd/metadata/scheduler_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/debugd/internal/debugd/server/server.go b/debugd/internal/debugd/server/server.go index 261545b00..d3d8a2b4c 100644 --- a/debugd/internal/debugd/server/server.go +++ b/debugd/internal/debugd/server/server.go @@ -16,13 +16,13 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd" - "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" - pb "github.com/edgelesssys/constellation/debugd/service" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/deploy" + pb "github.com/edgelesssys/constellation/v2/debugd/service" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/keepalive" diff --git a/debugd/internal/debugd/server/server_test.go b/debugd/internal/debugd/server/server_test.go index 8d34966ec..86142c6ae 100644 --- a/debugd/internal/debugd/server/server_test.go +++ b/debugd/internal/debugd/server/server_test.go @@ -15,13 +15,13 @@ import ( "strconv" "testing" - "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" - "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" - pb "github.com/edgelesssys/constellation/debugd/service" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/deploy/ssh" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/deploy" + pb "github.com/edgelesssys/constellation/v2/debugd/service" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/deploy/ssh" + "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/disk-mapper/cmd/main.go b/disk-mapper/cmd/main.go index d26b00436..a88f6cf94 100644 --- a/disk-mapper/cmd/main.go +++ b/disk-mapper/cmd/main.go @@ -17,23 +17,23 @@ import ( "path/filepath" "strings" - "github.com/edgelesssys/constellation/disk-mapper/internal/mapper" - "github.com/edgelesssys/constellation/disk-mapper/internal/recoveryserver" - "github.com/edgelesssys/constellation/disk-mapper/internal/rejoinclient" - "github.com/edgelesssys/constellation/disk-mapper/internal/setup" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure" - gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/mapper" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/recoveryserver" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/rejoinclient" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/setup" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + azurecloud "github.com/edgelesssys/constellation/v2/internal/cloud/azure" + gcpcloud "github.com/edgelesssys/constellation/v2/internal/cloud/gcp" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + qemucloud "github.com/edgelesssys/constellation/v2/internal/cloud/qemu" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" tpmClient "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm/tpm2" "github.com/spf13/afero" diff --git a/disk-mapper/internal/mapper/mapper.go b/disk-mapper/internal/mapper/mapper.go index cc2d3930b..96225f34a 100644 --- a/disk-mapper/internal/mapper/mapper.go +++ b/disk-mapper/internal/mapper/mapper.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" cryptsetup "github.com/martinjungblut/go-cryptsetup" "go.uber.org/zap" ) diff --git a/disk-mapper/internal/recoveryserver/server.go b/disk-mapper/internal/recoveryserver/server.go index d593cc639..cb902aa1a 100644 --- a/disk-mapper/internal/recoveryserver/server.go +++ b/disk-mapper/internal/recoveryserver/server.go @@ -11,11 +11,11 @@ import ( "net" "sync" - "github.com/edgelesssys/constellation/disk-mapper/recoverproto" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/grpclog" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/disk-mapper/recoverproto" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" + "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/disk-mapper/internal/recoveryserver/server_test.go b/disk-mapper/internal/recoveryserver/server_test.go index 43288b89e..fc6cf3565 100644 --- a/disk-mapper/internal/recoveryserver/server_test.go +++ b/disk-mapper/internal/recoveryserver/server_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/disk-mapper/recoverproto" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/disk-mapper/recoverproto" + "github.com/edgelesssys/constellation/v2/internal/atls" + "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/oid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/disk-mapper/internal/rejoinclient/client.go b/disk-mapper/internal/rejoinclient/client.go index 6f0ffb45e..4ff2678cc 100644 --- a/disk-mapper/internal/rejoinclient/client.go +++ b/disk-mapper/internal/rejoinclient/client.go @@ -12,10 +12,10 @@ import ( "net" "time" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "go.uber.org/zap" "google.golang.org/grpc" "k8s.io/utils/clock" diff --git a/disk-mapper/internal/rejoinclient/client_test.go b/disk-mapper/internal/rejoinclient/client_test.go index ee1374ef8..d7f9e14e2 100644 --- a/disk-mapper/internal/rejoinclient/client_test.go +++ b/disk-mapper/internal/rejoinclient/client_test.go @@ -15,14 +15,14 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/dialer" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/constants" + "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/logger" + "github.com/edgelesssys/constellation/v2/internal/role" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "github.com/stretchr/testify/assert" "go.uber.org/goleak" "google.golang.org/grpc" diff --git a/disk-mapper/internal/setup/interface.go b/disk-mapper/internal/setup/interface.go index 57cac84ee..4b96e0f1c 100644 --- a/disk-mapper/internal/setup/interface.go +++ b/disk-mapper/internal/setup/interface.go @@ -11,7 +11,7 @@ import ( "os" "syscall" - "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" ) // Mounter is an interface for mount and unmount operations. diff --git a/disk-mapper/internal/setup/setup.go b/disk-mapper/internal/setup/setup.go index 9af2bde91..fe80a2ff3 100644 --- a/disk-mapper/internal/setup/setup.go +++ b/disk-mapper/internal/setup/setup.go @@ -18,14 +18,14 @@ import ( "sync" "syscall" - "github.com/edgelesssys/constellation/disk-mapper/internal/systemd" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/nodestate" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/systemd" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/nodestate" "github.com/spf13/afero" ) diff --git a/disk-mapper/internal/setup/setup_test.go b/disk-mapper/internal/setup/setup_test.go index 159d0738e..ec30bcba6 100644 --- a/disk-mapper/internal/setup/setup_test.go +++ b/disk-mapper/internal/setup/setup_test.go @@ -16,11 +16,11 @@ import ( "sync" "testing" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/nodestate" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/nodestate" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/disk-mapper/internal/test/benchmark_test.go b/disk-mapper/internal/test/benchmark_test.go index 95e471ab8..162361b9e 100644 --- a/disk-mapper/internal/test/benchmark_test.go +++ b/disk-mapper/internal/test/benchmark_test.go @@ -13,8 +13,8 @@ import ( "math" "testing" - "github.com/edgelesssys/constellation/disk-mapper/internal/mapper" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/mapper" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/martinjungblut/go-cryptsetup" "go.uber.org/zap/zapcore" ) diff --git a/disk-mapper/internal/test/integration_test.go b/disk-mapper/internal/test/integration_test.go index e5d7329c2..84e169d2e 100644 --- a/disk-mapper/internal/test/integration_test.go +++ b/disk-mapper/internal/test/integration_test.go @@ -15,8 +15,8 @@ import ( "os/exec" "testing" - "github.com/edgelesssys/constellation/disk-mapper/internal/mapper" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/disk-mapper/internal/mapper" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/martinjungblut/go-cryptsetup" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/go.mod b/go.mod index 4298e5f52..ea8cc780d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/edgelesssys/constellation +module github.com/edgelesssys/constellation/v2 go 1.18 diff --git a/hack/build-manifest/azure/client.go b/hack/build-manifest/azure/client.go index 9c0a054cd..2f4f9126b 100644 --- a/hack/build-manifest/azure/client.go +++ b/hack/build-manifest/azure/client.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" ) type Client struct { diff --git a/hack/build-manifest/gcp/client.go b/hack/build-manifest/gcp/client.go index 732560c21..0d9bb99f1 100644 --- a/hack/build-manifest/gcp/client.go +++ b/hack/build-manifest/gcp/client.go @@ -11,7 +11,7 @@ import ( "strings" compute "cloud.google.com/go/compute/apiv1" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" "google.golang.org/api/iterator" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) diff --git a/hack/build-manifest/main.go b/hack/build-manifest/main.go index 5b430fff2..566014c95 100644 --- a/hack/build-manifest/main.go +++ b/hack/build-manifest/main.go @@ -11,9 +11,9 @@ import ( "encoding/json" "os" - "github.com/edgelesssys/constellation/hack/build-manifest/azure" - "github.com/edgelesssys/constellation/hack/build-manifest/gcp" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/hack/build-manifest/azure" + "github.com/edgelesssys/constellation/v2/hack/build-manifest/gcp" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap/zapcore" ) diff --git a/hack/clidocgen/main.go b/hack/clidocgen/main.go index 0dfbdb17a..83860cd9f 100644 --- a/hack/clidocgen/main.go +++ b/hack/clidocgen/main.go @@ -12,7 +12,7 @@ import ( "fmt" "regexp" - "github.com/edgelesssys/constellation/cli/cmd" + "github.com/edgelesssys/constellation/v2/cli/cmd" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" ) diff --git a/hack/go.mod b/hack/go.mod index 944879cf9..b9d006c0e 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,4 +1,4 @@ -module github.com/edgelesssys/constellation/hack +module github.com/edgelesssys/constellation/v2/hack go 1.18 @@ -30,13 +30,13 @@ replace ( k8s.io/sample-apiserver v0.0.0 => k8s.io/sample-apiserver v0.24.3 ) -replace github.com/edgelesssys/constellation => ./.. +replace github.com/edgelesssys/constellation/v2 => ./.. require ( cloud.google.com/go/compute v1.7.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 - github.com/edgelesssys/constellation v1.0.0 + github.com/edgelesssys/constellation/v2 v2.0.0 github.com/go-git/go-git/v5 v5.4.2 github.com/google/go-tpm-tools v0.3.8 github.com/google/uuid v1.3.0 diff --git a/hack/image-measurement/main.go b/hack/image-measurement/main.go index f806b4a65..8211b9be5 100644 --- a/hack/image-measurement/main.go +++ b/hack/image-measurement/main.go @@ -15,9 +15,9 @@ import ( "os/signal" "syscall" - "github.com/edgelesssys/constellation/hack/image-measurement/server" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/hack/image-measurement/server" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/multierr" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/hack/image-measurement/server/server.go b/hack/image-measurement/server/server.go index b4ebe2ce3..3f9351600 100644 --- a/hack/image-measurement/server/server.go +++ b/hack/image-measurement/server/server.go @@ -12,7 +12,7 @@ import ( "net" "net/http" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" ) diff --git a/hack/pcr-reader/main.go b/hack/pcr-reader/main.go index bcfd64f1b..d57411210 100644 --- a/hack/pcr-reader/main.go +++ b/hack/pcr-reader/main.go @@ -20,10 +20,10 @@ import ( "strconv" "time" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/verify/verifyproto" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/verify/verifyproto" "github.com/spf13/afero" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/hack/pcr-reader/main_test.go b/hack/pcr-reader/main_test.go index 1a4257132..15e49dd6b 100644 --- a/hack/pcr-reader/main_test.go +++ b/hack/pcr-reader/main_test.go @@ -13,7 +13,7 @@ import ( "fmt" "testing" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/google/go-tpm-tools/proto/attest" "github.com/google/go-tpm-tools/proto/tpm" "github.com/spf13/afero" diff --git a/hack/pseudo-version/pseudo-version.go b/hack/pseudo-version/pseudo-version.go index cfbb6d1d6..89215d776 100644 --- a/hack/pseudo-version/pseudo-version.go +++ b/hack/pseudo-version/pseudo-version.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/edgelesssys/constellation/hack/pseudo-version/internal/git" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/hack/pseudo-version/internal/git" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/mod/module" diff --git a/hack/qemu-metadata-api/main.go b/hack/qemu-metadata-api/main.go index daff3a4ca..9fe1d2106 100644 --- a/hack/qemu-metadata-api/main.go +++ b/hack/qemu-metadata-api/main.go @@ -9,9 +9,9 @@ package main import ( "flag" - "github.com/edgelesssys/constellation/hack/qemu-metadata-api/server" - "github.com/edgelesssys/constellation/hack/qemu-metadata-api/virtwrapper" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/server" + "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" "libvirt.org/go/libvirt" diff --git a/hack/qemu-metadata-api/server/server.go b/hack/qemu-metadata-api/server/server.go index a174625a7..e6f92f51b 100644 --- a/hack/qemu-metadata-api/server/server.go +++ b/hack/qemu-metadata-api/server/server.go @@ -14,10 +14,10 @@ import ( "net/http" "strings" - "github.com/edgelesssys/constellation/hack/qemu-metadata-api/virtwrapper" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/role" "go.uber.org/zap" ) diff --git a/hack/qemu-metadata-api/server/server_test.go b/hack/qemu-metadata-api/server/server_test.go index 1ab61d567..eb3edc79a 100644 --- a/hack/qemu-metadata-api/server/server_test.go +++ b/hack/qemu-metadata-api/server/server_test.go @@ -16,9 +16,9 @@ import ( "strings" "testing" - "github.com/edgelesssys/constellation/hack/qemu-metadata-api/virtwrapper" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api/virtwrapper" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "libvirt.org/go/libvirt" diff --git a/hack/terraform-to-state/create-state.go b/hack/terraform-to-state/create-state.go index b0222cc9c..a96b6df2f 100644 --- a/hack/terraform-to-state/create-state.go +++ b/hack/terraform-to-state/create-state.go @@ -13,9 +13,9 @@ import ( "os" "os/exec" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" - "github.com/edgelesssys/constellation/internal/state" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/state" ) type terraformOutput struct { diff --git a/internal/atls/atls.go b/internal/atls/atls.go index 7d5f57d8c..9d3ed0857 100644 --- a/internal/atls/atls.go +++ b/internal/atls/atls.go @@ -23,8 +23,8 @@ import ( "math/big" "time" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/oid" ) // CreateAttestationServerTLSConfig creates a tls.Config object with a self-signed certificate and an embedded attestation document. diff --git a/internal/atls/atls_test.go b/internal/atls/atls_test.go index 8b47608e6..ec25fbd6b 100644 --- a/internal/atls/atls_test.go +++ b/internal/atls/atls_test.go @@ -15,7 +15,7 @@ import ( "net/http/httptest" "testing" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/internal/attestation/attestation.go b/internal/attestation/attestation.go index fd87ad579..4dac21127 100644 --- a/internal/attestation/attestation.go +++ b/internal/attestation/attestation.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package attestation import ( - "github.com/edgelesssys/constellation/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/crypto" ) const ( diff --git a/internal/attestation/attestation_test.go b/internal/attestation/attestation_test.go index 235a01bfb..fd4140a03 100644 --- a/internal/attestation/attestation_test.go +++ b/internal/attestation/attestation_test.go @@ -9,7 +9,7 @@ package attestation import ( "testing" - "github.com/edgelesssys/constellation/internal/crypto/testvector" + "github.com/edgelesssys/constellation/v2/internal/crypto/testvector" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/attestation/aws/issuer.go b/internal/attestation/aws/issuer.go index 58e5856df..4d56e9a04 100644 --- a/internal/attestation/aws/issuer.go +++ b/internal/attestation/aws/issuer.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package aws -import "github.com/edgelesssys/constellation/internal/oid" +import "github.com/edgelesssys/constellation/v2/internal/oid" type Issuer struct { oid.AWS diff --git a/internal/attestation/aws/validator.go b/internal/attestation/aws/validator.go index bd6b2f158..074db252e 100644 --- a/internal/attestation/aws/validator.go +++ b/internal/attestation/aws/validator.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package aws import ( - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/oid" ) type Validator struct { diff --git a/internal/attestation/azure/issuer.go b/internal/attestation/azure/issuer.go index b36e12b80..6c6f937c0 100644 --- a/internal/attestation/azure/issuer.go +++ b/internal/attestation/azure/issuer.go @@ -7,10 +7,10 @@ SPDX-License-Identifier: AGPL-3.0-only package azure import ( - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure/snp" - "github.com/edgelesssys/constellation/internal/attestation/azure/trustedlaunch" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/snp" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/trustedlaunch" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" ) // NewIssuer returns an SNP issuer if it can successfully read the idkeydigest from the TPM. diff --git a/internal/attestation/azure/snp/issuer.go b/internal/attestation/azure/snp/issuer.go index 42dfb8fa4..42dca6531 100644 --- a/internal/attestation/azure/snp/issuer.go +++ b/internal/attestation/azure/snp/issuer.go @@ -14,8 +14,8 @@ import ( "io" "net/http" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" tpmclient "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm/tpm2" ) diff --git a/internal/attestation/azure/snp/validator.go b/internal/attestation/azure/snp/validator.go index e13423fc1..c27490548 100644 --- a/internal/attestation/azure/snp/validator.go +++ b/internal/attestation/azure/snp/validator.go @@ -19,9 +19,9 @@ import ( "fmt" "math/big" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - internalCrypto "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + internalCrypto "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/google/go-tpm/tpm2" ) diff --git a/internal/attestation/azure/snp/validator_test.go b/internal/attestation/azure/snp/validator_test.go index da71461f7..71ebd6d98 100644 --- a/internal/attestation/azure/snp/validator_test.go +++ b/internal/attestation/azure/snp/validator_test.go @@ -17,8 +17,8 @@ import ( "fmt" "testing" - "github.com/edgelesssys/constellation/internal/attestation/simulator" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm/tpm2" "github.com/stretchr/testify/assert" diff --git a/internal/attestation/azure/trustedlaunch/issuer.go b/internal/attestation/azure/trustedlaunch/issuer.go index 392873dc4..8d8be2a52 100644 --- a/internal/attestation/azure/trustedlaunch/issuer.go +++ b/internal/attestation/azure/trustedlaunch/issuer.go @@ -9,8 +9,8 @@ package trustedlaunch import ( "io" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" tpmclient "github.com/google/go-tpm-tools/client" ) diff --git a/internal/attestation/azure/trustedlaunch/issuer_test.go b/internal/attestation/azure/trustedlaunch/issuer_test.go index 885f56d42..431abe203 100644 --- a/internal/attestation/azure/trustedlaunch/issuer_test.go +++ b/internal/attestation/azure/trustedlaunch/issuer_test.go @@ -9,8 +9,8 @@ package trustedlaunch import ( "testing" - "github.com/edgelesssys/constellation/internal/attestation/simulator" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/attestation/azure/trustedlaunch/validator.go b/internal/attestation/azure/trustedlaunch/validator.go index 1a0cc9065..011653643 100644 --- a/internal/attestation/azure/trustedlaunch/validator.go +++ b/internal/attestation/azure/trustedlaunch/validator.go @@ -9,8 +9,8 @@ package trustedlaunch import ( "crypto" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/google/go-tpm/tpm2" ) diff --git a/internal/attestation/azure/trustedlaunch/validator_test.go b/internal/attestation/azure/trustedlaunch/validator_test.go index f92c80b19..46cb9d7b1 100644 --- a/internal/attestation/azure/trustedlaunch/validator_test.go +++ b/internal/attestation/azure/trustedlaunch/validator_test.go @@ -9,8 +9,8 @@ package trustedlaunch import ( "testing" - "github.com/edgelesssys/constellation/internal/attestation/simulator" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/google/go-tpm-tools/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/attestation/gcp/issuer.go b/internal/attestation/gcp/issuer.go index da6d55901..74360c192 100644 --- a/internal/attestation/gcp/issuer.go +++ b/internal/attestation/gcp/issuer.go @@ -12,8 +12,8 @@ import ( "io" "cloud.google.com/go/compute/metadata" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" tpmclient "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm-tools/proto/attest" ) diff --git a/internal/attestation/gcp/validator.go b/internal/attestation/gcp/validator.go index 58a307fba..e698da6ba 100644 --- a/internal/attestation/gcp/validator.go +++ b/internal/attestation/gcp/validator.go @@ -18,8 +18,8 @@ import ( "time" compute "cloud.google.com/go/compute/apiv1" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/google/go-tpm-tools/proto/attest" "github.com/google/go-tpm-tools/server" "github.com/googleapis/gax-go/v2" diff --git a/internal/attestation/gcp/validator_test.go b/internal/attestation/gcp/validator_test.go index a0c1bfd91..70119bcc6 100644 --- a/internal/attestation/gcp/validator_test.go +++ b/internal/attestation/gcp/validator_test.go @@ -13,7 +13,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/google/go-tpm-tools/proto/attest" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" diff --git a/internal/attestation/qemu/issuer.go b/internal/attestation/qemu/issuer.go index 49a48d5b0..e935564e7 100644 --- a/internal/attestation/qemu/issuer.go +++ b/internal/attestation/qemu/issuer.go @@ -9,8 +9,8 @@ package qemu import ( "io" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" tpmclient "github.com/google/go-tpm-tools/client" ) diff --git a/internal/attestation/qemu/validator.go b/internal/attestation/qemu/validator.go index 5c67f9422..82dabc905 100644 --- a/internal/attestation/qemu/validator.go +++ b/internal/attestation/qemu/validator.go @@ -9,8 +9,8 @@ package qemu import ( "crypto" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/google/go-tpm/tpm2" ) diff --git a/internal/attestation/vtpm/attestation_test.go b/internal/attestation/vtpm/attestation_test.go index 25e7628de..3e52d1706 100644 --- a/internal/attestation/vtpm/attestation_test.go +++ b/internal/attestation/vtpm/attestation_test.go @@ -14,7 +14,7 @@ import ( "io" "testing" - tpmsim "github.com/edgelesssys/constellation/internal/attestation/simulator" + tpmsim "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" tpmclient "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm-tools/proto/attest" "github.com/google/go-tpm-tools/proto/tpm" diff --git a/internal/attestation/vtpm/initialize_test.go b/internal/attestation/vtpm/initialize_test.go index 31765bdc8..69b39580a 100644 --- a/internal/attestation/vtpm/initialize_test.go +++ b/internal/attestation/vtpm/initialize_test.go @@ -11,7 +11,7 @@ import ( "io" "testing" - "github.com/edgelesssys/constellation/internal/attestation/simulator" + "github.com/edgelesssys/constellation/v2/internal/attestation/simulator" "github.com/google/go-tpm-tools/client" "github.com/google/go-tpm/tpm2" "github.com/stretchr/testify/assert" diff --git a/internal/cloud/azure/autoscaler.go b/internal/cloud/azure/autoscaler.go index 869139c9e..8c8b26a41 100644 --- a/internal/cloud/azure/autoscaler.go +++ b/internal/cloud/azure/autoscaler.go @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only package azure import ( - "github.com/edgelesssys/constellation/internal/azureshared" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/azureshared" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" k8s "k8s.io/api/core/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/cloud/azure/autoscaler_test.go b/internal/cloud/azure/autoscaler_test.go index 5a14d925a..d2d0c2305 100644 --- a/internal/cloud/azure/autoscaler_test.go +++ b/internal/cloud/azure/autoscaler_test.go @@ -9,7 +9,7 @@ package azure import ( "testing" - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" k8s "k8s.io/api/core/v1" diff --git a/internal/cloud/azure/ccm.go b/internal/cloud/azure/ccm.go index 87c0c4968..874f7f7db 100644 --- a/internal/cloud/azure/ccm.go +++ b/internal/cloud/azure/ccm.go @@ -10,10 +10,10 @@ import ( "context" "encoding/json" - "github.com/edgelesssys/constellation/internal/azureshared" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/azureshared" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" k8s "k8s.io/api/core/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/cloud/azure/ccm_test.go b/internal/cloud/azure/ccm_test.go index fdf79a937..8f14d4e67 100644 --- a/internal/cloud/azure/ccm_test.go +++ b/internal/cloud/azure/ccm_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" k8s "k8s.io/api/core/v1" diff --git a/internal/cloud/azure/cloudnodemanager.go b/internal/cloud/azure/cloudnodemanager.go index 671025ba5..1da3e7e63 100644 --- a/internal/cloud/azure/cloudnodemanager.go +++ b/internal/cloud/azure/cloudnodemanager.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package azure import ( - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/versions" ) // CloudNodeManager holds the Azure cloud-node-manager configuration. diff --git a/internal/cloud/azure/cloudnodemanager_test.go b/internal/cloud/azure/cloudnodemanager_test.go index fd00fb792..5866d16b1 100644 --- a/internal/cloud/azure/cloudnodemanager_test.go +++ b/internal/cloud/azure/cloudnodemanager_test.go @@ -9,7 +9,7 @@ package azure import ( "testing" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/stretchr/testify/assert" ) diff --git a/internal/cloud/azure/metadata.go b/internal/cloud/azure/metadata.go index d41ddaa02..9c7817eea 100644 --- a/internal/cloud/azure/metadata.go +++ b/internal/cloud/azure/metadata.go @@ -17,7 +17,7 @@ import ( armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" ) var ( diff --git a/internal/cloud/azure/metadata_test.go b/internal/cloud/azure/metadata_test.go index 66a892c6c..f7359bdc4 100644 --- a/internal/cloud/azure/metadata_test.go +++ b/internal/cloud/azure/metadata_test.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cloud/azure/scaleset.go b/internal/cloud/azure/scaleset.go index 0ee3b1b39..b92a2f34e 100644 --- a/internal/cloud/azure/scaleset.go +++ b/internal/cloud/azure/scaleset.go @@ -16,9 +16,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/edgelesssys/constellation/internal/azureshared" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/azureshared" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/role" ) var ( diff --git a/internal/cloud/azure/scaleset_test.go b/internal/cloud/azure/scaleset_test.go index e57631fe8..3210aefa4 100644 --- a/internal/cloud/azure/scaleset_test.go +++ b/internal/cloud/azure/scaleset_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/role" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cloud/gcp/autoscaler.go b/internal/cloud/gcp/autoscaler.go index cbd600782..758cc4836 100644 --- a/internal/cloud/gcp/autoscaler.go +++ b/internal/cloud/gcp/autoscaler.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package gcp import ( - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" k8s "k8s.io/api/core/v1" ) diff --git a/internal/cloud/gcp/ccm.go b/internal/cloud/gcp/ccm.go index af1a5c986..6229f0992 100644 --- a/internal/cloud/gcp/ccm.go +++ b/internal/cloud/gcp/ccm.go @@ -12,10 +12,10 @@ import ( "fmt" "strings" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/gcpshared" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" k8s "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/cloud/gcp/ccm_test.go b/internal/cloud/gcp/ccm_test.go index 6eab75ed6..3d2b3e4ff 100644 --- a/internal/cloud/gcp/ccm_test.go +++ b/internal/cloud/gcp/ccm_test.go @@ -11,10 +11,10 @@ import ( "encoding/json" "testing" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/gcpshared" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" k8s "k8s.io/api/core/v1" diff --git a/internal/cloud/gcp/client.go b/internal/cloud/gcp/client.go index af628f498..7a0565f91 100644 --- a/internal/cloud/gcp/client.go +++ b/internal/cloud/gcp/client.go @@ -15,8 +15,8 @@ import ( "strings" compute "cloud.google.com/go/compute/apiv1" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" "google.golang.org/api/iterator" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" diff --git a/internal/cloud/gcp/client_test.go b/internal/cloud/gcp/client_test.go index fdfb46464..b2f594ac0 100644 --- a/internal/cloud/gcp/client_test.go +++ b/internal/cloud/gcp/client_test.go @@ -12,8 +12,8 @@ import ( "testing" compute "cloud.google.com/go/compute/apiv1" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/role" gax "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/cloud/gcp/cloudnodemanager.go b/internal/cloud/gcp/cloudnodemanager.go index c4b183942..bb4b55f8f 100644 --- a/internal/cloud/gcp/cloudnodemanager.go +++ b/internal/cloud/gcp/cloudnodemanager.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package gcp -import "github.com/edgelesssys/constellation/internal/versions" +import "github.com/edgelesssys/constellation/v2/internal/versions" // CloudNodeManager holds the GCP cloud-node-manager configuration. type CloudNodeManager struct{} diff --git a/internal/cloud/gcp/logger.go b/internal/cloud/gcp/logger.go index 9323d5975..90c27bd3b 100644 --- a/internal/cloud/gcp/logger.go +++ b/internal/cloud/gcp/logger.go @@ -11,7 +11,7 @@ import ( "log" "cloud.google.com/go/logging" - "github.com/edgelesssys/constellation/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" ) type Logger struct { diff --git a/internal/cloud/gcp/metadata.go b/internal/cloud/gcp/metadata.go index 34e61ad3a..2b92ea6ae 100644 --- a/internal/cloud/gcp/metadata.go +++ b/internal/cloud/gcp/metadata.go @@ -10,8 +10,8 @@ import ( "context" "fmt" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/gcpshared" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/gcpshared" ) // API handles all GCP API requests. diff --git a/internal/cloud/gcp/metadata_test.go b/internal/cloud/gcp/metadata_test.go index 283b88d6c..14e13ad7b 100644 --- a/internal/cloud/gcp/metadata_test.go +++ b/internal/cloud/gcp/metadata_test.go @@ -11,7 +11,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cloud/gcp/role.go b/internal/cloud/gcp/role.go index 2bfd5de83..c4296e56b 100644 --- a/internal/cloud/gcp/role.go +++ b/internal/cloud/gcp/role.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package gcp import ( - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/role" ) const roleMetadataKey = "constellation-role" diff --git a/internal/cloud/gcp/role_test.go b/internal/cloud/gcp/role_test.go index fb658dadc..a1aa7b22c 100644 --- a/internal/cloud/gcp/role_test.go +++ b/internal/cloud/gcp/role_test.go @@ -9,7 +9,7 @@ package gcp import ( "testing" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/role" "github.com/stretchr/testify/assert" ) diff --git a/internal/cloud/metadata/metadata.go b/internal/cloud/metadata/metadata.go index 0e34ad1c2..b5abc5678 100644 --- a/internal/cloud/metadata/metadata.go +++ b/internal/cloud/metadata/metadata.go @@ -12,8 +12,8 @@ import ( "net" "strconv" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/role" ) // InstanceMetadata describes metadata of a peer. diff --git a/internal/cloud/qemu/autoscaler.go b/internal/cloud/qemu/autoscaler.go index 6aad02b6c..8cbe98331 100644 --- a/internal/cloud/qemu/autoscaler.go +++ b/internal/cloud/qemu/autoscaler.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package qemu import ( - "github.com/edgelesssys/constellation/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" k8s "k8s.io/api/core/v1" ) diff --git a/internal/cloud/qemu/ccm.go b/internal/cloud/qemu/ccm.go index e5d80c3ac..a975e73d6 100644 --- a/internal/cloud/qemu/ccm.go +++ b/internal/cloud/qemu/ccm.go @@ -9,9 +9,9 @@ package qemu import ( "context" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - "github.com/edgelesssys/constellation/internal/kubernetes" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/kubernetes" + "github.com/edgelesssys/constellation/v2/internal/versions" k8s "k8s.io/api/core/v1" ) diff --git a/internal/cloud/qemu/cloudnodemanager.go b/internal/cloud/qemu/cloudnodemanager.go index d1c838edd..6983d2dfc 100644 --- a/internal/cloud/qemu/cloudnodemanager.go +++ b/internal/cloud/qemu/cloudnodemanager.go @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only package qemu -import "github.com/edgelesssys/constellation/internal/versions" +import "github.com/edgelesssys/constellation/v2/internal/versions" // CloudNodeManager holds the QEMU cloud-node-manager configuration. type CloudNodeManager struct{} diff --git a/internal/cloud/qemu/metadata.go b/internal/cloud/qemu/metadata.go index 7187bc936..499b02f6b 100644 --- a/internal/cloud/qemu/metadata.go +++ b/internal/cloud/qemu/metadata.go @@ -14,7 +14,7 @@ import ( "net/http" "net/url" - "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" ) const qemuMetadataEndpoint = "10.42.0.1:8080" diff --git a/internal/config/config.go b/internal/config/config.go index 08e86d105..28b19c007 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -17,10 +17,10 @@ import ( "regexp" "strings" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config/instancetypes" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/versions" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config/instancetypes" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/versions" "github.com/go-playground/locales/en" ut "github.com/go-playground/universal-translator" "github.com/go-playground/validator/v10" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 063b8757a..0b25cbdd7 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -10,10 +10,10 @@ import ( "reflect" "testing" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config/instancetypes" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config/instancetypes" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/go-playground/locales/en" ut "github.com/go-playground/universal-translator" "github.com/go-playground/validator/v10" diff --git a/internal/config/measurements.go b/internal/config/measurements.go index 50449f06d..68a938b95 100644 --- a/internal/config/measurements.go +++ b/internal/config/measurements.go @@ -15,8 +15,8 @@ import ( "net/http" "net/url" - "github.com/edgelesssys/constellation/internal/attestation/vtpm" - "github.com/edgelesssys/constellation/internal/sigstore" + "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" + "github.com/edgelesssys/constellation/v2/internal/sigstore" "gopkg.in/yaml.v2" ) diff --git a/internal/constants/firewall.go b/internal/constants/firewall.go index f39ee3b7a..cf6de09c0 100644 --- a/internal/constants/firewall.go +++ b/internal/constants/firewall.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package constants import ( - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" ) var ( diff --git a/internal/crypto/crypto_test.go b/internal/crypto/crypto_test.go index e27aef5f4..d814f568b 100644 --- a/internal/crypto/crypto_test.go +++ b/internal/crypto/crypto_test.go @@ -9,7 +9,7 @@ package crypto import ( "testing" - "github.com/edgelesssys/constellation/internal/crypto/testvector" + "github.com/edgelesssys/constellation/v2/internal/crypto/testvector" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/internal/deploy/ssh/proto.go b/internal/deploy/ssh/proto.go index d42ab49d5..415f263bc 100644 --- a/internal/deploy/ssh/proto.go +++ b/internal/deploy/ssh/proto.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package ssh import ( - "github.com/edgelesssys/constellation/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" ) // FromProtoSlice converts a SSH UserKey definition from pubproto to the Go flavor. diff --git a/internal/deploy/ssh/ssh.go b/internal/deploy/ssh/ssh.go index 0265473bd..b7a7baa39 100644 --- a/internal/deploy/ssh/ssh.go +++ b/internal/deploy/ssh/ssh.go @@ -12,8 +12,8 @@ import ( "os" "sync" - "github.com/edgelesssys/constellation/internal/deploy/user" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/deploy/user" + "github.com/edgelesssys/constellation/v2/internal/logger" "go.uber.org/zap" ) diff --git a/internal/deploy/ssh/ssh_test.go b/internal/deploy/ssh/ssh_test.go index 149df46be..cb0a7df9e 100644 --- a/internal/deploy/ssh/ssh_test.go +++ b/internal/deploy/ssh/ssh_test.go @@ -11,8 +11,8 @@ import ( "sync" "testing" - "github.com/edgelesssys/constellation/internal/deploy/user" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/deploy/user" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/file/file_test.go b/internal/file/file_test.go index 85975b781..614109071 100644 --- a/internal/file/file_test.go +++ b/internal/file/file_test.go @@ -10,7 +10,7 @@ import ( "encoding/json" "testing" - "github.com/edgelesssys/constellation/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/grpc/atlscredentials/atlscredentials.go b/internal/grpc/atlscredentials/atlscredentials.go index e5a97b7c3..4b0a6e19e 100644 --- a/internal/grpc/atlscredentials/atlscredentials.go +++ b/internal/grpc/atlscredentials/atlscredentials.go @@ -11,7 +11,7 @@ import ( "errors" "net" - "github.com/edgelesssys/constellation/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/atls" "google.golang.org/grpc/credentials" ) diff --git a/internal/grpc/atlscredentials/atlscredentials_test.go b/internal/grpc/atlscredentials/atlscredentials_test.go index 1de5e45db..8ae28ff27 100644 --- a/internal/grpc/atlscredentials/atlscredentials_test.go +++ b/internal/grpc/atlscredentials/atlscredentials_test.go @@ -15,8 +15,8 @@ import ( "net" "testing" - "github.com/edgelesssys/constellation/bootstrapper/initproto" - "github.com/edgelesssys/constellation/internal/atls" + "github.com/edgelesssys/constellation/v2/bootstrapper/initproto" + "github.com/edgelesssys/constellation/v2/internal/atls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/internal/grpc/dialer/dialer.go b/internal/grpc/dialer/dialer.go index 0cf09e050..69834bc34 100644 --- a/internal/grpc/dialer/dialer.go +++ b/internal/grpc/dialer/dialer.go @@ -10,8 +10,8 @@ import ( "context" "net" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/grpc/dialer/dialer_test.go b/internal/grpc/dialer/dialer_test.go index a06bdfdbd..ed64f5843 100644 --- a/internal/grpc/dialer/dialer_test.go +++ b/internal/grpc/dialer/dialer_test.go @@ -10,10 +10,10 @@ import ( "context" "testing" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/oid" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" + "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" + "github.com/edgelesssys/constellation/v2/internal/oid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/internal/license/checker_enterprise.go b/internal/license/checker_enterprise.go index cc2771059..1fdc752b0 100644 --- a/internal/license/checker_enterprise.go +++ b/internal/license/checker_enterprise.go @@ -13,10 +13,10 @@ import ( "errors" "io/fs" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "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" ) type Checker struct { diff --git a/internal/license/checker_oss.go b/internal/license/checker_oss.go index c3a832b22..13160c5f8 100644 --- a/internal/license/checker_oss.go +++ b/internal/license/checker_oss.go @@ -11,9 +11,9 @@ package license import ( "context" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/config" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/config" + "github.com/edgelesssys/constellation/v2/internal/file" ) type Checker struct{} diff --git a/internal/license/file.go b/internal/license/file.go index 7e0aa4675..53d2987de 100644 --- a/internal/license/file.go +++ b/internal/license/file.go @@ -10,7 +10,7 @@ import ( "encoding/base64" "fmt" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/file" ) func FromFile(fileHandler file.Handler, path string) (string, error) { diff --git a/internal/license/file_test.go b/internal/license/file_test.go index 8e1ff13a7..47ca08386 100644 --- a/internal/license/file_test.go +++ b/internal/license/file_test.go @@ -9,8 +9,8 @@ package license import ( "testing" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/nodestate/nodestate.go b/internal/nodestate/nodestate.go index f61faf4df..d72e7c56f 100644 --- a/internal/nodestate/nodestate.go +++ b/internal/nodestate/nodestate.go @@ -9,8 +9,8 @@ package nodestate import ( "fmt" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/role" ) const nodeStatePath = "/run/state/constellation/node_state.json" diff --git a/internal/nodestate/nodestate_test.go b/internal/nodestate/nodestate_test.go index adb9baebd..6b457eac9 100644 --- a/internal/nodestate/nodestate_test.go +++ b/internal/nodestate/nodestate_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/role" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/role" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/state/state.go b/internal/state/state.go index b0c0c0106..304702956 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package state import ( - "github.com/edgelesssys/constellation/internal/cloud/cloudtypes" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudtypes" ) // ConstellationState is the state of a Constellation. diff --git a/internal/watcher/validator.go b/internal/watcher/validator.go index cf3974a88..db1c7707f 100644 --- a/internal/watcher/validator.go +++ b/internal/watcher/validator.go @@ -14,15 +14,15 @@ import ( "strconv" "sync" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/attestation/azure/snp" - "github.com/edgelesssys/constellation/internal/attestation/azure/trustedlaunch" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/snp" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure/trustedlaunch" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" ) // Updatable implements an updatable atls.Validator. diff --git a/internal/watcher/validator_test.go b/internal/watcher/validator_test.go index cb5ba9f3b..b834b128b 100644 --- a/internal/watcher/validator_test.go +++ b/internal/watcher/validator_test.go @@ -19,10 +19,10 @@ import ( "sync" "testing" - "github.com/edgelesssys/constellation/internal/atls" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/atls" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/watcher/watcher.go b/internal/watcher/watcher.go index de43da562..3d8f5fa30 100644 --- a/internal/watcher/watcher.go +++ b/internal/watcher/watcher.go @@ -9,7 +9,7 @@ package watcher import ( "fmt" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/fsnotify/fsnotify" "go.uber.org/zap" ) diff --git a/internal/watcher/watcher_test.go b/internal/watcher/watcher_test.go index f56f4cd94..5c07cff9d 100644 --- a/internal/watcher/watcher_test.go +++ b/internal/watcher/watcher_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/fsnotify/fsnotify" "github.com/stretchr/testify/assert" ) diff --git a/joinservice/cmd/main.go b/joinservice/cmd/main.go index 87f4e93a8..1b96bf198 100644 --- a/joinservice/cmd/main.go +++ b/joinservice/cmd/main.go @@ -15,21 +15,21 @@ import ( "strconv" "time" - "github.com/edgelesssys/constellation/internal/atls" - azurecloud "github.com/edgelesssys/constellation/internal/cloud/azure" - "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" - gcpcloud "github.com/edgelesssys/constellation/internal/cloud/gcp" - "github.com/edgelesssys/constellation/internal/cloud/metadata" - qemucloud "github.com/edgelesssys/constellation/internal/cloud/qemu" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/atlscredentials" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/watcher" - "github.com/edgelesssys/constellation/joinservice/internal/kms" - "github.com/edgelesssys/constellation/joinservice/internal/kubeadm" - "github.com/edgelesssys/constellation/joinservice/internal/kubernetesca" - "github.com/edgelesssys/constellation/joinservice/internal/server" + "github.com/edgelesssys/constellation/v2/internal/atls" + azurecloud "github.com/edgelesssys/constellation/v2/internal/cloud/azure" + "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + gcpcloud "github.com/edgelesssys/constellation/v2/internal/cloud/gcp" + "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" + qemucloud "github.com/edgelesssys/constellation/v2/internal/cloud/qemu" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/watcher" + "github.com/edgelesssys/constellation/v2/joinservice/internal/kms" + "github.com/edgelesssys/constellation/v2/joinservice/internal/kubeadm" + "github.com/edgelesssys/constellation/v2/joinservice/internal/kubernetesca" + "github.com/edgelesssys/constellation/v2/joinservice/internal/server" "github.com/spf13/afero" "go.uber.org/zap" ) diff --git a/joinservice/internal/kms/kms.go b/joinservice/internal/kms/kms.go index 9d3471471..ef16019fa 100644 --- a/joinservice/internal/kms/kms.go +++ b/joinservice/internal/kms/kms.go @@ -10,8 +10,8 @@ import ( "context" "fmt" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/joinservice/internal/kms/kms_test.go b/joinservice/internal/kms/kms_test.go index c1cafb5ec..9d824dc26 100644 --- a/joinservice/internal/kms/kms_test.go +++ b/joinservice/internal/kms/kms_test.go @@ -11,8 +11,8 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "github.com/stretchr/testify/assert" "go.uber.org/goleak" "google.golang.org/grpc" diff --git a/joinservice/internal/kubeadm/kubeadm.go b/joinservice/internal/kubeadm/kubeadm.go index 273857706..cab2cfe2d 100644 --- a/joinservice/internal/kubeadm/kubeadm.go +++ b/joinservice/internal/kubeadm/kubeadm.go @@ -12,9 +12,9 @@ import ( "path/filepath" "time" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" diff --git a/joinservice/internal/kubeadm/kubeadm_test.go b/joinservice/internal/kubeadm/kubeadm_test.go index 4261b9b51..14613b4f3 100644 --- a/joinservice/internal/kubeadm/kubeadm_test.go +++ b/joinservice/internal/kubeadm/kubeadm_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/joinservice/internal/kubernetesca/kubernetesca.go b/joinservice/internal/kubernetesca/kubernetesca.go index 6f46a1623..8dc3e67f3 100644 --- a/joinservice/internal/kubernetesca/kubernetesca.go +++ b/joinservice/internal/kubernetesca/kubernetesca.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" kubeconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) diff --git a/joinservice/internal/kubernetesca/kubernetesca_test.go b/joinservice/internal/kubernetesca/kubernetesca_test.go index 0d67bab3f..d7920043b 100644 --- a/joinservice/internal/kubernetesca/kubernetesca_test.go +++ b/joinservice/internal/kubernetesca/kubernetesca_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/joinservice/internal/server/server.go b/joinservice/internal/server/server.go index e5e03a7b2..1aedecb0b 100644 --- a/joinservice/internal/server/server.go +++ b/joinservice/internal/server/server.go @@ -13,13 +13,13 @@ import ( "path/filepath" "time" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/grpc/grpclog" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/joinservice/internal/server/server_test.go b/joinservice/internal/server/server_test.go index f3aaa2ba7..7c7e4197a 100644 --- a/joinservice/internal/server/server_test.go +++ b/joinservice/internal/server/server_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/internal/attestation" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/internal/versions" - "github.com/edgelesssys/constellation/joinservice/joinproto" + "github.com/edgelesssys/constellation/v2/internal/attestation" + "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/versions" + "github.com/edgelesssys/constellation/v2/joinservice/joinproto" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/kms/cmd/main.go b/kms/cmd/main.go index 9dc302ecf..f9f5f86a9 100644 --- a/kms/cmd/main.go +++ b/kms/cmd/main.go @@ -15,12 +15,12 @@ import ( "strconv" "time" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/file" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/kms/internal/server" - "github.com/edgelesssys/constellation/kms/setup" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/kms/internal/server" + "github.com/edgelesssys/constellation/v2/kms/setup" "github.com/spf13/afero" "go.uber.org/zap" ) diff --git a/kms/internal/server/server.go b/kms/internal/server/server.go index 870fe755e..b0ebc1570 100644 --- a/kms/internal/server/server.go +++ b/kms/internal/server/server.go @@ -12,11 +12,11 @@ import ( "fmt" "net" - "github.com/edgelesssys/constellation/internal/crypto" - "github.com/edgelesssys/constellation/internal/grpc/grpclog" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/grpc" diff --git a/kms/internal/server/server_test.go b/kms/internal/server/server_test.go index f1da0b05a..9bca55cf7 100644 --- a/kms/internal/server/server_test.go +++ b/kms/internal/server/server_test.go @@ -11,8 +11,8 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/kms/kmsproto" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/kms/kmsproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/kms/internal/storage/awss3storage.go b/kms/internal/storage/awss3storage.go index ab91dff72..12e15e5cd 100644 --- a/kms/internal/storage/awss3storage.go +++ b/kms/internal/storage/awss3storage.go @@ -16,7 +16,7 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/edgelesssys/constellation/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/config" ) type awsS3ClientAPI interface { diff --git a/kms/internal/storage/azurestorage.go b/kms/internal/storage/azurestorage.go index 17379993e..2cbd9fc58 100644 --- a/kms/internal/storage/azurestorage.go +++ b/kms/internal/storage/azurestorage.go @@ -15,7 +15,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" "github.com/aws/aws-sdk-go-v2/feature/s3/manager" - "github.com/edgelesssys/constellation/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/config" ) type azureContainerAPI interface { diff --git a/kms/internal/test/aws_test.go b/kms/internal/test/aws_test.go index 114585e31..30c70ea6e 100644 --- a/kms/internal/test/aws_test.go +++ b/kms/internal/test/aws_test.go @@ -19,9 +19,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - kmsconfig "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - awsInterface "github.com/edgelesssys/constellation/kms/kms/aws" + kmsconfig "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + awsInterface "github.com/edgelesssys/constellation/v2/kms/kms/aws" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kms/internal/test/azure_test.go b/kms/internal/test/azure_test.go index 419a0cc33..8093d99b1 100644 --- a/kms/internal/test/azure_test.go +++ b/kms/internal/test/azure_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms/azure" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms/azure" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kms/internal/test/gcp_test.go b/kms/internal/test/gcp_test.go index 2a6fa1ae8..98894a19a 100644 --- a/kms/internal/test/gcp_test.go +++ b/kms/internal/test/gcp_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms/gcp" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms/gcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" diff --git a/kms/kms/aws/aws.go b/kms/kms/aws/aws.go index ea70778c1..3ea190b99 100644 --- a/kms/kms/aws/aws.go +++ b/kms/kms/aws/aws.go @@ -17,10 +17,10 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/util" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + kmsInterface "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/util" ) const ( diff --git a/kms/kms/aws/aws_test.go b/kms/kms/aws/aws_test.go index 7738f5863..4522c4655 100644 --- a/kms/kms/aws/aws_test.go +++ b/kms/kms/aws/aws_test.go @@ -22,9 +22,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + kmsInterface "github.com/edgelesssys/constellation/v2/kms/kms" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/kms/kms/azure/azure.go b/kms/kms/azure/azure.go index d29de2274..ecd5a6def 100644 --- a/kms/kms/azure/azure.go +++ b/kms/kms/azure/azure.go @@ -17,10 +17,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/util" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/util" ) const ( diff --git a/kms/kms/azure/azure_test.go b/kms/kms/azure/azure_test.go index bf807bbab..c403f3068 100644 --- a/kms/kms/azure/azure_test.go +++ b/kms/kms/azure/azure_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/kms/kms/azure/hsm.go b/kms/kms/azure/hsm.go index b6c54f6ff..606c6d7da 100644 --- a/kms/kms/azure/hsm.go +++ b/kms/kms/azure/hsm.go @@ -15,10 +15,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/util" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/util" ) type hsmClientAPI interface { diff --git a/kms/kms/azure/hsm_test.go b/kms/kms/azure/hsm_test.go index 0ea9698a5..977f990b3 100644 --- a/kms/kms/azure/hsm_test.go +++ b/kms/kms/azure/hsm_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/kms/kms/cluster/cluster.go b/kms/kms/cluster/cluster.go index 9da0f1c30..373c33812 100644 --- a/kms/kms/cluster/cluster.go +++ b/kms/kms/cluster/cluster.go @@ -10,7 +10,7 @@ import ( "context" "errors" - "github.com/edgelesssys/constellation/internal/crypto" + "github.com/edgelesssys/constellation/v2/internal/crypto" ) // ClusterKMS implements the kms.CloudKMS interface for in cluster key management. diff --git a/kms/kms/cluster/cluster_test.go b/kms/kms/cluster/cluster_test.go index d2c01ddfe..c289a7f5a 100644 --- a/kms/kms/cluster/cluster_test.go +++ b/kms/kms/cluster/cluster_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/edgelesssys/constellation/internal/crypto/testvector" + "github.com/edgelesssys/constellation/v2/internal/crypto/testvector" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/kms/kms/gcp/gcp.go b/kms/kms/gcp/gcp.go index fd20fb13e..3a9a41d4d 100644 --- a/kms/kms/gcp/gcp.go +++ b/kms/kms/gcp/gcp.go @@ -18,10 +18,10 @@ import ( "time" kms "cloud.google.com/go/kms/apiv1" - "github.com/edgelesssys/constellation/kms/internal/config" - "github.com/edgelesssys/constellation/kms/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/util" + "github.com/edgelesssys/constellation/v2/kms/internal/config" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + kmsInterface "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/util" "github.com/googleapis/gax-go/v2" "google.golang.org/api/option" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" diff --git a/kms/kms/gcp/gcp_test.go b/kms/kms/gcp/gcp_test.go index 03c872044..97c03921c 100644 --- a/kms/kms/gcp/gcp_test.go +++ b/kms/kms/gcp/gcp_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/kms/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/util" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + kmsInterface "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/util" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" "go.uber.org/goleak" diff --git a/kms/setup/setup.go b/kms/setup/setup.go index 2bf7c702c..a62b6a949 100644 --- a/kms/setup/setup.go +++ b/kms/setup/setup.go @@ -13,12 +13,12 @@ import ( "net/url" "strconv" - "github.com/edgelesssys/constellation/kms/internal/storage" - "github.com/edgelesssys/constellation/kms/kms" - "github.com/edgelesssys/constellation/kms/kms/aws" - "github.com/edgelesssys/constellation/kms/kms/azure" - "github.com/edgelesssys/constellation/kms/kms/cluster" - "github.com/edgelesssys/constellation/kms/kms/gcp" + "github.com/edgelesssys/constellation/v2/kms/internal/storage" + "github.com/edgelesssys/constellation/v2/kms/kms" + "github.com/edgelesssys/constellation/v2/kms/kms/aws" + "github.com/edgelesssys/constellation/v2/kms/kms/azure" + "github.com/edgelesssys/constellation/v2/kms/kms/cluster" + "github.com/edgelesssys/constellation/v2/kms/kms/gcp" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller.go b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller.go index 24a55603e..e6fada558 100644 --- a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller.go +++ b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) // AutoscalingStrategyReconciler reconciles a AutoscalingStrategy object. diff --git a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go index 7957e854e..cc8e68d58 100644 --- a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go @@ -19,7 +19,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) var _ = Describe("AutoscalingStrategy controller", func() { diff --git a/operators/constellation-node-operator/controllers/nodeimage_controller.go b/operators/constellation-node-operator/controllers/nodeimage_controller.go index 2c69b549c..c5ec83bee 100644 --- a/operators/constellation-node-operator/controllers/nodeimage_controller.go +++ b/operators/constellation-node-operator/controllers/nodeimage_controller.go @@ -12,8 +12,8 @@ import ( "strings" "time" - nodeutil "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/node" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/patch" + nodeutil "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/node" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/patch" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/source" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" ) diff --git a/operators/constellation-node-operator/controllers/nodeimage_controller_env_test.go b/operators/constellation-node-operator/controllers/nodeimage_controller_env_test.go index 642fe1df3..d95b8ac78 100644 --- a/operators/constellation-node-operator/controllers/nodeimage_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/nodeimage_controller_env_test.go @@ -19,7 +19,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" ) diff --git a/operators/constellation-node-operator/controllers/nodeimage_controller_test.go b/operators/constellation-node-operator/controllers/nodeimage_controller_test.go index 55ffaa1ac..c5677c3d7 100644 --- a/operators/constellation-node-operator/controllers/nodeimage_controller_test.go +++ b/operators/constellation-node-operator/controllers/nodeimage_controller_test.go @@ -18,7 +18,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) func TestAnnotateNodes(t *testing.T) { diff --git a/operators/constellation-node-operator/controllers/nodeimage_watches.go b/operators/constellation-node-operator/controllers/nodeimage_watches.go index 805f90e4b..d52e7b31c 100644 --- a/operators/constellation-node-operator/controllers/nodeimage_watches.go +++ b/operators/constellation-node-operator/controllers/nodeimage_watches.go @@ -9,7 +9,7 @@ package controllers import ( "context" - node "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/node" + node "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/node" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" ) diff --git a/operators/constellation-node-operator/controllers/nodeimage_watches_test.go b/operators/constellation-node-operator/controllers/nodeimage_watches_test.go index face5ec28..2d4e5ec6f 100644 --- a/operators/constellation-node-operator/controllers/nodeimage_watches_test.go +++ b/operators/constellation-node-operator/controllers/nodeimage_watches_test.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" ) diff --git a/operators/constellation-node-operator/controllers/pendingnode_controller.go b/operators/constellation-node-operator/controllers/pendingnode_controller.go index c511225b8..0a23f650c 100644 --- a/operators/constellation-node-operator/controllers/pendingnode_controller.go +++ b/operators/constellation-node-operator/controllers/pendingnode_controller.go @@ -10,7 +10,7 @@ import ( "context" "time" - node "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/node" + node "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/node" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) const ( diff --git a/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go b/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go index 237fed547..5d08853ac 100644 --- a/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) var _ = Describe("PendingNode controller", func() { diff --git a/operators/constellation-node-operator/controllers/pendingnode_controller_test.go b/operators/constellation-node-operator/controllers/pendingnode_controller_test.go index a30890aad..1a02d2c6a 100644 --- a/operators/constellation-node-operator/controllers/pendingnode_controller_test.go +++ b/operators/constellation-node-operator/controllers/pendingnode_controller_test.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) func TestNodeStateChangePredicate(t *testing.T) { diff --git a/operators/constellation-node-operator/controllers/scalinggroup_controller.go b/operators/constellation-node-operator/controllers/scalinggroup_controller.go index bc9118478..581424bd9 100644 --- a/operators/constellation-node-operator/controllers/scalinggroup_controller.go +++ b/operators/constellation-node-operator/controllers/scalinggroup_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) const ( diff --git a/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go b/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go index 4d5ca65b0..b7272afb5 100644 --- a/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go @@ -17,7 +17,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) var _ = Describe("ScalingGroup controller", func() { diff --git a/operators/constellation-node-operator/controllers/schemes_test.go b/operators/constellation-node-operator/controllers/schemes_test.go index e5f1d1a6d..1fe8297d0 100644 --- a/operators/constellation-node-operator/controllers/schemes_test.go +++ b/operators/constellation-node-operator/controllers/schemes_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" "github.com/stretchr/testify/require" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/operators/constellation-node-operator/controllers/suite_test.go b/operators/constellation-node-operator/controllers/suite_test.go index e71a240c1..7cc467122 100644 --- a/operators/constellation-node-operator/controllers/suite_test.go +++ b/operators/constellation-node-operator/controllers/suite_test.go @@ -28,7 +28,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/operators/constellation-node-operator/go.mod b/operators/constellation-node-operator/go.mod index 9b60db77c..41835a0c3 100644 --- a/operators/constellation-node-operator/go.mod +++ b/operators/constellation-node-operator/go.mod @@ -1,4 +1,4 @@ -module github.com/edgelesssys/constellation/operators/constellation-node-operator +module github.com/edgelesssys/constellation/operators/constellation-node-operator/v2 go 1.18 diff --git a/operators/constellation-node-operator/internal/azure/client/api.go b/operators/constellation-node-operator/internal/azure/client/api.go index bb87c2ef4..8f7d2b14a 100644 --- a/operators/constellation-node-operator/internal/azure/client/api.go +++ b/operators/constellation-node-operator/internal/azure/client/api.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/poller" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/poller" ) type virtualMachineScaleSetVMsAPI interface { diff --git a/operators/constellation-node-operator/internal/azure/client/client.go b/operators/constellation-node-operator/internal/azure/client/client.go index 52e468f2f..72a6d7c00 100644 --- a/operators/constellation-node-operator/internal/azure/client/client.go +++ b/operators/constellation-node-operator/internal/azure/client/client.go @@ -9,7 +9,7 @@ package client import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/poller" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/poller" "github.com/spf13/afero" ) diff --git a/operators/constellation-node-operator/internal/azure/client/instanceview.go b/operators/constellation-node-operator/internal/azure/client/instanceview.go index f2cfd359b..0174e499e 100644 --- a/operators/constellation-node-operator/internal/azure/client/instanceview.go +++ b/operators/constellation-node-operator/internal/azure/client/instanceview.go @@ -8,7 +8,7 @@ package client import ( armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) const ( diff --git a/operators/constellation-node-operator/internal/azure/client/instanceview_test.go b/operators/constellation-node-operator/internal/azure/client/instanceview_test.go index 3ff6913eb..99b654ff8 100644 --- a/operators/constellation-node-operator/internal/azure/client/instanceview_test.go +++ b/operators/constellation-node-operator/internal/azure/client/instanceview_test.go @@ -13,7 +13,7 @@ import ( armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" "github.com/stretchr/testify/assert" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) // this state is included in most VMs but not needed diff --git a/operators/constellation-node-operator/internal/azure/client/nodeimage_test.go b/operators/constellation-node-operator/internal/azure/client/nodeimage_test.go index ac4235b39..4c574695d 100644 --- a/operators/constellation-node-operator/internal/azure/client/nodeimage_test.go +++ b/operators/constellation-node-operator/internal/azure/client/nodeimage_test.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/poller" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/poller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/operators/constellation-node-operator/internal/azure/client/pendingnode.go b/operators/constellation-node-operator/internal/azure/client/pendingnode.go index 1252dcfcc..60f6d23d8 100644 --- a/operators/constellation-node-operator/internal/azure/client/pendingnode.go +++ b/operators/constellation-node-operator/internal/azure/client/pendingnode.go @@ -12,7 +12,7 @@ import ( "net/http" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" ) // GetNodeState returns the state of the node. diff --git a/operators/constellation-node-operator/internal/azure/client/pendingnode_test.go b/operators/constellation-node-operator/internal/azure/client/pendingnode_test.go index c52a0c29d..c58b62ec5 100644 --- a/operators/constellation-node-operator/internal/azure/client/pendingnode_test.go +++ b/operators/constellation-node-operator/internal/azure/client/pendingnode_test.go @@ -15,7 +15,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" armcomputev2 "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/operators/constellation-node-operator/internal/controlplane/controlplane.go b/operators/constellation-node-operator/internal/controlplane/controlplane.go index c05544f62..6885b93d4 100644 --- a/operators/constellation-node-operator/internal/controlplane/controlplane.go +++ b/operators/constellation-node-operator/internal/controlplane/controlplane.go @@ -13,7 +13,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - nodeutil "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/node" + nodeutil "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/node" ) // ListControlPlaneIPs retrieves a list of VPC IPs for the control plane nodes from kubernetes. diff --git a/operators/constellation-node-operator/internal/deploy/deploy.go b/operators/constellation-node-operator/internal/deploy/deploy.go index bd790a032..e758ef016 100644 --- a/operators/constellation-node-operator/internal/deploy/deploy.go +++ b/operators/constellation-node-operator/internal/deploy/deploy.go @@ -13,8 +13,8 @@ import ( "fmt" "strings" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/constants" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/constants" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operators/constellation-node-operator/internal/deploy/deploy_test.go b/operators/constellation-node-operator/internal/deploy/deploy_test.go index fc87f9c1d..a3723228d 100644 --- a/operators/constellation-node-operator/internal/deploy/deploy_test.go +++ b/operators/constellation-node-operator/internal/deploy/deploy_test.go @@ -11,8 +11,8 @@ import ( "errors" "testing" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/constants" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/constants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" k8sErrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/operators/constellation-node-operator/internal/etcd/etcd.go b/operators/constellation-node-operator/internal/etcd/etcd.go index 554740485..485b7e8dd 100644 --- a/operators/constellation-node-operator/internal/etcd/etcd.go +++ b/operators/constellation-node-operator/internal/etcd/etcd.go @@ -13,7 +13,7 @@ import ( "net" "net/url" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/controlplane" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/controlplane" "go.etcd.io/etcd/client/pkg/v3/transport" clientv3 "go.etcd.io/etcd/client/v3" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operators/constellation-node-operator/internal/gcp/client/pendingnode.go b/operators/constellation-node-operator/internal/gcp/client/pendingnode.go index 6f156c70a..40a56463e 100644 --- a/operators/constellation-node-operator/internal/gcp/client/pendingnode.go +++ b/operators/constellation-node-operator/internal/gcp/client/pendingnode.go @@ -11,8 +11,8 @@ import ( "errors" "net/http" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "google.golang.org/api/googleapi" computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go b/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go index c53db1568..0372e193a 100644 --- a/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go @@ -12,7 +12,7 @@ import ( "net/http" "testing" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/googleapi" diff --git a/operators/constellation-node-operator/internal/node/node.go b/operators/constellation-node-operator/internal/node/node.go index 7473bfda2..2be57ad6b 100644 --- a/operators/constellation-node-operator/internal/node/node.go +++ b/operators/constellation-node-operator/internal/node/node.go @@ -10,7 +10,7 @@ import ( "errors" "regexp" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" corev1 "k8s.io/api/core/v1" ) diff --git a/operators/constellation-node-operator/internal/node/node_test.go b/operators/constellation-node-operator/internal/node/node_test.go index e9a9e95ce..d91015406 100644 --- a/operators/constellation-node-operator/internal/node/node_test.go +++ b/operators/constellation-node-operator/internal/node/node_test.go @@ -9,7 +9,7 @@ package node import ( "testing" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/operators/constellation-node-operator/main.go b/operators/constellation-node-operator/main.go index 58b8fdcc1..b33d0dbaa 100644 --- a/operators/constellation-node-operator/main.go +++ b/operators/constellation-node-operator/main.go @@ -24,13 +24,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - azureclient "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/azure/client" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/deploy" - gcpclient "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/gcp/client" + azureclient "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/azure/client" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/deploy" + gcpclient "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/gcp/client" - updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/api/v1alpha1" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/controllers" - "github.com/edgelesssys/constellation/operators/constellation-node-operator/internal/etcd" + updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/controllers" + "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/internal/etcd" nodemaintenancev1beta1 "github.com/medik8s/node-maintenance-operator/api/v1beta1" //+kubebuilder:scaffold:imports ) diff --git a/verify/cmd/main.go b/verify/cmd/main.go index c0b1d5f3e..4b5008546 100644 --- a/verify/cmd/main.go +++ b/verify/cmd/main.go @@ -11,12 +11,12 @@ import ( "net" "strconv" - "github.com/edgelesssys/constellation/internal/attestation/azure" - "github.com/edgelesssys/constellation/internal/attestation/gcp" - "github.com/edgelesssys/constellation/internal/attestation/qemu" - "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/verify/server" + "github.com/edgelesssys/constellation/v2/internal/attestation/azure" + "github.com/edgelesssys/constellation/v2/internal/attestation/gcp" + "github.com/edgelesssys/constellation/v2/internal/attestation/qemu" + "github.com/edgelesssys/constellation/v2/internal/constants" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/verify/server" "go.uber.org/zap" ) diff --git a/verify/server/server.go b/verify/server/server.go index c0db5e03a..b18cfbc1b 100644 --- a/verify/server/server.go +++ b/verify/server/server.go @@ -16,8 +16,8 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/verify/verifyproto" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/verify/verifyproto" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/grpc" diff --git a/verify/server/server_test.go b/verify/server/server_test.go index 9ca24e0fe..e0fdde2ed 100644 --- a/verify/server/server_test.go +++ b/verify/server/server_test.go @@ -19,9 +19,9 @@ import ( "sync" "testing" - "github.com/edgelesssys/constellation/internal/grpc/testdialer" - "github.com/edgelesssys/constellation/internal/logger" - "github.com/edgelesssys/constellation/verify/verifyproto" + "github.com/edgelesssys/constellation/v2/internal/grpc/testdialer" + "github.com/edgelesssys/constellation/v2/internal/logger" + "github.com/edgelesssys/constellation/v2/verify/verifyproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak"