Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-04-26 10:09:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rework kms folder structure

Browse Source 
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-03-24 15:16:20 +01:00 committed by Daniel Weiße
parent 1f856878e8
commit f8e9c70337
23 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/core/core.go
View File

@ -14,7 +14,7 @@ import (
"github.com/edgelesssys/constellation/coordinator/store" "github.com/edgelesssys/constellation/coordinator/store"
"github.com/edgelesssys/constellation/coordinator/storewrapper" "github.com/edgelesssys/constellation/coordinator/storewrapper"
"github.com/edgelesssys/constellation/coordinator/util" "github.com/edgelesssys/constellation/coordinator/util"
"github.com/edgelesssys/constellation/kms/pkg/kms" "github.com/edgelesssys/constellation/kms/kms"
"go.uber.org/zap" "go.uber.org/zap"
) )

10
coordinator/kms/setup.go
View File

@ -6,11 +6,11 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"github.com/edgelesssys/constellation/kms/pkg/kms" "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/aws" "github.com/edgelesssys/constellation/kms/kms/aws"
"github.com/edgelesssys/constellation/kms/pkg/kms/azure" "github.com/edgelesssys/constellation/kms/kms/azure"
"github.com/edgelesssys/constellation/kms/pkg/kms/gcp" "github.com/edgelesssys/constellation/kms/kms/gcp"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
) )

0
kms/docs/credentials.md → kms/README.md
View File

0
kms/pkg/config/config.go → kms/config/config.go
View File

8
kms/pkg/kms/aws/aws.go → kms/kms/aws/aws.go
View File

@ -11,10 +11,10 @@ import (
awsconfig "github.com/aws/aws-sdk-go-v2/config" 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"
"github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/aws/aws-sdk-go-v2/service/kms/types"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
kmsInterface "github.com/edgelesssys/constellation/kms/pkg/kms" kmsInterface "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/util" "github.com/edgelesssys/constellation/kms/kms/util"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
) )
const ( const (

6
kms/pkg/kms/aws/aws_test.go → kms/kms/aws/aws_test.go
View File

@ -15,9 +15,9 @@ import (
"github.com/aws/aws-sdk-go-v2/aws" "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"
"github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/aws/aws-sdk-go-v2/service/kms/types"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
kmsInterface "github.com/edgelesssys/constellation/kms/pkg/kms" kmsInterface "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

8
kms/pkg/kms/azure/azure.go → kms/kms/azure/azure.go
View File

@ -10,10 +10,10 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "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/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
"github.com/edgelesssys/constellation/kms/pkg/kms" "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/util" "github.com/edgelesssys/constellation/kms/kms/util"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
) )
const ( const (

8
kms/pkg/kms/azure/hsm.go → kms/kms/azure/hsm.go
View File

@ -12,10 +12,10 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys"
"github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/crypto" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys/crypto"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
"github.com/edgelesssys/constellation/kms/pkg/kms" "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/util" "github.com/edgelesssys/constellation/kms/kms/util"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
) )
// Suffix for HSM Vaults. // Suffix for HSM Vaults.

8
kms/pkg/kms/gcp/gcp.go → kms/kms/gcp/gcp.go
View File

@ -11,10 +11,10 @@ import (
"time" "time"
kms "cloud.google.com/go/kms/apiv1" kms "cloud.google.com/go/kms/apiv1"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
kmsInterface "github.com/edgelesssys/constellation/kms/pkg/kms" kmsInterface "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/util" "github.com/edgelesssys/constellation/kms/kms/util"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/googleapis/gax-go/v2" "github.com/googleapis/gax-go/v2"
"google.golang.org/api/option" "google.golang.org/api/option"
kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"

9
kms/pkg/kms/gcp/gcp_test.go → kms/kms/gcp/gcp_test.go
View File

@ -8,10 +8,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
kmsInterface "github.com/edgelesssys/constellation/kms/pkg/kms" kmsInterface "github.com/edgelesssys/constellation/kms/kms"
"github.com/edgelesssys/constellation/kms/pkg/kms/util" "github.com/edgelesssys/constellation/kms/kms/util"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/api/option" "google.golang.org/api/option"
@ -191,7 +191,6 @@ func TestGoogleKMS(t *testing.T) {
// load responses // load responses
mockKeyManagement.resps = []proto.Message{ mockKeyManagement.resps = []proto.Message{
&kmspb.CryptoKey{ &kmspb.CryptoKey{
Name: fmt.Sprintf("projects/%s/locations/%s/keyRings/%s/cryptoKeys/%s", project, location, keyRing, kekName), Name: fmt.Sprintf("projects/%s/locations/%s/keyRings/%s/cryptoKeys/%s", project, location, keyRing, kekName),
}, },
&kmspb.EncryptResponse{ &kmspb.EncryptResponse{

0
kms/pkg/kms/kms.go → kms/kms/kms.go
View File

0
kms/pkg/kms/util/crypto.go → kms/kms/util/crypto.go
View File

0
kms/pkg/kms/util/crypto_test.go → kms/kms/util/crypto_test.go
View File

2
kms/pkg/storage/awss3storage.go → kms/storage/awss3storage.go
View File

@ -10,7 +10,7 @@ import (
awsconfig "github.com/aws/aws-sdk-go-v2/config" 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"
"github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
) )
// AWSS3Storage is an implementation of the Storage interface, storing keys in AWS S3 buckets. // AWSS3Storage is an implementation of the Storage interface, storing keys in AWS S3 buckets.

2
kms/pkg/storage/azurestorage.go → kms/storage/azurestorage.go
View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
) )
// AzureStorage is an implementation of the Storage interface, storing keys in the Azure Blob Store. // AzureStorage is an implementation of the Storage interface, storing keys in the Azure Blob Store.

0
kms/pkg/storage/gcloudstorage.go → kms/storage/gcloudstorage.go
View File

0
kms/pkg/storage/gcloudstorage_test.go → kms/storage/gcloudstorage_test.go
View File

0
kms/pkg/storage/memfsstorage.go → kms/storage/memfsstorage.go
View File

0
kms/pkg/storage/memfsstroage_test.go → kms/storage/memfsstroage_test.go
View File

0
kms/pkg/storage/storage.go → kms/storage/storage.go
View File

6
kms/test/aws_test.go
View File

@ -14,9 +14,9 @@ import (
"github.com/aws/aws-sdk-go-v2/service/kms" "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"
"github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/aws/aws-sdk-go-v2/service/s3/types"
kmsconfig "github.com/edgelesssys/constellation/kms/pkg/config" kmsconfig "github.com/edgelesssys/constellation/kms/config"
awsInterface "github.com/edgelesssys/constellation/kms/pkg/kms/aws" awsInterface "github.com/edgelesssys/constellation/kms/kms/aws"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

6
kms/test/azure_test.go
View File

@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
"github.com/edgelesssys/constellation/kms/pkg/kms/azure" "github.com/edgelesssys/constellation/kms/kms/azure"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

6
kms/test/gcp_test.go
View File

@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/edgelesssys/constellation/kms/pkg/config" "github.com/edgelesssys/constellation/kms/config"
"github.com/edgelesssys/constellation/kms/pkg/kms/gcp" "github.com/edgelesssys/constellation/kms/kms/gcp"
"github.com/edgelesssys/constellation/kms/pkg/storage" "github.com/edgelesssys/constellation/kms/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
) )