move testutils under an ./internal/ directory

This prevents these libraries from being depended on from outside the module. Signed-off-by: Mike Danese <mike.danese@databricks.com>
theupdateframework · Feb 6, 2024 · a1b3a1f · a1b3a1f
1 parent 3a2b819
commit a1b3a1f
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 12 deletions.
diff --git a/...s/repository_data/keystore/delegation_key → ...s/repository_data/keystore/delegation_key b/...s/repository_data/keystore/delegation_key → ...s/repository_data/keystore/delegation_key
diff --git a/...pository_data/keystore/delegation_key.pub → ...pository_data/keystore/delegation_key.pub b/...pository_data/keystore/delegation_key.pub → ...pository_data/keystore/delegation_key.pub
diff --git a/testutils/repository_data/keystore/root_key → ...stutils/repository_data/keystore/root_key b/testutils/repository_data/keystore/root_key → ...stutils/repository_data/keystore/root_key
diff --git a/...ils/repository_data/keystore/root_key.pub → ...ils/repository_data/keystore/root_key.pub b/...ils/repository_data/keystore/root_key.pub → ...ils/repository_data/keystore/root_key.pub
diff --git a/testutils/repository_data/keystore/root_key2 → ...tutils/repository_data/keystore/root_key2 b/testutils/repository_data/keystore/root_key2 → ...tutils/repository_data/keystore/root_key2
diff --git a/...ls/repository_data/keystore/root_key2.pub → ...ls/repository_data/keystore/root_key2.pub b/...ls/repository_data/keystore/root_key2.pub → ...ls/repository_data/keystore/root_key2.pub
diff --git a/...ils/repository_data/keystore/snapshot_key → ...ils/repository_data/keystore/snapshot_key b/...ils/repository_data/keystore/snapshot_key → ...ils/repository_data/keystore/snapshot_key
diff --git a/...repository_data/keystore/snapshot_key.pub → ...repository_data/keystore/snapshot_key.pub b/...repository_data/keystore/snapshot_key.pub → ...repository_data/keystore/snapshot_key.pub
diff --git a/...tils/repository_data/keystore/targets_key → ...tils/repository_data/keystore/targets_key b/...tils/repository_data/keystore/targets_key → ...tils/repository_data/keystore/targets_key
diff --git a/.../repository_data/keystore/targets_key.pub → .../repository_data/keystore/targets_key.pub b/.../repository_data/keystore/targets_key.pub → .../repository_data/keystore/targets_key.pub
diff --git a/...ls/repository_data/keystore/timestamp_key → ...ls/repository_data/keystore/timestamp_key b/...ls/repository_data/keystore/timestamp_key → ...ls/repository_data/keystore/timestamp_key
diff --git a/...epository_data/keystore/timestamp_key.pub → ...epository_data/keystore/timestamp_key.pub b/...epository_data/keystore/timestamp_key.pub → ...epository_data/keystore/timestamp_key.pub
diff --git a/...tory_data/repository/metadata/1.root.json → ...tory_data/repository/metadata/1.root.json b/...tory_data/repository/metadata/1.root.json → ...tory_data/repository/metadata/1.root.json
diff --git a/...itory_data/repository/metadata/role1.json → ...itory_data/repository/metadata/role1.json b/...itory_data/repository/metadata/role1.json → ...itory_data/repository/metadata/role1.json
diff --git a/...itory_data/repository/metadata/role2.json → ...itory_data/repository/metadata/role2.json b/...itory_data/repository/metadata/role2.json → ...itory_data/repository/metadata/role2.json
diff --git a/...sitory_data/repository/metadata/root.json → ...sitory_data/repository/metadata/root.json b/...sitory_data/repository/metadata/root.json → ...sitory_data/repository/metadata/root.json
diff --git a/...ry_data/repository/metadata/snapshot.json → ...ry_data/repository/metadata/snapshot.json b/...ry_data/repository/metadata/snapshot.json → ...ry_data/repository/metadata/snapshot.json
diff --git a/...ory_data/repository/metadata/targets.json → ...ory_data/repository/metadata/targets.json b/...ory_data/repository/metadata/targets.json → ...ory_data/repository/metadata/targets.json
diff --git a/...y_data/repository/metadata/timestamp.json → ...y_data/repository/metadata/timestamp.json b/...y_data/repository/metadata/timestamp.json → ...y_data/repository/metadata/timestamp.json
diff --git a/...ository_data/repository/targets/file1.txt → ...ository_data/repository/targets/file1.txt b/...ository_data/repository/targets/file1.txt → ...ository_data/repository/targets/file1.txt
diff --git a/...ository_data/repository/targets/file2.txt → ...ository_data/repository/targets/file2.txt b/...ository_data/repository/targets/file2.txt → ...ository_data/repository/targets/file2.txt
diff --git a/...ository_data/repository/targets/file3.txt → ...ository_data/repository/targets/file3.txt b/...ository_data/repository/targets/file3.txt → ...ository_data/repository/targets/file3.txt
diff --git a/testutils/testutils/setup.go → internal/testutils/setup.go b/testutils/testutils/setup.go → internal/testutils/setup.go
diff --git a/testutils/simulator/repository_simulator.go → ...stutils/simulator/repository_simulator.go b/testutils/simulator/repository_simulator.go → ...stutils/simulator/repository_simulator.go
diff --git a/...s/simulator/repository_simulator_setup.go → ...s/simulator/repository_simulator_setup.go b/...s/simulator/repository_simulator_setup.go → ...s/simulator/repository_simulator_setup.go
diff --git a/metadata/metadata_api_test.go b/metadata/metadata_api_test.go
@@ -34,14 +34,14 @@ import (
 	"github.com/sigstore/sigstore/pkg/cryptoutils"
 	"github.com/sigstore/sigstore/pkg/signature"
 	"github.com/stretchr/testify/assert"
-	"github.com/theupdateframework/go-tuf/v2/testutils/testutils"
+	"github.com/theupdateframework/go-tuf/v2/internal/testutils"
 )
 
 func TestMain(m *testing.M) {
 
-	repoPath := "../testutils/repository_data/repository/metadata"
-	targetsPath := "../testutils/repository_data/repository/targets"
-	keystorePath := "../testutils/repository_data/keystore"
+	repoPath := "../internal/testutils/repository_data/repository/metadata"
+	targetsPath := "../internal/testutils/repository_data/repository/targets"
+	keystorePath := "../internal/testutils/repository_data/keystore"
 	err := testutils.SetupTestDirs(repoPath, targetsPath, keystorePath)
 	defer testutils.Cleanup()
 

diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go
@@ -31,7 +31,7 @@ import (
 
 var testRootBytes = []byte("{\"signatures\":[{\"keyid\":\"roothash\",\"sig\":\"1307990e6ba5ca145eb35e99182a9bec46531bc54ddf656a602c780fa0240dee\"}],\"signed\":{\"_type\":\"root\",\"consistent_snapshot\":true,\"expires\":\"2030-08-15T14:30:45.0000001Z\",\"keys\":{\"roothash\":{\"keytype\":\"ed25519\",\"keyval\":{\"public\":\"pubrootval\"},\"scheme\":\"ed25519\"},\"snapshothash\":{\"keytype\":\"ed25519\",\"keyval\":{\"public\":\"pubsval\"},\"scheme\":\"ed25519\"},\"targetshash\":{\"keytype\":\"ed25519\",\"keyval\":{\"public\":\"pubtrval\"},\"scheme\":\"ed25519\"},\"timestamphash\":{\"keytype\":\"ed25519\",\"keyval\":{\"public\":\"pubtmval\"},\"scheme\":\"ed25519\"}},\"roles\":{\"root\":{\"keyids\":[\"roothash\"],\"threshold\":1},\"snapshot\":{\"keyids\":[\"snapshothash\"],\"threshold\":1},\"targets\":{\"keyids\":[\"targetshash\"],\"threshold\":1},\"timestamp\":{\"keyids\":[\"timestamphash\"],\"threshold\":1}},\"spec_version\":\"1.0.31\",\"version\":1}}")
 
-const TEST_REPOSITORY_DATA = "../testutils/repository_data/repository/metadata"
+const TEST_REPOSITORY_DATA = "../internal/testutils/repository_data/repository/metadata"
 
 var fixedExpire = time.Date(2030, 8, 15, 14, 30, 45, 100, time.UTC)
 

diff --git a/metadata/trustedmetadata/trustedmetadata_test.go b/metadata/trustedmetadata/trustedmetadata_test.go
@@ -27,8 +27,8 @@ import (
 	"github.com/sigstore/sigstore/pkg/cryptoutils"
 	"github.com/sigstore/sigstore/pkg/signature"
 	"github.com/stretchr/testify/assert"
+	"github.com/theupdateframework/go-tuf/v2/internal/testutils"
 	"github.com/theupdateframework/go-tuf/v2/metadata"
-	"github.com/theupdateframework/go-tuf/v2/testutils/testutils"
 )
 
 var allRoles map[string][]byte
@@ -89,9 +89,9 @@ func setAllRolesBytes(path string) {
 func TestMain(m *testing.M) {
 	log := metadata.GetLogger()
 
-	repoPath := "../../testutils/repository_data/repository/metadata"
-	keystorePath := "../../testutils/repository_data/keystore"
-	targetsPath := "../../testutils/repository_data/repository/targets"
+	repoPath := "../../internal/testutils/repository_data/repository/metadata"
+	keystorePath := "../../internal/testutils/repository_data/keystore"
+	targetsPath := "../../internal/testutils/repository_data/repository/targets"
 	err := testutils.SetupTestDirs(repoPath, targetsPath, keystorePath)
 	defer testutils.Cleanup()
 

diff --git a/metadata/updater/updater_consistent_snapshot_test.go b/metadata/updater/updater_consistent_snapshot_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/theupdateframework/go-tuf/v2/internal/testutils/simulator"
 	"github.com/theupdateframework/go-tuf/v2/metadata"
-	"github.com/theupdateframework/go-tuf/v2/testutils/simulator"
 )
 
 func TestTopLevelRolesUpdateWithConsistentSnapshotDisabled(t *testing.T) {

diff --git a/metadata/updater/updater_top_level_update_test.go b/metadata/updater/updater_top_level_update_test.go
@@ -28,10 +28,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/theupdateframework/go-tuf/v2/internal/testutils"
+	"github.com/theupdateframework/go-tuf/v2/internal/testutils/simulator"
 	"github.com/theupdateframework/go-tuf/v2/metadata"
 	"github.com/theupdateframework/go-tuf/v2/metadata/config"
-	"github.com/theupdateframework/go-tuf/v2/testutils/simulator"
-	"github.com/theupdateframework/go-tuf/v2/testutils/testutils"
 )
 
 func TestMain(m *testing.M) {