Move cmd, internal, and pkg into a new Go module (#35)

This lets us depend on `github.com/DataDog/rules_oci/go` in other projects without Gazelle getting confused by depending on the Go module `github.com/DataDog/rules_oci`, which Gazelle's update-repos turns into the label `@com_github_datadog_rules_oci`, and depending on the Bazel rules from this repo, which is named `@com_github_datadog_rules_oci`.

The `go.work` is just a way to have a `--from_file` for `gazelle --update-repos` that pulls in both `./go.mod` and `./go/go.mod`. This way, we can have just one `gazelle --update-repos` call that pulls in every Go dependency for both modules properly.

Signed-off-by: Andrew Bayer <[email protected]>

Author: abayer

.github/workflows/main.yaml

@@ -22,7 +22,7 @@ jobs:
       - run: chmod +x ~/.local/bin/docker-credential-ghcr
 
       # Setup local toolchain
-      - run: bazel build --config=ci //cmd/ocitool:ocitool && cp bazel-bin/cmd/ocitool/ocitool_/ocitool bin/ocitool-linux-amd64
+      - run: bazel build --config=ci //go/cmd/ocitool:ocitool && cp bazel-bin/go/cmd/ocitool/ocitool_/ocitool bin/ocitool-linux-amd64
 
       # Run all tests
       - run: bazel test --config=ci //...

BUILD.bazel

@@ -32,7 +32,7 @@ gazelle_binary(
 gazelle(
     name = "gazelle-update-repos",
     args = [
-        "-from_file=go.mod",
+        "-from_file=go.work",
         "-to_macro=repositories.bzl%go_repositories",
         "-prune=true",
         "-build_file_proto_mode=disable",

LICENSE-3rdparty.csv

@@ -1,13 +1,13 @@
 Component,Origin,License,Copyright
-github.com/DataDog/rules_oci/cmd/ocitool,,,
-github.com/DataDog/rules_oci/internal/flagutil,,,
-github.com/DataDog/rules_oci/internal/set,,,
-github.com/DataDog/rules_oci/internal/tarutil,,,
-github.com/DataDog/rules_oci/pkg/blob,,,
-github.com/DataDog/rules_oci/pkg/credhelper,,,
-github.com/DataDog/rules_oci/pkg/deb2layer,,,
-github.com/DataDog/rules_oci/pkg/layer,,,
-github.com/DataDog/rules_oci/pkg/ociutil,,,
+github.com/DataDog/rules_oci/go/cmd/ocitool,,,
+github.com/DataDog/rules_oci/go/internal/flagutil,,,
+github.com/DataDog/rules_oci/go/internal/set,,,
+github.com/DataDog/rules_oci/go/internal/tarutil,,,
+github.com/DataDog/rules_oci/go/pkg/blob,,,
+github.com/DataDog/rules_oci/go/pkg/credhelper,,,
+github.com/DataDog/rules_oci/go/pkg/deb2layer,,,
+github.com/DataDog/rules_oci/go/pkg/layer,,,
+github.com/DataDog/rules_oci/go/pkg/ociutil,,,
 github.com/DataDog/rules_oci/release,,,
 github.com/DataDog/rules_oci/tests/go-multiarch-image,,,
 github.com/bazelbuild/bazel-gazelle,https://github.com/bazelbuild/bazel-gazelle,Apache-2.0,

README.md

@@ -12,8 +12,8 @@ manifests, image indexes (multi-arch images) and custom artifacts
 * **Multi-arch images**, compiling and building multi-arch images with a single Bazel invocation
 
 In addition to Bazel rules, we offer many helpers for interacting with OCI
-artifacts under the `pkg` directory and a CLI tool for creating new OCI
-artifacts.
+artifacts under the `go/pkg` directory and a CLI tool for creating new OCI
+artifacts. You can add the Go library as a dependency by running `go get github.com/DataDog/rules_oci/go@latest`.
 
 `rules_oci` makes an effort to support Docker media types, but there is no
 guarantee of long-term support. Most CRI support the OCI types or there are

WORKSPACE

@@ -13,10 +13,10 @@ http_archive(
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
+    sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
     ],
 )
 

go.mod

@@ -1,74 +1,3 @@
 module github.com/DataDog/rules_oci
 
 go 1.18
-
-require (
-	github.com/bazelbuild/bazel-gazelle v0.24.0
-	github.com/bazelbuild/buildtools v0.0.0-20211007154642-8dd79e56e98e
-	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
-	github.com/containerd/containerd v1.6.4
-	github.com/docker/docker-credential-helpers v0.6.4
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.1.0-rc2
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
-	github.com/urfave/cli/v2 v2.3.0
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	oras.land/oras-go v1.1.0
-)
-
-require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.5.1 // indirect
-	github.com/Microsoft/hcsshim v0.9.2 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/cgroups v1.0.3 // indirect
-	github.com/containerd/continuity v0.2.2 // indirect
-	github.com/containerd/fifo v1.0.0 // indirect
-	github.com/containerd/ttrpc v1.1.0 // indirect
-	github.com/containerd/typeurl v1.0.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/cli v20.10.11+incompatible // indirect
-	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/docker v20.10.11+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
-	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/gogo/googleapis v1.4.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.2.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/moby/locker v1.0.1 // indirect
-	github.com/moby/sys/mountinfo v0.5.0 // indirect
-	github.com/moby/sys/signal v0.6.0 // indirect
-	github.com/moby/term v0.0.0-20200312100748-672ec06f55cd // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/runc v1.1.1 // indirect
-	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
-	github.com/opencontainers/selinux v1.10.1 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.11.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.30.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.7 // indirect
-	google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
-	google.golang.org/grpc v1.43.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-)