switch to images/pkg/dnfjson and remove internal copy

COMPOSER-2068

.github/workflows/tests.yml

@@ -35,9 +35,6 @@ jobs:
       - name: Run unit tests
         run: go test -race -covermode=atomic -coverprofile=coverage.txt -coverpkg=$(go list ./... | grep -v rpmmd/test$ | tr "\n" ",") ./...
 
-      - name: Run dnfjson tests with force-dnf to make sure it's not skipped for any reason
-        run: go test -race ./internal/dnfjson/... -force-dnf
-
       - name: Send coverage to codecov.io
         run: bash <(curl -s https://codecov.io/bash)
 

Makefile

@@ -199,7 +199,6 @@ worker-key-pair: ca
 .PHONY: unit-tests
 unit-tests:
 	go test -race ./...
-	go test -race ./internal/dnfjson/... -force-dnf
 
 #
 # Building packages

cmd/gen-manifests/main.go

@@ -26,7 +26,7 @@ import (
 	"github.com/osbuild/images/pkg/rhsm/facts"
 	"github.com/osbuild/images/pkg/rpmmd"
 
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
+	"github.com/osbuild/images/pkg/dnfjson"
 )
 
 type multiValue []string
@@ -313,7 +313,7 @@ func resolvePipelineCommits(commitSources map[string][]ostree.SourceSpec) map[st
 
 func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, error) {
 	solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
-	solver.SetDNFJSONPath("./dnf-json")
+	solver.SetDNFJSONPath("/usr/libexec/osbuild-depsolve-dnf")
 	depsolvedSets := make(map[string][]rpmmd.PackageSpec)
 	for name, pkgSet := range packageSets {
 		res, err := solver.Depsolve(pkgSet)

cmd/mock-dnf-json/dnf-json.go

@@ -16,7 +16,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
+	"github.com/osbuild/images/pkg/dnfjson"
 )
 
 func maybeFail(err error) {

cmd/osbuild-composer/composer.go

@@ -22,10 +22,10 @@ import (
 	"github.com/osbuild/osbuild-composer/pkg/jobqueue/dbjobqueue"
 
 	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/auth"
 	"github.com/osbuild/osbuild-composer/internal/cloudapi"
 	v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
 	"github.com/osbuild/osbuild-composer/internal/weldr"
 	"github.com/osbuild/osbuild-composer/internal/worker"

cmd/osbuild-composer/config.go

@@ -114,7 +114,7 @@ func GetDefaultConfig() *ComposerConfigFile {
 		},
 		LogLevel:  "info",
 		LogFormat: "text",
-		DNFJson:   "/usr/libexec/osbuild-composer/dnf-json",
+		DNFJson:   "/usr/libexec/osbuild-depsolve-dnf",
 	}
 }
 

cmd/osbuild-dnf-json-tests/main_test.go

@@ -14,9 +14,9 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
 	rhel "github.com/osbuild/images/pkg/distro/rhel8"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/rpmmd"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 )
 
 // This test loads all the repositories available in /repositories directory

cmd/osbuild-pipeline/main.go

@@ -11,9 +11,9 @@ import (
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/osbuild-composer/internal/common"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 
 	"github.com/osbuild/images/pkg/rpmmd"
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
@@ -54,7 +54,7 @@ type composeRequest struct {
 // isn't installed.  This prioritises the local source version over the system
 // version if run from within the source tree.
 func findDnfJsonBin() string {
-	locations := []string{"./dnf-json", "/usr/libexec/osbuild-composer/dnf-json", "/usr/lib/osbuild-composer/dnf-json"}
+	locations := []string{"./dnf-json", "/usr/libexec/osbuild-depsolve-dnf", "/usr/lib/osbuild-depsolve-dnf"}
 	for _, djPath := range locations {
 		_, err := os.Stat(djPath)
 		if !os.IsNotExist(err) {

cmd/osbuild-playground/main.go

@@ -26,7 +26,7 @@ func AddImageType(img image.ImageKind) {
 // isn't installed.  This prioritises the local source version over the system
 // version if run from within the source tree.
 func findDnfJsonBin() string {
-	locations := []string{"./dnf-json", "/usr/libexec/osbuild-composer/dnf-json", "/usr/lib/osbuild-composer/dnf-json"}
+	locations := []string{"./dnf-json", "/usr/libexec/osbuild-depsolve-dnf", "/usr/lib/osbuild-depsolve-dnf"}
 	for _, djPath := range locations {
 		_, err := os.Stat(djPath)
 		if !os.IsNotExist(err) {

cmd/osbuild-playground/playground.go

@@ -7,11 +7,11 @@ import (
 	"path"
 
 	"github.com/osbuild/images/pkg/distro"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/image"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/rpmmd"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/runner"
 )
 

cmd/osbuild-store-dump/main.go

@@ -13,10 +13,10 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/rpmmd"
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/store"
 	"github.com/osbuild/osbuild-composer/internal/target"
 )

cmd/osbuild-worker/config_test.go

@@ -19,7 +19,7 @@ func Test_parseConfig(t *testing.T) {
 			config: `
 # comment
 base_path = "/api/image-builder-worker/v1"
-dnf-json = "/usr/libexec/dnf-json"
+dnf-json = "/usr/libexec/osbuild-depsolve-dnf"
 
 [composer]
 proxy = "http://proxy.example.com"
@@ -72,7 +72,7 @@ server_address = "https://example.com/pulp"
 `,
 			want: &workerConfig{
 				BasePath: "/api/image-builder-worker/v1",
-				DNFJson:  "/usr/libexec/dnf-json",
+				DNFJson:  "/usr/libexec/osbuild-depsolve-dnf",
 				Composer: &composerConfig{
 					Proxy: "http://proxy.example.com",
 				},

cmd/osbuild-worker/jobimpl-depsolve.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/rpmmd"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/worker"
 	"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
 )

cmd/osbuild-worker/main.go

@@ -20,8 +20,8 @@ import (
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/sirupsen/logrus"
 
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/common"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	"github.com/osbuild/osbuild-composer/internal/upload/azure"
 	"github.com/osbuild/osbuild-composer/internal/upload/koji"
 	"github.com/osbuild/osbuild-composer/internal/upload/oci"

distribution/Dockerfile-ubi

@@ -33,7 +33,6 @@ RUN mkdir -p "/usr/share/osbuild-composer/"
 RUN mkdir -p "/opt/migrate/"
 COPY --from=builder /opt/app-root/src/go/bin/osbuild-composer /usr/libexec/osbuild-composer/
 COPY ./containers/osbuild-composer/entrypoint.py /opt/entrypoint.py
-COPY ./dnf-json /usr/libexec/osbuild-composer/
 
 COPY ./pkg/jobqueue/dbjobqueue/schemas /opt/migrate/schemas
 COPY --from=builder2 /opt/app-root/src/go/bin/tern /opt/migrate/

distribution/Dockerfile-worker

@@ -21,6 +21,5 @@ RUN mkdir -p "/var/cache/osbuild-worker/"
 RUN mkdir -p "/var/lib/osbuild-composer/"
 RUN mkdir -p "/var/cache/osbuild-composer/output"
 COPY --from=builder /opt/app-root/src/go/bin/osbuild-worker /usr/libexec/osbuild-composer/
-COPY ./dnf-json /usr/libexec/osbuild-composer/
 
 ENTRYPOINT ["/usr/libexec/osbuild-composer/osbuild-worker"]

internal/client/unit_test.go

@@ -18,8 +18,8 @@ import (
 
 	"github.com/osbuild/images/pkg/distro/test_distro"
 	"github.com/osbuild/images/pkg/distroregistry"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/rpmmd"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 	dnfjson_mock "github.com/osbuild/osbuild-composer/internal/mocks/dnfjson"
 	rpmmd_mock "github.com/osbuild/osbuild-composer/internal/mocks/rpmmd"
 	"github.com/osbuild/osbuild-composer/internal/reporegistry"