diff --git a/.gitignore b/.gitignore index de762f4..62ae47b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /weldr-client-35.14.tar.gz.asc /weldr-client-36.0.tar.gz /weldr-client-36.0.tar.gz.asc +/weldr-client-36.1.tar.gz +/weldr-client-36.1.tar.gz.asc diff --git a/0001-tests-Skip-checking-arch-when-testing-sent-body.patch b/0001-tests-Skip-checking-arch-when-testing-sent-body.patch deleted file mode 100644 index affb1aa..0000000 --- a/0001-tests-Skip-checking-arch-when-testing-sent-body.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6815aa4a2a0b2bd376d0f6e072580a9c60086e3e Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" -Date: Thu, 14 Aug 2025 09:26:25 -0700 -Subject: [PATCH] tests: Skip checking arch when testing sent body - -The host architecture is included in the body of the request, skip -checking for the specific arch in order to keep the tests architecture -independent. - -Related: RHEL-60137 ---- - cmd/composer-cli/projects/info_test.go | 4 +++- - cmd/composer-cli/projects/list_test.go | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmd/composer-cli/projects/info_test.go b/cmd/composer-cli/projects/info_test.go -index 3f9a85f..dd2a78c 100644 ---- a/cmd/composer-cli/projects/info_test.go -+++ b/cmd/composer-cli/projects/info_test.go -@@ -457,7 +457,9 @@ func TestCmdProjectsInfoCloud(t *testing.T) { - sentBody, err := io.ReadAll(mcc.Req.Body) - assert.Nil(t, mcc.Req.Body.Close()) - require.Nil(t, err) -- assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["tmux"]}`) -+ // NOTE: sentBody also contains arch specific architecture, skip checking that. -+ assert.Contains(t, string(sentBody), `"distribution":"homer"`) -+ assert.Contains(t, string(sentBody), `"packages":["tmux"]`) - assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type")) - assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path) - } -diff --git a/cmd/composer-cli/projects/list_test.go b/cmd/composer-cli/projects/list_test.go -index b809224..386b793 100644 ---- a/cmd/composer-cli/projects/list_test.go -+++ b/cmd/composer-cli/projects/list_test.go -@@ -363,7 +363,9 @@ func TestCmdProjectsListCloud(t *testing.T) { - sentBody, err := io.ReadAll(mcc.Req.Body) - assert.Nil(t, mcc.Req.Body.Close()) - require.Nil(t, err) -- assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["*"]}`) -+ // NOTE: sentBody also contains arch specific architecture, skip checking that. -+ assert.Contains(t, string(sentBody), `"distribution":"homer"`) -+ assert.Contains(t, string(sentBody), `"packages":["*"]`) - assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type")) - assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path) - } --- -2.50.1 - diff --git a/sources b/sources index 7ba8ab8..9a05ef2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (weldr-client-36.0.tar.gz) = 4d81db98b61c3a795af7b1b9a917e71b7c8e2f7c2e7d620771ba7c1c4f7a89b78e3d7802d98f0cfbfe7621ea1eeb06a01b0e6217a20f3b182237e941d283a135 -SHA512 (weldr-client-36.0.tar.gz.asc) = 674054a6c2d4e33d72fdf301de5bf5e8d9c380bbf2f10660337f287f2b18b1cd53aada8e30264bbf29040c69b50997b22de9a9815dc8d2fbf0832bd935aa2c5e -SHA512 (gpg-117E8C168EFE3A7F.key) = 71334857bad76d3ae4ac7f7def6e41a2830bbed85462c974a00c27998abdf03ce07bdab2574fb99cd5aab0041b48e673565b9f2bf4f7a467bc835b084a6e848e +SHA512 (weldr-client-36.1.tar.gz) = 52bac9879b73e3137d434a9c46a2914e0446ed63db14c9176cbd2a47aaf10a757a905a138401208958631237d354a7689035fd5a68297720431b212151eabd4d +SHA512 (weldr-client-36.1.tar.gz.asc) = 0d0fd65355356aaac2eb8052c182f619d8d7da5c6af164d7b3da97b2fc0b4435d6e4cff2b81914e99e8f094a518432dd0b769e28fba4c90b8a9453326d6b3f1a +SHA512 (gpg-117E8C168EFE3A7F.key) = cbbf218fe4427bd16f64b60cafd8c98bc3b073c25cfe2c19f03405ebfbf88ac05f0a3fa4e44afbbc514616b426008bc1e76b4e3ea49825a6ece4ad63638bb52b diff --git a/weldr-client.spec b/weldr-client.spec index b9bbadb..937e157 100644 --- a/weldr-client.spec +++ b/weldr-client.spec @@ -6,8 +6,8 @@ %global goipath github.com/osbuild/weldr-client/v2 Name: weldr-client -Version: 36.0 -Release: 2%{?dist} +Version: 36.1 +Release: 1%{?dist} # Upstream license specification: Apache-2.0 License: Apache-2.0 Summary: Command line utility to control osbuild-composer @@ -38,7 +38,6 @@ BuildRequires: git-core BuildRequires: make BuildRequires: gnupg2 -Patch0001: 0001-tests-Skip-checking-arch-when-testing-sent-body.patch %description Command line utility to control osbuild-composer @@ -51,7 +50,6 @@ Command line utility to control osbuild-composer %forgeautosetup -p1 %else %goprep -%autopatch -p1 %endif %build @@ -132,90 +130,12 @@ composer-cli package. %changelog -* Fri Aug 15 2025 Maxwell G - 36.0-2 -- Rebuild for golang-1.25.0 - -* Thu Aug 14 2025 Brian C. Lane - 36.0-1 -- tests: Skip checking arch when testing sent body -- New release: 36.0 (bcl) -- golangci: Disable linting for a few things (bcl) -- test: Remove unneeded fmt.Sprintf (bcl) -- lint: Clean up lint errcheck errors (bcl) -- workflows: Update to golangci-lint 2.3.0 (bcl) -- workflows: Update to use go 1.23 and drop 1.21 and 1.22 (bcl) -- GHA: enable the stale action to delete its saved state (thozza) -- composer-cli: Add cloudapi support to delete command (bcl) -- cloud: Add DeleteCompose function and tests (bcl) -- cloud: Add DeleteRaw function and tests (bcl) -- tests: Fix TestComposeInfoCloud (bcl) -- cloud: Handle unexpected status codes (bcl) -- composer-cli: Add cloudapi support to compose image command (bcl) -- cloud: Add ComposeImagePath function (bcl) -- cloud: Add GetFilePath function to download an image file (bcl) -- common: Move part of GetFilePath into common.SaveResponseBodyToFile (bcl) -- composer-cli: Add size to the compose status cloud command (bcl) -- composer-cli: Add support for more cloudapi detail to compose list (bcl) -- composer-cli: Add cloudapi support to the compose info command (bcl) -- apischema: Add UploadTypes function to ComposeMetadataV1 (bcl) -- cloud: Add GetComposeMetadata function (bcl) -- common: Move blueprint struct to common (bcl) -- cloud: Move status mapping into a function (bcl) -- apischema: Move ComposeResponseV1 to apischema (bcl) -- apischema: Move Status to apischema (bcl) -- apischema: Move PackageDetails to apischema (bcl) -- apischema: Move ComposeInfo to apischema (bcl) -- apischema: Add a common location to define cloudapi structs (bcl) -- build(deps): bump github.com/BurntSushi/toml from 1.4.0 to 1.5.0 (49699333+dependabot[bot]) -- compose: Add listing cloud composes to the status command (bcl) -- compose: Add listing cloud composes to the list command (bcl) -- cloud: Add test for ListComposes (bcl) -- cloud: Implement ListComposes to return cloudapi compose info (bcl) -- projects: Add cloudapi support to depsolve command (bcl) -- blueprints: Add cloudapi support for depsolving local blueprint files (bcl) -- cloud: Add DepsolveBlueprint function (bcl) -- depsolve: Move parsing of weldr response into apischema (bcl) -- depsolve: Use common.PackageNEVRA (bcl) -- README.md: align with image-builder-cli (florian.schueller) -- projects: Add cloudapi support to the list command (bcl) -- projects: Add cloudapi support for project info command (bcl) -- cloud: Add SearchPackages function (bcl) -- composer-cli: Add a --weldr-only flag (bcl) -- tests: OSTree does not support the qcow2 image type (bcl) -- compose: Add cloudapi support to the compose types command (bcl) -- cloud: Add ComposeTypes function to return image types (bcl) -- common: Add SortedMapKeys helper (bcl) -- distros: Add cloudapi support to the list command (bcl) -- cloud: Add test for ListDistros (bcl) -- cloud: Add ListDistros function to return distro names (bcl) -- github/workflows/pr_best_practices: initial version (florian.schueller) -- common: PackageNEVRA JSON epoch field can be string or int (bcl) -- common: Move PackageNEVRA to common (bcl) -- common: Move GetHostDistroName to common (bcl) -- common: Refactor GetContentFilename (bcl) -- common: Refactor cloud common to use internal common functions (bcl) -- common: Create a common package to share functions (bcl) -- weldr: Function to check APIResponse for an error ID (bcl) -- build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (49699333+dependabot[bot]) -- cloud: Make the test bool private (bcl) -- compose: Return an error when opening a file (bcl) -- cloud: Add tests for ComposeWait function (bcl) -- compose: Add cloud API --wait to start command (bcl) -- compose: Add support for cloud API UUIDs to compose wait (bcl) -- cloud: Add ComposeWait function (bcl) -- cloud: Add test for ComposeInfo (bcl) -- cloud: Add ComposeInfo function (bcl) -- compose: Remove redundant 'Error' from error strings in start (bcl) -- compose: Add upload handling for cloud (bcl) -- cloud: Add support for passing upload options (bcl) -- compose: Add ability to use a local blueprint to start a compose (bcl) -- cloud: Add StartCompose function (bcl) -- cloud: Add ServerStatus function (bcl) -- status: Add cloudapi status to show command (bcl) -- Makefile: Pass VERSION into build container (bcl) -- cmd: Add cloudapi client (bcl) -- cloud: Add basic Client functions for cloud api (bcl) -- go.mod: Upgrade modules to current versions (bcl) -- go.mod: Bump go version to 1.22.6 (bcl) -- tools: Use go toolbox in prepare-source.sh (bcl) -- Fix non-constant log strings (bcl) -- Bump testify version to 1.10.0 (bcl) +* Fri Oct 31 2025 Brian C. Lane - 36.1-1 +- New release: 36.1 (bcl) +- build(deps): bump actions/setup-go from 5 to 6 (49699333+dependabot[bot]) +- build(deps): bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (49699333+dependabot[bot]) +- test: iot-qcow2-image does not support packages (bcl) +- test: qcow2 renamed to server-qcow2 (bcl) +- build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (49699333+dependabot[bot]) +- build(deps): bump actions/checkout from 4 to 5 (49699333+dependabot[bot]) +- tests: Use current host arch in info and list tests (bcl)