From 935b2a449087c77ee9aa3ae15c0211c5c92e736c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Thu, 31 Mar 2022 09:25:38 +0200 Subject: [PATCH] Move and fix GCP storage integration test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .../gcloudstorage_integration_test.go | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) rename {kms/storage => test}/gcloudstorage_integration_test.go (76%) diff --git a/kms/storage/gcloudstorage_integration_test.go b/test/gcloudstorage_integration_test.go similarity index 76% rename from kms/storage/gcloudstorage_integration_test.go rename to test/gcloudstorage_integration_test.go index 9eb6592ea..279ccca00 100644 --- a/kms/storage/gcloudstorage_integration_test.go +++ b/test/gcloudstorage_integration_test.go @@ -1,6 +1,6 @@ //go:build integration -package storage +package integration import ( "context" @@ -12,6 +12,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" + "github.com/edgelesssys/constellation/kms/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/option" @@ -23,15 +24,15 @@ func TestGoogleCloudStorage(t *testing.T) { assert := assert.New(t) require := require.New(t) - ctx := context.Background() + containerCtx := context.Background() // Set up the Storage Emulator t.Log("Creating storage emulator...") cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) require.NoError(err) - emulator, err := setupEmulator(ctx, cli, storageEmulator) + emulator, err := setupEmulator(containerCtx, cli, storageEmulator) require.NoError(err) - defer func() { _ = cli.ContainerStop(ctx, emulator.ID, nil) }() + defer func() { _ = cli.ContainerStop(containerCtx, emulator.ID, nil) }() // Run the actual test t.Setenv("STORAGE_EMULATOR_HOST", "localhost:9000") @@ -42,31 +43,31 @@ func TestGoogleCloudStorage(t *testing.T) { t.Log("Running test...") ctx, cancel := context.WithTimeout(context.Background(), time.Second*50) defer cancel() - storage, err := NewGoogleCloudStorage(ctx, projectName, bucketName, nil, option.WithoutAuthentication()) + store, err := storage.NewGoogleCloudStorage(ctx, projectName, bucketName, nil, option.WithoutAuthentication()) require.NoError(err) testDEK1 := []byte("test DEK") testDEK2 := []byte("more test DEK") // request unset value - _, err = storage.Get(ctx, "test:input") + _, err = store.Get(ctx, "test:input") assert.Error(err) // test Put method - assert.NoError(storage.Put(ctx, "volume01", testDEK1)) - assert.NoError(storage.Put(ctx, "volume02", testDEK2)) + assert.NoError(store.Put(ctx, "volume01", testDEK1)) + assert.NoError(store.Put(ctx, "volume02", testDEK2)) // make sure values have been set - val, err := storage.Get(ctx, "volume01") + val, err := store.Get(ctx, "volume01") assert.NoError(err) assert.Equal(testDEK1, val) - val, err = storage.Get(ctx, "volume02") + val, err = store.Get(ctx, "volume02") assert.NoError(err) assert.Equal(testDEK2, val) - _, err = storage.Get(ctx, "invalid:key") + _, err = store.Get(ctx, "invalid:key") assert.Error(err) - assert.ErrorIs(err, ErrDEKUnset) + assert.ErrorIs(err, storage.ErrDEKUnset) } func setupEmulator(ctx context.Context, cli *client.Client, imageName string) (container.ContainerCreateCreatedBody, error) { @@ -92,8 +93,7 @@ func setupEmulator(ctx context.Context, cli *client.Client, imageName string) (c if err != nil { return emulator, err } - err = cli.ContainerStart(ctx, emulator.ID, types.ContainerStartOptions{}) - if err != nil { + if err := cli.ContainerStart(ctx, emulator.ID, types.ContainerStartOptions{}); err != nil { return emulator, err }