From e775248b9667059c05c28672aee32b971dbccac8 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 17 May 2016 17:11:39 +0200 Subject: [PATCH] move dockerutils under docker/utils also remove fixtures pkg as it would clutter godoc (there's not need to have a .go files with fixtures) Signed-off-by: Antonio Murdaca --- cmd/skopeo/inspect.go | 4 ++-- docker/docker_image_dest.go | 6 +++--- .../utils}/fixtures/non-json.manifest.json | Bin .../utils}/fixtures/unknown-version.manifest.json | 0 .../fixtures/v2s1-invalid-signatures.manifest.json | 0 .../utils}/fixtures/v2s1.manifest.json | 0 .../utils}/fixtures/v2s2.manifest.json | 0 .../utils}/fixtures/v2s2nomime.manifest.json | 0 .../info.go => docker/utils/fixtures_info_test.go | 2 +- {dockerutils => docker/utils}/manifest.go | 2 +- {dockerutils => docker/utils}/manifest_test.go | 7 +++---- openshift/openshift.go | 4 ++-- signature/docker.go | 6 +++--- 13 files changed, 15 insertions(+), 16 deletions(-) rename {dockerutils => docker/utils}/fixtures/non-json.manifest.json (100%) rename {dockerutils => docker/utils}/fixtures/unknown-version.manifest.json (100%) rename {dockerutils => docker/utils}/fixtures/v2s1-invalid-signatures.manifest.json (100%) rename {dockerutils => docker/utils}/fixtures/v2s1.manifest.json (100%) rename {dockerutils => docker/utils}/fixtures/v2s2.manifest.json (100%) rename {dockerutils => docker/utils}/fixtures/v2s2nomime.manifest.json (100%) rename dockerutils/fixtures/info.go => docker/utils/fixtures_info_test.go (95%) rename {dockerutils => docker/utils}/manifest.go (99%) rename {dockerutils => docker/utils}/manifest_test.go (88%) diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index da2ff088..f29b6e73 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -7,7 +7,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - "github.com/projectatomic/skopeo/dockerutils" + "github.com/projectatomic/skopeo/docker/utils" ) // inspectOutput is the output format of (skopeo inspect), primarily so that we can format it with a simple json.MarshalIndent. @@ -50,7 +50,7 @@ var inspectCmd = cli.Command{ if err != nil { logrus.Fatal(err) } - manifestDigest, err := dockerutils.ManifestDigest(rawManifest) + manifestDigest, err := utils.ManifestDigest(rawManifest) if err != nil { logrus.Fatalf("Error computing manifest digest: %s", err.Error()) } diff --git a/docker/docker_image_dest.go b/docker/docker_image_dest.go index c1ea29f1..37ec4da0 100644 --- a/docker/docker_image_dest.go +++ b/docker/docker_image_dest.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/Sirupsen/logrus" - "github.com/projectatomic/skopeo/dockerutils" + "github.com/projectatomic/skopeo/docker/utils" "github.com/projectatomic/skopeo/reference" "github.com/projectatomic/skopeo/types" ) @@ -43,14 +43,14 @@ func (d *dockerImageDestination) CanonicalDockerReference() (string, error) { func (d *dockerImageDestination) PutManifest(manifest []byte) error { // FIXME: This only allows upload by digest, not creating a tag. See the // corresponding comment in NewOpenshiftImageDestination. - digest, err := dockerutils.ManifestDigest(manifest) + digest, err := utils.ManifestDigest(manifest) if err != nil { return err } url := fmt.Sprintf(manifestURL, d.ref.RemoteName(), digest) headers := map[string]string{} - mimeType := dockerutils.GuessManifestMIMEType(manifest) + mimeType := utils.GuessManifestMIMEType(manifest) if mimeType != "" { headers["Content-Type"] = mimeType } diff --git a/dockerutils/fixtures/non-json.manifest.json b/docker/utils/fixtures/non-json.manifest.json similarity index 100% rename from dockerutils/fixtures/non-json.manifest.json rename to docker/utils/fixtures/non-json.manifest.json diff --git a/dockerutils/fixtures/unknown-version.manifest.json b/docker/utils/fixtures/unknown-version.manifest.json similarity index 100% rename from dockerutils/fixtures/unknown-version.manifest.json rename to docker/utils/fixtures/unknown-version.manifest.json diff --git a/dockerutils/fixtures/v2s1-invalid-signatures.manifest.json b/docker/utils/fixtures/v2s1-invalid-signatures.manifest.json similarity index 100% rename from dockerutils/fixtures/v2s1-invalid-signatures.manifest.json rename to docker/utils/fixtures/v2s1-invalid-signatures.manifest.json diff --git a/dockerutils/fixtures/v2s1.manifest.json b/docker/utils/fixtures/v2s1.manifest.json similarity index 100% rename from dockerutils/fixtures/v2s1.manifest.json rename to docker/utils/fixtures/v2s1.manifest.json diff --git a/dockerutils/fixtures/v2s2.manifest.json b/docker/utils/fixtures/v2s2.manifest.json similarity index 100% rename from dockerutils/fixtures/v2s2.manifest.json rename to docker/utils/fixtures/v2s2.manifest.json diff --git a/dockerutils/fixtures/v2s2nomime.manifest.json b/docker/utils/fixtures/v2s2nomime.manifest.json similarity index 100% rename from dockerutils/fixtures/v2s2nomime.manifest.json rename to docker/utils/fixtures/v2s2nomime.manifest.json diff --git a/dockerutils/fixtures/info.go b/docker/utils/fixtures_info_test.go similarity index 95% rename from dockerutils/fixtures/info.go rename to docker/utils/fixtures_info_test.go index 1ee7e09d..402d1133 100644 --- a/dockerutils/fixtures/info.go +++ b/docker/utils/fixtures_info_test.go @@ -1,4 +1,4 @@ -package fixtures +package utils const ( // TestV2S2ManifestDigest is the Docker manifest digest of "v2s2.manifest.json" diff --git a/dockerutils/manifest.go b/docker/utils/manifest.go similarity index 99% rename from dockerutils/manifest.go rename to docker/utils/manifest.go index e16780ef..f583dd08 100644 --- a/dockerutils/manifest.go +++ b/docker/utils/manifest.go @@ -1,4 +1,4 @@ -package dockerutils +package utils import ( "crypto/sha256" diff --git a/dockerutils/manifest_test.go b/docker/utils/manifest_test.go similarity index 88% rename from dockerutils/manifest_test.go rename to docker/utils/manifest_test.go index 683ca25e..101365ed 100644 --- a/dockerutils/manifest_test.go +++ b/docker/utils/manifest_test.go @@ -1,11 +1,10 @@ -package dockerutils +package utils import ( "io/ioutil" "path/filepath" "testing" - "github.com/projectatomic/skopeo/dockerutils/fixtures" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -36,8 +35,8 @@ func TestManifestDigest(t *testing.T) { path string digest string }{ - {"v2s2.manifest.json", fixtures.TestV2S2ManifestDigest}, - {"v2s1.manifest.json", fixtures.TestV2S1ManifestDigest}, + {"v2s2.manifest.json", TestV2S2ManifestDigest}, + {"v2s1.manifest.json", TestV2S1ManifestDigest}, } for _, c := range cases { manifest, err := ioutil.ReadFile(filepath.Join("fixtures", c.path)) diff --git a/openshift/openshift.go b/openshift/openshift.go index f351bf46..0afe21e8 100644 --- a/openshift/openshift.go +++ b/openshift/openshift.go @@ -14,7 +14,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/projectatomic/skopeo/docker" - "github.com/projectatomic/skopeo/dockerutils" + "github.com/projectatomic/skopeo/docker/utils" "github.com/projectatomic/skopeo/types" "github.com/projectatomic/skopeo/version" ) @@ -289,7 +289,7 @@ func (d *openshiftImageDestination) CanonicalDockerReference() (string, error) { func (d *openshiftImageDestination) PutManifest(manifest []byte) error { // Note: This does absolutely no kind/version checking or conversions. - manifestDigest, err := dockerutils.ManifestDigest(manifest) + manifestDigest, err := utils.ManifestDigest(manifest) if err != nil { return err } diff --git a/signature/docker.go b/signature/docker.go index 386289dd..eb575c06 100644 --- a/signature/docker.go +++ b/signature/docker.go @@ -5,13 +5,13 @@ package signature import ( "fmt" - "github.com/projectatomic/skopeo/dockerutils" + "github.com/projectatomic/skopeo/docker/utils" ) // SignDockerManifest returns a signature for manifest as the specified dockerReference, // using mech and keyIdentity. func SignDockerManifest(manifest []byte, dockerReference string, mech SigningMechanism, keyIdentity string) ([]byte, error) { - manifestDigest, err := dockerutils.ManifestDigest(manifest) + manifestDigest, err := utils.ManifestDigest(manifest) if err != nil { return nil, err } @@ -28,7 +28,7 @@ func SignDockerManifest(manifest []byte, dockerReference string, mech SigningMec // using mech. func VerifyDockerManifestSignature(unverifiedSignature, unverifiedManifest []byte, expectedDockerReference string, mech SigningMechanism, expectedKeyIdentity string) (*Signature, error) { - expectedManifestDigest, err := dockerutils.ManifestDigest(unverifiedManifest) + expectedManifestDigest, err := utils.ManifestDigest(unverifiedManifest) if err != nil { return nil, err }