fix: running tests locally fails

Signed-off-by: Alexei Dodon <[email protected]>
project-zot · Oct 3, 2023 · 092890e · 092890e
1 parent ca1c328
commit 092890e
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 128 deletions.
diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -69,6 +69,7 @@ import (
 	"zotregistry.io/zot/pkg/test/mocks"
 	ociutils "zotregistry.io/zot/pkg/test/oci-utils"
 	"zotregistry.io/zot/pkg/test/signature"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 const (
@@ -98,22 +99,6 @@ func getCredString(username, password string) string {
 	return usernameAndHash
 }
 
-func skipIt(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("S3MOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS S3 mock server")
-	}
-}
-
-func skipDynamo(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("DYNAMODBMOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS DynamoDB mock server")
-	}
-}
-
 func TestNew(t *testing.T) {
 	Convey("Make a new controller", t, func() {
 		conf := config.New()
@@ -147,8 +132,8 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 		driver = storage.CreateCacheDatabaseDriver(conf.Storage.StorageConfig, log)
 		So(driver, ShouldBeNil)
 	})
-	skipDynamo(t)
-	skipIt(t)
+	tskip.SkipDynamo(t)
+	tskip.SkipS3(t)
 	Convey("Test CreateCacheDatabaseDriver dynamodb", t, func() {
 		log := log.NewLogger("debug", "")
 		dir := t.TempDir()
@@ -166,9 +151,10 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 			"skipverify":    false,
 		}
 
+		endpoint := os.Getenv("DYNAMODBMOCK_ENDPOINT")
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dynamodb",
-			"endpoint":              "http://localhost:4566",
+			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
 			"repoMetaTablename":     "RepoMetadataTable",
@@ -183,7 +169,7 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 		// negative test cases
 
 		conf.Storage.CacheDriver = map[string]interface{}{
-			"endpoint":              "http://localhost:4566",
+			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
 			"repoMetaTablename":     "RepoMetadataTable",
@@ -197,7 +183,7 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dummy",
-			"endpoint":              "http://localhost:4566",
+			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
 			"repoMetaTablename":     "RepoMetadataTable",
@@ -371,7 +357,8 @@ func TestAutoPortSelection(t *testing.T) {
 }
 
 func TestObjectStorageController(t *testing.T) {
-	skipIt(t)
+	tskip.SkipS3(t)
+	tskip.SkipDynamo(t)
 
 	bucket := "zot-storage-test"
 
@@ -438,7 +425,7 @@ func TestObjectStorageController(t *testing.T) {
 
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dynamodb",
-			"endpoint":              "http://localhost:4566",
+			"endpoint":              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
 			"region":                "us-east-2",
 			"cachetablename":        "test",
 			"repometatablename":     "RepoMetadataTable",
@@ -493,7 +480,7 @@ func TestObjectStorageController(t *testing.T) {
 }
 
 func TestObjectStorageControllerSubPaths(t *testing.T) {
-	skipIt(t)
+	tskip.SkipS3(t)
 
 	bucket := "zot-storage-test"
 

diff --git a/pkg/extensions/extension_image_trust_test.go b/pkg/extensions/extension_image_trust_test.go
@@ -36,6 +36,7 @@ import (
 	test "zotregistry.io/zot/pkg/test/common"
 	. "zotregistry.io/zot/pkg/test/image-utils"
 	"zotregistry.io/zot/pkg/test/signature"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 type errReader int
@@ -122,7 +123,7 @@ func TestSignatureUploadAndVerificationLocal(t *testing.T) {
 }
 
 func TestSignatureUploadAndVerificationAWS(t *testing.T) {
-	skipIt(t)
+	tskip.SkipDynamo(t)
 
 	Convey("test with AWS", t, func() {
 		uuid, err := guuid.NewV4()
@@ -1000,11 +1001,3 @@ func RunSignatureUploadAndVerificationTests(t *testing.T, cacheDriverParams map[
 		So(resp.StatusCode(), ShouldEqual, http.StatusInternalServerError)
 	})
 }
-
-func skipIt(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("DYNAMODBMOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS mock server")
-	}
-}
diff --git a/pkg/extensions/imagetrust/image_trust_test.go b/pkg/extensions/imagetrust/image_trust_test.go
@@ -41,6 +41,7 @@ import (
 	. "zotregistry.io/zot/pkg/test/image-utils"
 	"zotregistry.io/zot/pkg/test/mocks"
 	"zotregistry.io/zot/pkg/test/signature"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 var (
@@ -658,7 +659,7 @@ func TestLocalTrustStore(t *testing.T) {
 }
 
 func TestAWSTrustStore(t *testing.T) {
-	skipIt(t)
+	tskip.SkipDynamo(t)
 
 	trustpolicy := "trustpolicy"
 
@@ -1336,11 +1337,3 @@ func RunVerificationTests(t *testing.T, dbDriverParams map[string]interface{}) {
 		})
 	})
 }
-
-func skipIt(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("DYNAMODBMOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS mock server")
-	}
-}
diff --git a/pkg/meta/dynamodb/dynamodb_internal_test.go b/pkg/meta/dynamodb/dynamodb_internal_test.go
@@ -3,6 +3,7 @@ package dynamodb
 import (
 	"context"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -14,13 +15,18 @@ import (
 
 	"zotregistry.io/zot/pkg/log" //nolint:go-staticcheck
 	"zotregistry.io/zot/pkg/meta/version"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 func TestWrapperErrors(t *testing.T) {
-	const (
-		endpoint = "http://localhost:4566"
-		region   = "us-east-2"
-	)
+	tskip.SkipS3(t)
+
+	const region = "us-east-2"
+	endpoint := os.Getenv("S3MOCK_ENDPOINT")
+
+	if !strings.HasPrefix(endpoint, "http://") {
+		endpoint = "http://" + endpoint
+	}
 
 	uuid, err := guuid.NewV4()
 	if err != nil {

diff --git a/pkg/meta/dynamodb/dynamodb_test.go b/pkg/meta/dynamodb/dynamodb_test.go
@@ -23,15 +23,16 @@ import (
 	mTypes "zotregistry.io/zot/pkg/meta/types"
 	reqCtx "zotregistry.io/zot/pkg/requestcontext"
 	. "zotregistry.io/zot/pkg/test/image-utils"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 const badTablename = "bad tablename"
 
 func TestIterator(t *testing.T) {
-	const (
-		endpoint = "http://localhost:4566"
-		region   = "us-east-2"
-	)
+	tskip.SkipDynamo(t)
+
+	const region = "us-east-2"
+	endpoint := os.Getenv("DYNAMODBMOCK_ENDPOINT")
 
 	uuid, err := guuid.NewV4()
 	if err != nil {
@@ -131,10 +132,10 @@ func TestIteratorErrors(t *testing.T) {
 }
 
 func TestWrapperErrors(t *testing.T) {
-	const (
-		endpoint = "http://localhost:4566"
-		region   = "us-east-2"
-	)
+	tskip.SkipDynamo(t)
+
+	const region = "us-east-2"
+	endpoint := os.Getenv("DYNAMODBMOCK_ENDPOINT")
 
 	uuid, err := guuid.NewV4()
 	if err != nil {

diff --git a/pkg/meta/meta_test.go b/pkg/meta/meta_test.go
@@ -35,6 +35,7 @@ import (
 	"zotregistry.io/zot/pkg/test/deprecated"
 	. "zotregistry.io/zot/pkg/test/image-utils"
 	signature "zotregistry.io/zot/pkg/test/signature"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 const (
@@ -97,7 +98,7 @@ func TestBoltDB(t *testing.T) {
 }
 
 func TestDynamoDBWrapper(t *testing.T) {
-	skipIt(t)
+	tskip.SkipDynamo(t)
 
 	uuid, err := guuid.NewV4()
 	if err != nil {
@@ -2688,7 +2689,7 @@ func generateTestImage() ([]byte, []byte, error) {
 }
 
 func TestCreateDynamo(t *testing.T) {
-	skipDynamo(t)
+	tskip.SkipDynamo(t)
 
 	Convey("Create", t, func() {
 		dynamoDBDriverParams := mdynamodb.DBDriverParameters{
@@ -2747,11 +2748,3 @@ func TestCreateBoltDB(t *testing.T) {
 		So(func() { _, _ = meta.Create("boltdb", nil, mdynamodb.DBDriverParameters{}, log) }, ShouldPanic)
 	})
 }
-
-func skipDynamo(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("DYNAMODBMOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS DynamoDB mock server")
-	}
-}
diff --git a/pkg/meta/parse_test.go b/pkg/meta/parse_test.go
@@ -28,6 +28,7 @@ import (
 	. "zotregistry.io/zot/pkg/test/image-utils"
 	"zotregistry.io/zot/pkg/test/mocks"
 	"zotregistry.io/zot/pkg/test/signature"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 const repo = "repo"
@@ -367,7 +368,7 @@ func TestParseStorageWithBoltDB(t *testing.T) {
 }
 
 func TestParseStorageDynamoWrapper(t *testing.T) {
-	skipIt(t)
+	tskip.SkipS3(t)
 
 	Convey("Dynamodb", t, func() {
 		rootDir := t.TempDir()
@@ -596,14 +597,6 @@ func TestGetReferredInfo(t *testing.T) {
 	})
 }
 
-func skipIt(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("S3MOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS S3 mock server")
-	}
-}
-
 func TestGetSignatureLayersInfo(t *testing.T) {
 	Convey("wrong signature type", t, func() {
 		layers, err := meta.GetSignatureLayersInfo("repo", "tag", "123", "wrong signature type", []byte{},

diff --git a/pkg/meta/version/version_test.go b/pkg/meta/version/version_test.go
@@ -18,6 +18,7 @@ import (
 	"zotregistry.io/zot/pkg/meta/boltdb"
 	mdynamodb "zotregistry.io/zot/pkg/meta/dynamodb"
 	"zotregistry.io/zot/pkg/meta/version"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
 var ErrTestError = errors.New("test error")
@@ -113,15 +114,12 @@ func setBoltDBVersion(db *bbolt.DB, vers string) error {
 }
 
 func TestVersioningDynamoDB(t *testing.T) {
-	const (
-		endpoint = "http://localhost:4566"
-		region   = "us-east-2"
-	)
+	tskip.SkipDynamo(t)
 
 	Convey("Tests", t, func() {
 		params := mdynamodb.DBDriverParameters{
-			Endpoint:              endpoint,
-			Region:                region,
+			Endpoint:              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
+			Region:                "us-east-2",
 			RepoMetaTablename:     "RepoMetadataTable",
 			ManifestDataTablename: "ManifestDataTable",
 			IndexDataTablename:    "IndexDataTable",

diff --git a/pkg/storage/cache/dynamodb_test.go b/pkg/storage/cache/dynamodb_test.go
@@ -11,18 +11,11 @@ import (
 	"zotregistry.io/zot/pkg/log"
 	"zotregistry.io/zot/pkg/storage"
 	"zotregistry.io/zot/pkg/storage/cache"
+	tskip "zotregistry.io/zot/pkg/test/skip"
 )
 
-func skipIt(t *testing.T) {
-	t.Helper()
-
-	if os.Getenv("DYNAMODBMOCK_ENDPOINT") == "" {
-		t.Skip("Skipping testing without AWS DynamoDB mock server")
-	}
-}
-
 func TestDynamoDB(t *testing.T) {
-	skipIt(t)
+	tskip.SkipDynamo(t)
 	Convey("Test dynamoDB", t, func(c C) {
 		log := log.NewLogger("debug", "")
 		dir := t.TempDir()