From a1b3a1fc004f41c826cdbef7b89d37b5d59ae144 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 1 Feb 2024 18:13:07 -0800 Subject: [PATCH] move testutils under an ./internal/ directory This prevents these libraries from being depended on from outside the module. Signed-off-by: Mike Danese --- .../testutils}/repository_data/keystore/delegation_key | 0 .../repository_data/keystore/delegation_key.pub | 0 .../testutils}/repository_data/keystore/root_key | 0 .../testutils}/repository_data/keystore/root_key.pub | 0 .../testutils}/repository_data/keystore/root_key2 | 0 .../testutils}/repository_data/keystore/root_key2.pub | 0 .../testutils}/repository_data/keystore/snapshot_key | 0 .../testutils}/repository_data/keystore/snapshot_key.pub | 0 .../testutils}/repository_data/keystore/targets_key | 0 .../testutils}/repository_data/keystore/targets_key.pub | 0 .../testutils}/repository_data/keystore/timestamp_key | 0 .../testutils}/repository_data/keystore/timestamp_key.pub | 0 .../repository_data/repository/metadata/1.root.json | 0 .../repository_data/repository/metadata/role1.json | 0 .../repository_data/repository/metadata/role2.json | 0 .../repository_data/repository/metadata/root.json | 0 .../repository_data/repository/metadata/snapshot.json | 0 .../repository_data/repository/metadata/targets.json | 0 .../repository_data/repository/metadata/timestamp.json | 0 .../repository_data/repository/targets/file1.txt | 0 .../repository_data/repository/targets/file2.txt | 0 .../repository_data/repository/targets/file3.txt | 0 {testutils => internal}/testutils/setup.go | 0 .../testutils}/simulator/repository_simulator.go | 0 .../testutils}/simulator/repository_simulator_setup.go | 0 metadata/metadata_api_test.go | 8 ++++---- metadata/metadata_test.go | 2 +- metadata/trustedmetadata/trustedmetadata_test.go | 8 ++++---- metadata/updater/updater_consistent_snapshot_test.go | 2 +- metadata/updater/updater_top_level_update_test.go | 4 ++-- 30 files changed, 12 insertions(+), 12 deletions(-) rename {testutils => internal/testutils}/repository_data/keystore/delegation_key (100%) rename {testutils => internal/testutils}/repository_data/keystore/delegation_key.pub (100%) rename {testutils => internal/testutils}/repository_data/keystore/root_key (100%) rename {testutils => internal/testutils}/repository_data/keystore/root_key.pub (100%) rename {testutils => internal/testutils}/repository_data/keystore/root_key2 (100%) rename {testutils => internal/testutils}/repository_data/keystore/root_key2.pub (100%) rename {testutils => internal/testutils}/repository_data/keystore/snapshot_key (100%) rename {testutils => internal/testutils}/repository_data/keystore/snapshot_key.pub (100%) rename {testutils => internal/testutils}/repository_data/keystore/targets_key (100%) rename {testutils => internal/testutils}/repository_data/keystore/targets_key.pub (100%) rename {testutils => internal/testutils}/repository_data/keystore/timestamp_key (100%) rename {testutils => internal/testutils}/repository_data/keystore/timestamp_key.pub (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/1.root.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/role1.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/role2.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/root.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/snapshot.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/targets.json (100%) rename {testutils => internal/testutils}/repository_data/repository/metadata/timestamp.json (100%) rename {testutils => internal/testutils}/repository_data/repository/targets/file1.txt (100%) rename {testutils => internal/testutils}/repository_data/repository/targets/file2.txt (100%) rename {testutils => internal/testutils}/repository_data/repository/targets/file3.txt (100%) rename {testutils => internal}/testutils/setup.go (100%) rename {testutils => internal/testutils}/simulator/repository_simulator.go (100%) rename {testutils => internal/testutils}/simulator/repository_simulator_setup.go (100%) diff --git a/testutils/repository_data/keystore/delegation_key b/internal/testutils/repository_data/keystore/delegation_key similarity index 100% rename from testutils/repository_data/keystore/delegation_key rename to internal/testutils/repository_data/keystore/delegation_key diff --git a/testutils/repository_data/keystore/delegation_key.pub b/internal/testutils/repository_data/keystore/delegation_key.pub similarity index 100% rename from testutils/repository_data/keystore/delegation_key.pub rename to internal/testutils/repository_data/keystore/delegation_key.pub diff --git a/testutils/repository_data/keystore/root_key b/internal/testutils/repository_data/keystore/root_key similarity index 100% rename from testutils/repository_data/keystore/root_key rename to internal/testutils/repository_data/keystore/root_key diff --git a/testutils/repository_data/keystore/root_key.pub b/internal/testutils/repository_data/keystore/root_key.pub similarity index 100% rename from testutils/repository_data/keystore/root_key.pub rename to internal/testutils/repository_data/keystore/root_key.pub diff --git a/testutils/repository_data/keystore/root_key2 b/internal/testutils/repository_data/keystore/root_key2 similarity index 100% rename from testutils/repository_data/keystore/root_key2 rename to internal/testutils/repository_data/keystore/root_key2 diff --git a/testutils/repository_data/keystore/root_key2.pub b/internal/testutils/repository_data/keystore/root_key2.pub similarity index 100% rename from testutils/repository_data/keystore/root_key2.pub rename to internal/testutils/repository_data/keystore/root_key2.pub diff --git a/testutils/repository_data/keystore/snapshot_key b/internal/testutils/repository_data/keystore/snapshot_key similarity index 100% rename from testutils/repository_data/keystore/snapshot_key rename to internal/testutils/repository_data/keystore/snapshot_key diff --git a/testutils/repository_data/keystore/snapshot_key.pub b/internal/testutils/repository_data/keystore/snapshot_key.pub similarity index 100% rename from testutils/repository_data/keystore/snapshot_key.pub rename to internal/testutils/repository_data/keystore/snapshot_key.pub diff --git a/testutils/repository_data/keystore/targets_key b/internal/testutils/repository_data/keystore/targets_key similarity index 100% rename from testutils/repository_data/keystore/targets_key rename to internal/testutils/repository_data/keystore/targets_key diff --git a/testutils/repository_data/keystore/targets_key.pub b/internal/testutils/repository_data/keystore/targets_key.pub similarity index 100% rename from testutils/repository_data/keystore/targets_key.pub rename to internal/testutils/repository_data/keystore/targets_key.pub diff --git a/testutils/repository_data/keystore/timestamp_key b/internal/testutils/repository_data/keystore/timestamp_key similarity index 100% rename from testutils/repository_data/keystore/timestamp_key rename to internal/testutils/repository_data/keystore/timestamp_key diff --git a/testutils/repository_data/keystore/timestamp_key.pub b/internal/testutils/repository_data/keystore/timestamp_key.pub similarity index 100% rename from testutils/repository_data/keystore/timestamp_key.pub rename to internal/testutils/repository_data/keystore/timestamp_key.pub diff --git a/testutils/repository_data/repository/metadata/1.root.json b/internal/testutils/repository_data/repository/metadata/1.root.json similarity index 100% rename from testutils/repository_data/repository/metadata/1.root.json rename to internal/testutils/repository_data/repository/metadata/1.root.json diff --git a/testutils/repository_data/repository/metadata/role1.json b/internal/testutils/repository_data/repository/metadata/role1.json similarity index 100% rename from testutils/repository_data/repository/metadata/role1.json rename to internal/testutils/repository_data/repository/metadata/role1.json diff --git a/testutils/repository_data/repository/metadata/role2.json b/internal/testutils/repository_data/repository/metadata/role2.json similarity index 100% rename from testutils/repository_data/repository/metadata/role2.json rename to internal/testutils/repository_data/repository/metadata/role2.json diff --git a/testutils/repository_data/repository/metadata/root.json b/internal/testutils/repository_data/repository/metadata/root.json similarity index 100% rename from testutils/repository_data/repository/metadata/root.json rename to internal/testutils/repository_data/repository/metadata/root.json diff --git a/testutils/repository_data/repository/metadata/snapshot.json b/internal/testutils/repository_data/repository/metadata/snapshot.json similarity index 100% rename from testutils/repository_data/repository/metadata/snapshot.json rename to internal/testutils/repository_data/repository/metadata/snapshot.json diff --git a/testutils/repository_data/repository/metadata/targets.json b/internal/testutils/repository_data/repository/metadata/targets.json similarity index 100% rename from testutils/repository_data/repository/metadata/targets.json rename to internal/testutils/repository_data/repository/metadata/targets.json diff --git a/testutils/repository_data/repository/metadata/timestamp.json b/internal/testutils/repository_data/repository/metadata/timestamp.json similarity index 100% rename from testutils/repository_data/repository/metadata/timestamp.json rename to internal/testutils/repository_data/repository/metadata/timestamp.json diff --git a/testutils/repository_data/repository/targets/file1.txt b/internal/testutils/repository_data/repository/targets/file1.txt similarity index 100% rename from testutils/repository_data/repository/targets/file1.txt rename to internal/testutils/repository_data/repository/targets/file1.txt diff --git a/testutils/repository_data/repository/targets/file2.txt b/internal/testutils/repository_data/repository/targets/file2.txt similarity index 100% rename from testutils/repository_data/repository/targets/file2.txt rename to internal/testutils/repository_data/repository/targets/file2.txt diff --git a/testutils/repository_data/repository/targets/file3.txt b/internal/testutils/repository_data/repository/targets/file3.txt similarity index 100% rename from testutils/repository_data/repository/targets/file3.txt rename to internal/testutils/repository_data/repository/targets/file3.txt diff --git a/testutils/testutils/setup.go b/internal/testutils/setup.go similarity index 100% rename from testutils/testutils/setup.go rename to internal/testutils/setup.go diff --git a/testutils/simulator/repository_simulator.go b/internal/testutils/simulator/repository_simulator.go similarity index 100% rename from testutils/simulator/repository_simulator.go rename to internal/testutils/simulator/repository_simulator.go diff --git a/testutils/simulator/repository_simulator_setup.go b/internal/testutils/simulator/repository_simulator_setup.go similarity index 100% rename from testutils/simulator/repository_simulator_setup.go rename to internal/testutils/simulator/repository_simulator_setup.go diff --git a/metadata/metadata_api_test.go b/metadata/metadata_api_test.go index 2ab6b9db..4b3f781f 100644 --- 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 index cebf888b..edae9dc1 100644 --- 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 index 75d7d3b2..676bc3b9 100644 --- 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 index 60eac3e0..6c12b5df 100644 --- 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 index e1dde93b..a63a359b 100644 --- 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) {