Skip to content

Commit 5e2bd1f

Browse files
mattmoormattmoor
authored
Move all of the library code under pkg/ for consistency. (#194)
... and to follow the widely adopted Go convention. Fixes: #21
1 parent dc7ac4a commit 5e2bd1f

File tree

153 files changed

+317
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+317
-317
lines changed

Diff for: ‎cmd/ko/BUILD.bazel

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ go_library(
1414
importpath = "github.com/google/go-containerregistry/cmd/ko",
1515
visibility = ["//visibility:private"],
1616
deps = [
17-
"//authn:go_default_library",
18-
"//ko/build:go_default_library",
19-
"//ko/publish:go_default_library",
20-
"//ko/resolve:go_default_library",
21-
"//name:go_default_library",
22-
"//v1:go_default_library",
23-
"//v1/daemon:go_default_library",
24-
"//v1/remote:go_default_library",
17+
"//pkg/authn:go_default_library",
18+
"//pkg/ko/build:go_default_library",
19+
"//pkg/ko/publish:go_default_library",
20+
"//pkg/ko/resolve:go_default_library",
21+
"//pkg/name:go_default_library",
22+
"//pkg/v1:go_default_library",
23+
"//pkg/v1/daemon:go_default_library",
24+
"//pkg/v1/remote:go_default_library",
2525
"//vendor/github.com/spf13/cobra:go_default_library",
2626
"//vendor/github.com/spf13/viper:go_default_library",
2727
],

Diff for: ‎cmd/ko/config.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
"github.com/spf13/viper"
2626

27-
"github.com/google/go-containerregistry/authn"
28-
"github.com/google/go-containerregistry/name"
29-
"github.com/google/go-containerregistry/v1"
30-
"github.com/google/go-containerregistry/v1/remote"
27+
"github.com/google/go-containerregistry/pkg/authn"
28+
"github.com/google/go-containerregistry/pkg/name"
29+
"github.com/google/go-containerregistry/pkg/v1"
30+
"github.com/google/go-containerregistry/pkg/v1/remote"
3131
)
3232

3333
var (

Diff for: ‎cmd/ko/publish.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"net/http"
2020
"os"
2121

22-
"github.com/google/go-containerregistry/ko/build"
23-
"github.com/google/go-containerregistry/ko/publish"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/daemon"
22+
"github.com/google/go-containerregistry/pkg/ko/build"
23+
"github.com/google/go-containerregistry/pkg/ko/publish"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/daemon"
2626
)
2727

2828
func publishImages(importpaths []string, lo *LocalOptions) {

Diff for: ‎cmd/ko/resolve.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"os"
2424
"sync"
2525

26-
"github.com/google/go-containerregistry/ko/build"
27-
"github.com/google/go-containerregistry/ko/publish"
28-
"github.com/google/go-containerregistry/ko/resolve"
29-
"github.com/google/go-containerregistry/name"
30-
"github.com/google/go-containerregistry/v1/daemon"
26+
"github.com/google/go-containerregistry/pkg/ko/build"
27+
"github.com/google/go-containerregistry/pkg/ko/publish"
28+
"github.com/google/go-containerregistry/pkg/ko/resolve"
29+
"github.com/google/go-containerregistry/pkg/name"
30+
"github.com/google/go-containerregistry/pkg/v1/daemon"
3131
)
3232

3333
func gobuildOptions() build.Options {

Diff for: ‎authn/BUILD.bazel renamed to ‎pkg/authn/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ go_library(
1212
"helper.go",
1313
"keychain.go",
1414
],
15-
importpath = "github.com/google/go-containerregistry/authn",
15+
importpath = "github.com/google/go-containerregistry/pkg/authn",
1616
visibility = ["//visibility:public"],
17-
deps = ["//name:go_default_library"],
17+
deps = ["//pkg/name:go_default_library"],
1818
)
1919

2020
go_test(
@@ -27,5 +27,5 @@ go_test(
2727
"keychain_test.go",
2828
],
2929
embed = [":go_default_library"],
30-
deps = ["//name:go_default_library"],
30+
deps = ["//pkg/name:go_default_library"],
3131
)

Diff for: ‎authn/anon.go renamed to ‎pkg/authn/anon.go

File renamed without changes.

Diff for: ‎authn/anon_test.go renamed to ‎pkg/authn/anon_test.go

File renamed without changes.

Diff for: ‎authn/auth.go renamed to ‎pkg/authn/auth.go

File renamed without changes.

Diff for: ‎authn/authn.go renamed to ‎pkg/authn/authn.go

File renamed without changes.

Diff for: ‎authn/basic.go renamed to ‎pkg/authn/basic.go

File renamed without changes.

Diff for: ‎authn/basic_test.go renamed to ‎pkg/authn/basic_test.go

File renamed without changes.

Diff for: ‎authn/bearer.go renamed to ‎pkg/authn/bearer.go

File renamed without changes.

Diff for: ‎authn/bearer_test.go renamed to ‎pkg/authn/bearer_test.go

File renamed without changes.

Diff for: ‎authn/doc.go renamed to ‎pkg/authn/doc.go

File renamed without changes.

Diff for: ‎authn/helper.go renamed to ‎pkg/authn/helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os/exec"
2222
"strings"
2323

24-
"github.com/google/go-containerregistry/name"
24+
"github.com/google/go-containerregistry/pkg/name"
2525
)
2626

2727
// magicNotFoundMessage is the string that the CLI special cases to mean

Diff for: ‎authn/helper_test.go renamed to ‎pkg/authn/helper_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os/exec"
2020
"testing"
2121

22-
"github.com/google/go-containerregistry/name"
22+
"github.com/google/go-containerregistry/pkg/name"
2323
)
2424

2525
var (

Diff for: ‎authn/keychain.go renamed to ‎pkg/authn/keychain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"path"
2525
"runtime"
2626

27-
"github.com/google/go-containerregistry/name"
27+
"github.com/google/go-containerregistry/pkg/name"
2828
)
2929

3030
// Keychain is an interface for resolving an image reference to a credential.

Diff for: ‎authn/keychain_test.go renamed to ‎pkg/authn/keychain_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"runtime"
2323
"testing"
2424

25-
"github.com/google/go-containerregistry/name"
25+
"github.com/google/go-containerregistry/pkg/name"
2626
)
2727

2828
func TestConfigDir(t *testing.T) {

Diff for: ‎pkg/crane/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ go_library(
1919
importpath = "github.com/google/go-containerregistry/pkg/crane",
2020
visibility = ["//visibility:public"],
2121
deps = [
22-
"//authn:go_default_library",
23-
"//name:go_default_library",
24-
"//v1:go_default_library",
25-
"//v1/mutate:go_default_library",
26-
"//v1/remote:go_default_library",
27-
"//v1/tarball:go_default_library",
22+
"//pkg/authn:go_default_library",
23+
"//pkg/name:go_default_library",
24+
"//pkg/v1:go_default_library",
25+
"//pkg/v1/mutate:go_default_library",
26+
"//pkg/v1/remote:go_default_library",
27+
"//pkg/v1/tarball:go_default_library",
2828
"//vendor/github.com/spf13/cobra:go_default_library",
2929
],
3030
)

Diff for: ‎pkg/crane/append.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/google/go-containerregistry/authn"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/mutate"
26-
"github.com/google/go-containerregistry/v1/remote"
27-
"github.com/google/go-containerregistry/v1/tarball"
23+
"github.com/google/go-containerregistry/pkg/authn"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/mutate"
26+
"github.com/google/go-containerregistry/pkg/v1/remote"
27+
"github.com/google/go-containerregistry/pkg/v1/tarball"
2828
)
2929

3030
func init() { Root.AddCommand(NewCmdAppend()) }

Diff for: ‎pkg/crane/copy.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919

2020
"net/http"
2121

22-
"github.com/google/go-containerregistry/v1/remote"
22+
"github.com/google/go-containerregistry/pkg/v1/remote"
2323

24-
"github.com/google/go-containerregistry/authn"
25-
"github.com/google/go-containerregistry/name"
24+
"github.com/google/go-containerregistry/pkg/authn"
25+
"github.com/google/go-containerregistry/pkg/name"
2626
"github.com/spf13/cobra"
2727
)
2828

Diff for: ‎pkg/crane/delete.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/google/go-containerregistry/authn"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/remote"
23+
"github.com/google/go-containerregistry/pkg/authn"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/remote"
2626
)
2727

2828
func init() { Root.AddCommand(NewCmdDelete()) }

Diff for: ‎pkg/crane/get.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"fmt"
1919
"net/http"
2020

21-
"github.com/google/go-containerregistry/authn"
22-
"github.com/google/go-containerregistry/name"
23-
"github.com/google/go-containerregistry/v1"
24-
"github.com/google/go-containerregistry/v1/remote"
21+
"github.com/google/go-containerregistry/pkg/authn"
22+
"github.com/google/go-containerregistry/pkg/name"
23+
"github.com/google/go-containerregistry/pkg/v1"
24+
"github.com/google/go-containerregistry/pkg/v1/remote"
2525
)
2626

2727
func getImage(r string) (v1.Image, name.Reference, error) {

Diff for: ‎pkg/crane/list.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"fmt"
2121
"log"
2222

23-
"github.com/google/go-containerregistry/authn"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/remote"
23+
"github.com/google/go-containerregistry/pkg/authn"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/remote"
2626
"github.com/spf13/cobra"
2727
)
2828

Diff for: ‎pkg/crane/pull.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/google/go-containerregistry/authn"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/remote"
26-
"github.com/google/go-containerregistry/v1/tarball"
23+
"github.com/google/go-containerregistry/pkg/authn"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/remote"
26+
"github.com/google/go-containerregistry/pkg/v1/tarball"
2727
)
2828

2929
func init() { Root.AddCommand(NewCmdPull()) }

Diff for: ‎pkg/crane/push.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/google/go-containerregistry/authn"
24-
"github.com/google/go-containerregistry/name"
25-
"github.com/google/go-containerregistry/v1/remote"
26-
"github.com/google/go-containerregistry/v1/tarball"
23+
"github.com/google/go-containerregistry/pkg/authn"
24+
"github.com/google/go-containerregistry/pkg/name"
25+
"github.com/google/go-containerregistry/pkg/v1/remote"
26+
"github.com/google/go-containerregistry/pkg/v1/tarball"
2727
)
2828

2929
func init() { Root.AddCommand(NewCmdPush()) }

Diff for: ‎pkg/crane/rebase.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"log"
2020
"net/http"
2121

22-
"github.com/google/go-containerregistry/authn"
23-
"github.com/google/go-containerregistry/name"
24-
"github.com/google/go-containerregistry/v1/mutate"
25-
"github.com/google/go-containerregistry/v1/remote"
22+
"github.com/google/go-containerregistry/pkg/authn"
23+
"github.com/google/go-containerregistry/pkg/name"
24+
"github.com/google/go-containerregistry/pkg/v1/mutate"
25+
"github.com/google/go-containerregistry/pkg/v1/remote"
2626
"github.com/spf13/cobra"
2727
)
2828

Diff for: ‎ko/BUILD.bazel renamed to ‎pkg/ko/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
33
go_library(
44
name = "go_default_library",
55
srcs = ["doc.go"],
6-
importpath = "github.com/google/go-containerregistry/ko",
6+
importpath = "github.com/google/go-containerregistry/pkg/ko",
77
visibility = ["//visibility:public"],
88
)

Diff for: ‎ko/build/BUILD.bazel renamed to ‎pkg/ko/build/BUILD.bazel

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ go_library(
88
"fixed.go",
99
"gobuild.go",
1010
],
11-
importpath = "github.com/google/go-containerregistry/ko/build",
11+
importpath = "github.com/google/go-containerregistry/pkg/ko/build",
1212
visibility = ["//visibility:public"],
1313
deps = [
14-
"//v1:go_default_library",
15-
"//v1/mutate:go_default_library",
16-
"//v1/tarball:go_default_library",
17-
"//v1/v1util:go_default_library",
14+
"//pkg/v1:go_default_library",
15+
"//pkg/v1/mutate:go_default_library",
16+
"//pkg/v1/tarball:go_default_library",
17+
"//pkg/v1/v1util:go_default_library",
1818
],
1919
)
2020

@@ -26,7 +26,7 @@ go_test(
2626
],
2727
embed = [":go_default_library"],
2828
deps = [
29-
"//v1:go_default_library",
30-
"//v1/random:go_default_library",
29+
"//pkg/v1:go_default_library",
30+
"//pkg/v1/random:go_default_library",
3131
],
3232
)

Diff for: ‎ko/build/build.go renamed to ‎pkg/ko/build/build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package build
1616

1717
import (
18-
"github.com/google/go-containerregistry/v1"
18+
"github.com/google/go-containerregistry/pkg/v1"
1919
)
2020

2121
// Interface abstracts different methods for turning a supported importpath

Diff for: ‎ko/build/doc.go renamed to ‎pkg/ko/build/doc.go

File renamed without changes.

Diff for: ‎ko/build/fixed.go renamed to ‎pkg/ko/build/fixed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package build
1717
import (
1818
"fmt"
1919

20-
"github.com/google/go-containerregistry/v1"
20+
"github.com/google/go-containerregistry/pkg/v1"
2121
)
2222

2323
type fixed struct {

Diff for: ‎ko/build/fixed_test.go renamed to ‎pkg/ko/build/fixed_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package build
1717
import (
1818
"testing"
1919

20-
"github.com/google/go-containerregistry/v1"
21-
"github.com/google/go-containerregistry/v1/random"
20+
"github.com/google/go-containerregistry/pkg/v1"
21+
"github.com/google/go-containerregistry/pkg/v1/random"
2222
)
2323

2424
var (

Diff for: ‎ko/build/gobuild.go renamed to ‎pkg/ko/build/gobuild.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"path"
2828
"strings"
2929

30-
"github.com/google/go-containerregistry/v1"
31-
"github.com/google/go-containerregistry/v1/mutate"
32-
"github.com/google/go-containerregistry/v1/tarball"
33-
"github.com/google/go-containerregistry/v1/v1util"
30+
"github.com/google/go-containerregistry/pkg/v1"
31+
"github.com/google/go-containerregistry/pkg/v1/mutate"
32+
"github.com/google/go-containerregistry/pkg/v1/tarball"
33+
"github.com/google/go-containerregistry/pkg/v1/v1util"
3434
)
3535

3636
var (

Diff for: ‎ko/build/gobuild_test.go renamed to ‎pkg/ko/build/gobuild_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"testing"
2424

25-
"github.com/google/go-containerregistry/v1"
26-
"github.com/google/go-containerregistry/v1/random"
25+
"github.com/google/go-containerregistry/pkg/v1"
26+
"github.com/google/go-containerregistry/pkg/v1/random"
2727
)
2828

2929
type testContext struct {

Diff for: ‎ko/doc.go renamed to ‎pkg/ko/doc.go

File renamed without changes.

Diff for: ‎ko/publish/BUILD.bazel renamed to ‎pkg/ko/publish/BUILD.bazel

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ go_library(
99
"fixed.go",
1010
"publish.go",
1111
],
12-
importpath = "github.com/google/go-containerregistry/ko/publish",
12+
importpath = "github.com/google/go-containerregistry/pkg/ko/publish",
1313
visibility = ["//visibility:public"],
1414
deps = [
15-
"//authn:go_default_library",
16-
"//name:go_default_library",
17-
"//v1:go_default_library",
18-
"//v1/daemon:go_default_library",
19-
"//v1/remote:go_default_library",
15+
"//pkg/authn:go_default_library",
16+
"//pkg/name:go_default_library",
17+
"//pkg/v1:go_default_library",
18+
"//pkg/v1/daemon:go_default_library",
19+
"//pkg/v1/remote:go_default_library",
2020
],
2121
)
2222

@@ -29,10 +29,10 @@ go_test(
2929
],
3030
embed = [":go_default_library"],
3131
deps = [
32-
"//name:go_default_library",
33-
"//v1:go_default_library",
34-
"//v1/daemon:go_default_library",
35-
"//v1/random:go_default_library",
32+
"//pkg/name:go_default_library",
33+
"//pkg/v1:go_default_library",
34+
"//pkg/v1/daemon:go_default_library",
35+
"//pkg/v1/random:go_default_library",
3636
"//vendor/github.com/docker/docker/api/types:go_default_library",
3737
],
3838
)

0 commit comments

Comments
 (0)