Merge pull request #98 from kellyma2/cleanup-bzlmod

Clean up use of WORKSPACE.bzlmod so we can move fully to bzlmod

Author: kellyma2

.github/workflows/action.yml

@@ -66,7 +66,7 @@ jobs:
   e2e-bzlmod-matrix:
     strategy:
       matrix:
-        version: [6.x, 7.x]
+        version: [7.x]
         path:
           - bazel-bzlmod
           - bazel-bzlmod-non-legacy-mode
@@ -93,8 +93,6 @@ jobs:
     strategy:
       matrix:
         config:
-          - version: 6.x
-            flags:
           - version: 7.x
             flags: --incompatible_enable_proto_toolchain_resolution
 

BUILD.bazel

@@ -57,8 +57,8 @@ bazeldnf(
 rpmtree(
     name = "something",
     rpms = [
-        "@libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
-        "@libvirt-devel-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bazeldnf_internal_libvirt-libs//rpm",
+        "@bazeldnf_internal_libvirt-devel//rpm",
     ],
 )
 
@@ -107,10 +107,3 @@ bzl_library(
         "@bazeldnf//bazeldnf:deps",
     ],
 )
-
-bzl_library(
-    name = "test_deps",
-    srcs = ["test_deps.bzl"],
-    visibility = ["//visibility:public"],
-    deps = ["@bazeldnf//bazeldnf:defs"],
-)

MODULE.bazel

@@ -8,7 +8,34 @@ module(
 
 bazeldnf = use_extension("//bazeldnf:extensions.bzl", "bazeldnf")
 bazeldnf.toolchain()
-use_repo(bazeldnf, "bazeldnf_toolchains")
+bazeldnf.rpm(
+    name = "bazeldnf_internal_abseil-cpp-devel",
+    sha256 = "1393c28f5a3f3029769bbe3436b3eec58c7b11761c4ad6695c309b21474d9804",
+    urls = [
+        "https://kojipkgs.fedoraproject.org//packages/abseil-cpp/20240722.1/1.fc42/x86_64/abseil-cpp-devel-20240722.1-1.fc42.x86_64.rpm",
+    ],
+)
+bazeldnf.rpm(
+    name = "bazeldnf_internal_libvirt-devel",
+    sha256 = "dba37bbe57903afe49b5666f1781eb50001baa81af4584b355db0b6a2afad9fa",
+    urls = [
+        "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    ],
+)
+bazeldnf.rpm(
+    name = "bazeldnf_internal_libvirt-libs",
+    sha256 = "aac272a2ace134b5ef60a41e6624deb24331e79c76699ef6cef0dca22d94ac7e",
+    urls = [
+        "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    ],
+)
+use_repo(
+    bazeldnf,
+    "bazeldnf_internal_abseil-cpp-devel",
+    "bazeldnf_internal_libvirt-devel",
+    "bazeldnf_internal_libvirt-libs",
+    "bazeldnf_toolchains",
+)
 
 # registers toolchain for consumers of the repo
 register_toolchains("@bazeldnf_toolchains//:all")
@@ -18,8 +45,11 @@ bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "bazel_features", version = "1.14.0")
 
 # dependenices for building bazeldnf
-bazel_dep(name = "gazelle", version = "0.41.0")
-bazel_dep(name = "rules_go", version = "0.51.0")
+bazel_dep(name = "gazelle", version = "0.42.0")
+bazel_dep(name = "rules_go", version = "0.52.0")
+
+bazel_dep(name = "protobuf", version = "27.3", dev_dependency = True)
+bazel_dep(name = "toolchains_protoc", version = "0.3.2", dev_dependency = True)
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
@@ -42,11 +72,17 @@ bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependenc
 bazel_dep(name = "aspect_bazel_lib", version = "2.8.1", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
-bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
 bazel_dep(name = "rules_proto", version = "6.0.0", dev_dependency = True)
 bazel_dep(name = "rules_java", version = "7.9.0", dev_dependency = True)
-bazel_dep(name = "protobuf", version = "27.3", dev_dependency = True)
-bazel_dep(name = "toolchains_protoc", version = "0.3.2", dev_dependency = True)
+
+http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
+
+http_jar(
+    name = "protobuf-java",
+    integrity = "sha256-0C+GOpCj/8d9Xu7AMcGOV58wx8uY8/OoFP6LiMQ9O8g=",
+    urls = ["https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/4.27.3/protobuf-java-4.27.3.jar"],
+)
 
 register_toolchains(
     "//tools/toolchains:all",

WORKSPACE.bzlmod

@@ -3,6 +3,22 @@ local_repository(
     path = "../../",
 )
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
+    ],
+)
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()
+
+load("@bazeldnf//bazeldnf:defs.bzl", "rpm")
 load(
     "@bazeldnf//bazeldnf:repositories.bzl",
     "bazeldnf_dependencies",
@@ -15,12 +31,21 @@ bazeldnf_register_toolchains(
     name = "bazeldnf_prebuilt",
 )
 
-# dependencies for integration tests
-load("@bazeldnf//:test_deps.bzl", "bazeldnf_test_dependencies")
-
-bazeldnf_test_dependencies()
+rpm(
+    name = "libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    sha256 = "dba37bbe57903afe49b5666f1781eb50001baa81af4584b355db0b6a2afad9fa",
+    urls = [
+        "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-devel-11.0.0-1.fc42.x86_64.rpm",
+    ],
+)
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+rpm(
+    name = "libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    sha256 = "aac272a2ace134b5ef60a41e6624deb24331e79c76699ef6cef0dca22d94ac7e",
+    urls = [
+        "https://kojipkgs.fedoraproject.org//packages/libvirt/11.0.0/1.fc42/x86_64/libvirt-libs-11.0.0-1.fc42.x86_64.rpm",
+    ],
+)
 
 http_archive(
     name = "rules_pkg",

e2e/bazel-workspace/WORKSPACE

@@ -15,9 +15,11 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
+require github.com/bazelbuild/rules_go v0.52.0
+
 require (
 	github.com/adrg/xdg v0.5.3
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.11.1 // indirect

go.mod

@@ -1,9 +1,9 @@
 github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
 github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
-github.com/bazelbuild/buildtools v0.0.0-20240823132350-3488089d3661 h1:acJJwAuD2t36RHnvxf3oh9lhg5LISUYXunx+om2ONZw=
-github.com/bazelbuild/buildtools v0.0.0-20240823132350-3488089d3661/go.mod h1:yBQGNvRAGhcBTxe4MHiW3Ul7DwoBim4XsKUaXnW1LWc=
 github.com/bazelbuild/buildtools v0.0.0-20250110114635-13fa61383b99 h1:3Wvirn7fGxAk5XMO5OV9goElw2ZKya/erxxHChPSPQM=
 github.com/bazelbuild/buildtools v0.0.0-20250110114635-13fa61383b99/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
+github.com/bazelbuild/rules_go v0.52.0 h1:+ozpngVAW67pCAwfhepaXSSrG3yHcj8K9hNAxSYBno4=
+github.com/bazelbuild/rules_go v0.52.0/go.mod h1:M+YrupNArA7OiTlv++rFUgQ6Sm+ZXbQ5HPUj0cGa0us=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/crillab/gophersat v1.4.0 h1:irf9ajKmNnEURjgPU4oz+ouqIXXLQ59ZNd3NC+hULMc=
 github.com/crillab/gophersat v1.4.0/go.mod h1:gDzeMEBrqJR20IL9JW25tFHNGLU5+GDeJzr0zpi3mxs=
@@ -15,8 +15,8 @@ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -43,9 +43,9 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -65,9 +65,8 @@ golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

go.sum

@@ -25,12 +25,13 @@ go_test(
         "tar_test.go",
     ],
     data = [
-        "@abseil-cpp-devel-20240722.1-1.fc42.x86_64.rpm//rpm",
-        "@libvirt-libs-11.0.0-1.fc42.x86_64.rpm//rpm",
+        "@bazeldnf_internal_abseil-cpp-devel//rpm",
+        "@bazeldnf_internal_libvirt-libs//rpm",
     ],
     embed = [":rpm"],
     deps = [
         "//pkg/api",
         "@com_github_onsi_gomega//:gomega",
+        "@rules_go//go/runfiles",
     ],
 )

pkg/rpm/BUILD.bazel

@@ -8,10 +8,16 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/bazelbuild/rules_go/go/runfiles"
 	. "github.com/onsi/gomega"
 )
 
 func TestRPMToTar(t *testing.T) {
+	libvirtLibsRpm, err := runfiles.Rlocation("bazeldnf_internal_libvirt-libs/rpm/downloaded")
+	if err != nil {
+		panic(err)
+	}
+
 	tests := []struct {
 		name            string
 		rpm             string
@@ -23,7 +29,7 @@ func TestRPMToTar(t *testing.T) {
 	}{
 		{
 			name:    "should convert a RPM to tar and keep all entries",
-			rpm:     filepath.Join(os.Getenv("TEST_SRCDIR"), "libvirt-libs-11.0.0-1.fc42.x86_64.rpm/rpm/downloaded"),
+			rpm:     libvirtLibsRpm,
 			wantErr: false,
 			expectedHeaders: []*tar.Header{
 				{Name: "./etc/libvirt/libvirt-admin.conf", Size: 450, Mode: 33188},
@@ -83,6 +89,16 @@ func TestRPMToTar(t *testing.T) {
 }
 
 func TestTar2Files(t *testing.T) {
+	abseilCppDevelRpm, err := runfiles.Rlocation("bazeldnf_internal_abseil-cpp-devel/rpm/downloaded")
+	if err != nil {
+		panic(err)
+	}
+
+	libvirtLibsRpm, err := runfiles.Rlocation("bazeldnf_internal_libvirt-libs/rpm/downloaded")
+	if err != nil {
+		panic(err)
+	}
+
 	tests := []struct {
 		name     string
 		rpm      string
@@ -93,7 +109,7 @@ func TestTar2Files(t *testing.T) {
 	}{
 		{
 			name:    "should extract a symlink from a tar archive",
-			rpm:     filepath.Join(os.Getenv("TEST_SRCDIR"), "libvirt-libs-11.0.0-1.fc42.x86_64.rpm/rpm/downloaded"),
+			rpm:     libvirtLibsRpm,
 			wantErr: false,
 			files:   []string{"/usr/lib64/libvirt.so.0"},
 			expected: []fileInfo{
@@ -107,7 +123,7 @@ func TestTar2Files(t *testing.T) {
 		},
 		{
 			name:    "should extract multiple files from a tar archive",
-			rpm:     filepath.Join(os.Getenv("TEST_SRCDIR"), "libvirt-libs-11.0.0-1.fc42.x86_64.rpm/rpm/downloaded"),
+			rpm:     libvirtLibsRpm,
 			wantErr: false,
 			files: []string{
 				"/etc/libvirt/libvirt-admin.conf",
@@ -125,7 +141,7 @@ func TestTar2Files(t *testing.T) {
 		},
 		{
 			name:    "should extract multiple files with the same name from a tar archive",
-			rpm:     filepath.Join(os.Getenv("TEST_SRCDIR"), "abseil-cpp-devel-20240722.1-1.fc42.x86_64.rpm/rpm/downloaded"),
+			rpm:     abseilCppDevelRpm,
 			wantErr: false,
 			files: []string{
 				"/usr/include/absl/log/globals.h",