diff --git a/cli/azure/client/client.go b/cli/azure/client/client.go index c3fbdaf0b..9c8e97e20 100644 --- a/cli/azure/client/client.go +++ b/cli/azure/client/client.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/azure/client/client_test.go b/cli/azure/client/client_test.go index 66f781290..246ecc6d4 100644 --- a/cli/azure/client/client_test.go +++ b/cli/azure/client/client_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/cloud/cloudcmd/clients_test.go b/cli/cloud/cloudcmd/clients_test.go index cbb5dcd97..40be82c7f 100644 --- a/cli/cloud/cloudcmd/clients_test.go +++ b/cli/cloud/cloudcmd/clients_test.go @@ -7,9 +7,9 @@ import ( "github.com/edgelesssys/constellation/cli/azure" azurecl "github.com/edgelesssys/constellation/cli/azure/client" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" gcpcl "github.com/edgelesssys/constellation/cli/gcp/client" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cloud/cloudcmd/create.go b/cli/cloud/cloudcmd/create.go index 28edffe70..f66f1ab8a 100644 --- a/cli/cloud/cloudcmd/create.go +++ b/cli/cloud/cloudcmd/create.go @@ -7,10 +7,10 @@ import ( azurecl "github.com/edgelesssys/constellation/cli/azure/client" "github.com/edgelesssys/constellation/cli/cloud/cloudtypes" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" "github.com/edgelesssys/constellation/cli/gcp/client" gcpcl "github.com/edgelesssys/constellation/cli/gcp/client" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cloud/cloudcmd/create_test.go b/cli/cloud/cloudcmd/create_test.go index 7ea0e9382..42c48b315 100644 --- a/cli/cloud/cloudcmd/create_test.go +++ b/cli/cloud/cloudcmd/create_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" "github.com/stretchr/testify/assert" diff --git a/cli/cloud/cloudcmd/serviceaccount.go b/cli/cloud/cloudcmd/serviceaccount.go index 6b22ecee2..11c5da746 100644 --- a/cli/cloud/cloudcmd/serviceaccount.go +++ b/cli/cloud/cloudcmd/serviceaccount.go @@ -5,8 +5,8 @@ import ( "fmt" azurecl "github.com/edgelesssys/constellation/cli/azure/client" - "github.com/edgelesssys/constellation/cli/cloudprovider" gcpcl "github.com/edgelesssys/constellation/cli/gcp/client" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cloud/cloudcmd/serviceaccount_test.go b/cli/cloud/cloudcmd/serviceaccount_test.go index ffd08a8bb..d952956aa 100644 --- a/cli/cloud/cloudcmd/serviceaccount_test.go +++ b/cli/cloud/cloudcmd/serviceaccount_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" "github.com/stretchr/testify/assert" diff --git a/cli/cloud/cloudcmd/terminate.go b/cli/cloud/cloudcmd/terminate.go index 307db0910..c87581104 100644 --- a/cli/cloud/cloudcmd/terminate.go +++ b/cli/cloud/cloudcmd/terminate.go @@ -5,8 +5,8 @@ import ( "fmt" azurecl "github.com/edgelesssys/constellation/cli/azure/client" - "github.com/edgelesssys/constellation/cli/cloudprovider" gcpcl "github.com/edgelesssys/constellation/cli/gcp/client" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cloud/cloudcmd/terminate_test.go b/cli/cloud/cloudcmd/terminate_test.go index 9d966fcd9..8b8a80f8f 100644 --- a/cli/cloud/cloudcmd/terminate_test.go +++ b/cli/cloud/cloudcmd/terminate_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" "github.com/stretchr/testify/assert" ) diff --git a/cli/cloud/cloudcmd/validators.go b/cli/cloud/cloudcmd/validators.go index 9d6eff237..4d0b4144a 100644 --- a/cli/cloud/cloudcmd/validators.go +++ b/cli/cloud/cloudcmd/validators.go @@ -7,12 +7,12 @@ import ( "fmt" "strings" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/attestation/azure" "github.com/edgelesssys/constellation/coordinator/attestation/gcp" "github.com/edgelesssys/constellation/coordinator/attestation/qemu" "github.com/edgelesssys/constellation/coordinator/attestation/vtpm" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" ) diff --git a/cli/cloud/cloudcmd/validators_test.go b/cli/cloud/cloudcmd/validators_test.go index 07dc1b699..912349856 100644 --- a/cli/cloud/cloudcmd/validators_test.go +++ b/cli/cloud/cloudcmd/validators_test.go @@ -5,12 +5,12 @@ import ( "encoding/base64" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/attestation/azure" "github.com/edgelesssys/constellation/coordinator/attestation/gcp" "github.com/edgelesssys/constellation/coordinator/attestation/qemu" "github.com/edgelesssys/constellation/coordinator/attestation/vtpm" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/stretchr/testify/assert" ) diff --git a/cli/cmd/cloud.go b/cli/cmd/cloud.go index 05c642bd9..86cd16efc 100644 --- a/cli/cmd/cloud.go +++ b/cli/cmd/cloud.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cmd/cloud_test.go b/cli/cmd/cloud_test.go index fa4f2c5f4..764ca2bdc 100644 --- a/cli/cmd/cloud_test.go +++ b/cli/cmd/cloud_test.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/cmd/configgenerate.go b/cli/cmd/configgenerate.go index a0a7d27f1..8d99c884e 100644 --- a/cli/cmd/configgenerate.go +++ b/cli/cmd/configgenerate.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/edgelesssys/constellation/cli/cloudprovider" + "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" diff --git a/cli/cmd/configgenerate_test.go b/cli/cmd/configgenerate_test.go index cb1d7190d..8f5cbb89a 100644 --- a/cli/cmd/configgenerate_test.go +++ b/cli/cmd/configgenerate_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "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" diff --git a/cli/cmd/create.go b/cli/cmd/create.go index 0d6329504..8bd347f6b 100644 --- a/cli/cmd/create.go +++ b/cli/cmd/create.go @@ -7,8 +7,8 @@ import ( "github.com/edgelesssys/constellation/cli/azure" "github.com/edgelesssys/constellation/cli/cloud/cloudcmd" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/file" "github.com/spf13/afero" diff --git a/cli/cmd/create_test.go b/cli/cmd/create_test.go index f74d54b9e..b22a301aa 100644 --- a/cli/cmd/create_test.go +++ b/cli/cmd/create_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "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" diff --git a/cli/cmd/init.go b/cli/cmd/init.go index 885dbf659..4b25053e4 100644 --- a/cli/cmd/init.go +++ b/cli/cmd/init.go @@ -13,7 +13,6 @@ import ( "github.com/edgelesssys/constellation/cli/azure" "github.com/edgelesssys/constellation/cli/cloud/cloudcmd" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" "github.com/edgelesssys/constellation/cli/internal/proto" "github.com/edgelesssys/constellation/cli/internal/status" @@ -22,6 +21,7 @@ import ( "github.com/edgelesssys/constellation/coordinator/pubapi/pubproto" coordinatorstate "github.com/edgelesssys/constellation/coordinator/state" "github.com/edgelesssys/constellation/coordinator/util" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/deploy/ssh" diff --git a/cli/cmd/protoclient.go b/cli/cmd/protoclient.go index 9857d05ed..dd01369fb 100644 --- a/cli/cmd/protoclient.go +++ b/cli/cmd/protoclient.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/edgelesssys/constellation/cli/proto" + "github.com/edgelesssys/constellation/cli/internal/proto" "github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/pubapi/pubproto" "github.com/edgelesssys/constellation/coordinator/state" diff --git a/cli/cmd/protoclient_test.go b/cli/cmd/protoclient_test.go index 8d36943d7..d04ed68e7 100644 --- a/cli/cmd/protoclient_test.go +++ b/cli/cmd/protoclient_test.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/edgelesssys/constellation/cli/proto" + "github.com/edgelesssys/constellation/cli/internal/proto" "github.com/edgelesssys/constellation/coordinator/atls" "github.com/edgelesssys/constellation/coordinator/pubapi/pubproto" "github.com/edgelesssys/constellation/coordinator/state" diff --git a/cli/cmd/readconfig.go b/cli/cmd/readconfig.go index 64711a2e3..a30b8c6f3 100644 --- a/cli/cmd/readconfig.go +++ b/cli/cmd/readconfig.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/file" ) diff --git a/cli/cmd/readconfig_test.go b/cli/cmd/readconfig_test.go index d09f5a872..89c07837d 100644 --- a/cli/cmd/readconfig_test.go +++ b/cli/cmd/readconfig_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/cmd/recover.go b/cli/cmd/recover.go index 9f5827f2a..90df77840 100644 --- a/cli/cmd/recover.go +++ b/cli/cmd/recover.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/edgelesssys/constellation/cli/cloud/cloudcmd" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/internal/proto" "github.com/edgelesssys/constellation/coordinator/util" + "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" diff --git a/cli/cmd/validargs.go b/cli/cmd/validargs.go index 4b7467a1c..176e4558f 100644 --- a/cli/cmd/validargs.go +++ b/cli/cmd/validargs.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/edgelesssys/constellation/cli/azure" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/spf13/cobra" ) diff --git a/cli/cmd/verify.go b/cli/cmd/verify.go index fe1a6ff2a..11e24a502 100644 --- a/cli/cmd/verify.go +++ b/cli/cmd/verify.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/edgelesssys/constellation/cli/cloud/cloudcmd" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/internal/proto" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/file" "github.com/spf13/afero" diff --git a/cli/cmd/verify_test.go b/cli/cmd/verify_test.go index cb3935991..60b3edbb7 100644 --- a/cli/cmd/verify_test.go +++ b/cli/cmd/verify_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/file" "github.com/spf13/afero" "github.com/spf13/cobra" diff --git a/cli/ec2/client/client.go b/cli/ec2/client/client.go index 265931064..35346ae22 100644 --- a/cli/ec2/client/client.go +++ b/cli/ec2/client/client.go @@ -8,8 +8,8 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" awsec2 "github.com/aws/aws-sdk-go-v2/service/ec2" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/ec2" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/gcp/client/client.go b/cli/gcp/client/client.go index be835fb97..984bf0ede 100644 --- a/cli/gcp/client/client.go +++ b/cli/gcp/client/client.go @@ -11,8 +11,8 @@ 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/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" ) diff --git a/cli/gcp/client/client_test.go b/cli/gcp/client/client_test.go index 35072ef47..51b87d8b4 100644 --- a/cli/gcp/client/client_test.go +++ b/cli/gcp/client/client_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" "github.com/edgelesssys/constellation/cli/gcp" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/state" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/cloudprovider/cloudprovider.go b/internal/cloud/cloudprovider/cloudprovider.go similarity index 100% rename from cli/cloudprovider/cloudprovider.go rename to internal/cloud/cloudprovider/cloudprovider.go diff --git a/cli/cloudprovider/provider_string.go b/internal/cloud/cloudprovider/provider_string.go similarity index 100% rename from cli/cloudprovider/provider_string.go rename to internal/cloud/cloudprovider/provider_string.go diff --git a/internal/config/config.go b/internal/config/config.go index b1ee0c338..f129b7b61 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -8,7 +8,7 @@ import ( "fmt" "io/fs" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/file" "github.com/go-playground/locales/en" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 47a057987..2cc813268 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "github.com/edgelesssys/constellation/cli/cloudprovider" + "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/file" "github.com/spf13/afero"