feature/issue-345-bazel-build-go

.bazelversion

@@ -0,0 +1 @@
+8.3.1

.github/workflows/bazel.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6
+    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v7.2.3
     with:
       folders: '["bazel/test"]'
       exclude_windows: true

.github/workflows/integration-tests.yml

@@ -11,7 +11,7 @@ concurrency:
   # More info: https://stackoverflow.com/a/70972844/1261287
   group: ${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-  
+
 jobs:
   build:
     name: PR unit tests
@@ -20,21 +20,21 @@ jobs:
         os: [ubuntu-latest, macos-12]
       fail-fast: false
     runs-on: ${{ matrix.os }}
-    
+
     steps:
     - name: start docker
       if: ${{ matrix.os == 'macos-12' }}
       run: |
         brew install docker
         colima start
         echo "DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock" >> $GITHUB_ENV
-        
+
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
         go-version: ^1.22
       id: go
-    
+
     - uses: imjasonh/[email protected]
 
     - name: Check out code into the Go module directory
@@ -45,3 +45,9 @@ jobs:
     - name: Run tests
       run: |
         make test
+
+    # Ensure that Bazel build is maintained
+    - name: Bazel
+      run: |
+        bazel build //...
+        bazel test //...

BUILD.bazel

@@ -1,11 +1,14 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@gazelle//:def.bzl", "gazelle")
 
 # For stardoc to reference the file directly
 exports_files(["defs.bzl"])
 
 bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],
-    deps = ["//bazel:container_structure_test"],
     visibility = ["//visibility:public"],
+    deps = ["//bazel:container_structure_test"],
 )
+
+gazelle(name = "gazelle")

MODULE.bazel

@@ -1,15 +1,16 @@
 "Bazel module definition, see https://bazel.build/external/overview#bzlmod"
+
 module(
     name = "container_structure_test",
-    compatibility_level = 1,
     # Replaced dynamically when published
     version = "0.0.0",
+    compatibility_level = 1,
 )
 
 # To run jq
 bazel_dep(name = "aspect_bazel_lib", version = "1.28.0")
-bazel_dep(name = "bazel_skylib", version = "1.6.1")
-bazel_dep(name = "platforms", version = "0.0.9")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "0.0.11")
 
 ext = use_extension("//:repositories.bzl", "extension")
 use_repo(
@@ -18,13 +19,38 @@ use_repo(
     # For testing only
     "structure_test_st_darwin_amd64",
     "structure_test_st_darwin_arm64",
+    "structure_test_st_linux_amd64",
     "structure_test_st_linux_arm64",
     "structure_test_st_linux_s390x",
-    "structure_test_st_linux_amd64",
     "structure_test_st_windows_amd64",
 )
 
 register_toolchains("@structure_test_toolchains//:all")
 
-# 0.5.4 is the first version with bzlmod support
-bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
+
+bazel_dep(
+    name = "rules_go",
+    version = "0.50.1",
+)
+
+bazel_dep(name = "gazelle", version = "0.42.0")
+
+go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
+go_deps.from_file(go_mod = "//:go.mod")
+
+# All *direct* Go dependencies of the module have to be listed explicitly.
+use_repo(
+    go_deps,
+    "com_github_fsouza_go_dockerclient",
+    "com_github_google_go_cmp",
+    "com_github_google_go_containerregistry",
+    "com_github_joho_godotenv",
+    "com_github_moby_sys_sequential",
+    "com_github_opencontainers_image_spec",
+    "com_github_pkg_errors",
+    "com_github_sirupsen_logrus",
+    "com_github_spf13_cobra",
+    "in_gopkg_yaml_v2",
+    "org_golang_x_crypto",
+)

bazel/test/.bazelversion

@@ -1 +1 @@
-6.1.1
+8.3.1

cmd/container-structure-test/BUILD.bazel

@@ -0,0 +1,18 @@
+load("@rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "container-structure-test_lib",
+    srcs = ["container-structure-test.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//cmd/container-structure-test/app",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
+)
+
+go_binary(
+    name = "container-structure-test",
+    embed = [":container-structure-test_lib"],
+    visibility = ["//visibility:public"],
+)

cmd/container-structure-test/app/BUILD.bazel

@@ -0,0 +1,9 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "app",
+    srcs = ["container-structure-test.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test/app",
+    visibility = ["//cmd/container-structure-test:__pkg__"],
+    deps = ["//cmd/container-structure-test/app/cmd"],
+)

cmd/container-structure-test/app/cmd/BUILD.bazel

@@ -0,0 +1,31 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "cmd",
+    srcs = [
+        "cmd.go",
+        "test.go",
+        "version.go",
+    ],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test/app/cmd",
+    visibility = ["//cmd/container-structure-test/app:__pkg__"],
+    deps = [
+        "//cmd/container-structure-test/app/cmd/test",
+        "//cmd/container-structure-test/app/flags",
+        "//pkg/color",
+        "//pkg/config",
+        "//pkg/drivers",
+        "//pkg/output",
+        "//pkg/types/unversioned",
+        "//pkg/utils",
+        "//pkg/version",
+        "@com_github_fsouza_go_dockerclient//:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/name:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/daemon:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/layout:go_default_library",
+        "@com_github_opencontainers_image_spec//specs-go/v1:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+        "@com_github_spf13_cobra//:go_default_library",
+    ],
+)

cmd/container-structure-test/app/cmd/test/BUILD.bazel

@@ -0,0 +1,17 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "test",
+    srcs = ["util.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test/app/cmd/test",
+    visibility = ["//cmd/container-structure-test/app/cmd:__pkg__"],
+    deps = [
+        "//pkg/config",
+        "//pkg/drivers",
+        "//pkg/output",
+        "//pkg/types",
+        "//pkg/types/unversioned",
+        "@com_github_pkg_errors//:go_default_library",
+        "@in_gopkg_yaml_v2//:go_default_library",
+    ],
+)

cmd/container-structure-test/app/flags/BUILD.bazel

@@ -0,0 +1,9 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "flags",
+    srcs = ["template.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test/app/flags",
+    visibility = ["//cmd/container-structure-test/app/cmd:__pkg__"],
+    deps = ["@com_github_pkg_errors//:go_default_library"],
+)

internal/pkgutil/BUILD.bazel

@@ -0,0 +1,25 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "pkgutil",
+    srcs = [
+        "fs_utils.go",
+        "image_utils.go",
+        "tar_utils.go",
+        "transport_builder.go",
+    ],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/internal/pkgutil",
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@com_github_google_go_containerregistry//pkg/authn:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/name:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/daemon:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/mutate:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/remote:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/tarball:go_default_library",
+        "@com_github_moby_sys_sequential//:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
+)

pkg/color/BUILD.bazel

@@ -0,0 +1,16 @@
+load("@rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "color",
+    srcs = ["formatter.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/color",
+    visibility = ["//visibility:public"],
+    deps = ["@org_golang_x_crypto//ssh/terminal:go_default_library"],
+)
+
+go_test(
+    name = "color_test",
+    srcs = ["formatter_test.go"],
+    embed = [":color"],
+    deps = ["//testutil"],
+)

pkg/config/BUILD.bazel

@@ -0,0 +1,9 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "config",
+    srcs = ["options.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/config",
+    visibility = ["//visibility:public"],
+    deps = ["//pkg/types/unversioned"],
+)

pkg/drivers/BUILD.bazel

@@ -0,0 +1,24 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "drivers",
+    srcs = [
+        "docker_driver.go",
+        "driver.go",
+        "host_driver.go",
+        "tar_driver.go",
+    ],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/drivers",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//internal/pkgutil",
+        "//pkg/types/unversioned",
+        "//pkg/utils",
+        "@com_github_fsouza_go_dockerclient//:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1:go_default_library",
+        "@com_github_google_go_containerregistry//pkg/v1/mutate:go_default_library",
+        "@com_github_joho_godotenv//:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
+)

pkg/output/BUILD.bazel

@@ -0,0 +1,20 @@
+load("@rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "output",
+    srcs = ["output.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/output",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/color",
+        "//pkg/types/unversioned",
+        "@com_github_pkg_errors//:go_default_library",
+    ],
+)
+
+go_test(
+    name = "output_test",
+    srcs = ["output_test.go"],
+    embed = [":output"],
+    deps = ["//pkg/types/unversioned"],
+)

pkg/types/BUILD.bazel

@@ -0,0 +1,13 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "types",
+    srcs = ["types.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/types",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/drivers",
+        "//pkg/types/v1",
+        "//pkg/types/v2",
+    ],
+)

pkg/types/unversioned/BUILD.bazel

@@ -0,0 +1,8 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "unversioned",
+    srcs = ["types.go"],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/types/unversioned",
+    visibility = ["//visibility:public"],
+)

pkg/types/v1/BUILD.bazel

@@ -0,0 +1,21 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "v1",
+    srcs = [
+        "command.go",
+        "file_content.go",
+        "file_existence.go",
+        "licenses.go",
+        "structure.go",
+    ],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/types/v1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/drivers",
+        "//pkg/types/unversioned",
+        "//pkg/utils",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
+)

pkg/types/v2/BUILD.bazel

@@ -0,0 +1,22 @@
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "v2",
+    srcs = [
+        "command.go",
+        "file_content.go",
+        "file_existence.go",
+        "licenses.go",
+        "metadata.go",
+        "structure.go",
+    ],
+    importpath = "github.com/GoogleContainerTools/container-structure-test/pkg/types/v2",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/drivers",
+        "//pkg/types/unversioned",
+        "//pkg/utils",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
+)