switch to images/pkg/dnfjson and remove internal copy

COMPOSER-2068
osbuild · Feb 12, 2024 · ac18eab · ac18eab
1 parent 5054aa2
commit ac18eab
Show file tree

Hide file tree

Showing 22 changed files with 113 additions and 1,150 deletions.
diff --git a/.github/workflows/tests.yml b/.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)
 

diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go
@@ -27,7 +27,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
@@ -323,7 +323,6 @@ 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")
 	depsolvedSets := make(map[string][]rpmmd.PackageSpec)
 	for name, pkgSet := range packageSets {
 		res, err := solver.Depsolve(pkgSet)

diff --git a/cmd/mock-dnf-json/dnf-json.go b/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) {

diff --git a/cmd/osbuild-composer/composer.go b/cmd/osbuild-composer/composer.go
@@ -22,10 +22,10 @@ import (
 	"github.com/osbuild/osbuild-composer/pkg/jobqueue/dbjobqueue"
 
 	"github.com/osbuild/images/pkg/distrofactory"
+	"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"

diff --git a/cmd/osbuild-composer/config.go b/cmd/osbuild-composer/config.go
@@ -125,7 +125,7 @@ func GetDefaultConfig() *ComposerConfigFile {
 		},
 		LogLevel:  "info",
 		LogFormat: "text",
-		DNFJson:   "/usr/libexec/osbuild-composer/dnf-json",
+		DNFJson:   "/usr/libexec/osbuild-depsolve-dnf",
 	}
 }
 

diff --git a/cmd/osbuild-dnf-json-tests/main_test.go b/cmd/osbuild-dnf-json-tests/main_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/rhel9"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/ostree"
 	"github.com/osbuild/images/pkg/reporegistry"
 	"github.com/osbuild/images/pkg/rpmmd"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
 )
 
 // This test loads all the repositories available in /repositories directory

diff --git a/cmd/osbuild-store-dump/main.go b/cmd/osbuild-store-dump/main.go
@@ -13,11 +13,11 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distrofactory"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/reporegistry"
 	"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"
 )

diff --git a/cmd/osbuild-worker/config_test.go b/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",
 				},

diff --git a/cmd/osbuild-worker/jobimpl-depsolve.go b/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"
 )

diff --git a/cmd/osbuild-worker/main.go b/cmd/osbuild-worker/main.go
@@ -21,7 +21,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/osbuild/images/pkg/arch"
-	"github.com/osbuild/osbuild-composer/internal/dnfjson"
+	"github.com/osbuild/images/pkg/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"

diff --git a/distribution/Dockerfile-ubi b/distribution/Dockerfile-ubi
@@ -36,7 +36,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/

diff --git a/distribution/Dockerfile-worker b/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"]
diff --git a/internal/client/unit_test.go b/internal/client/unit_test.go
@@ -17,9 +17,9 @@ import (
 	"testing"
 
 	"github.com/osbuild/images/pkg/distro/test_distro"
+	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/reporegistry"
 	"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/weldr"