cloudapi/v2: mark md5 signature as required in package metadata

Technically osbuild/osbuild-composer#4564 broke the api spec by marking
a required field as non-required. Fix this by using allOf.
This commit is contained in:
Sanne Raymaekers 2025-03-20 12:34:46 +01:00
parent d08cedf73b
commit 0b11dc6b59
4 changed files with 255 additions and 229 deletions

View file

@ -279,24 +279,28 @@ func TestStagesToPackageMetadata(t *testing.T) {
},
pkgs: []PackageMetadata{
{
Type: "rpm",
Name: "vim-minimal",
Version: "8.0.1763",
Release: "15.el8",
Epoch: common.ToPtr("2"),
Arch: "x86_64",
Sigmd5: common.ToPtr("v"),
Signature: common.ToPtr("v"),
PackageMetadataCommon: PackageMetadataCommon{
Type: "rpm",
Name: "vim-minimal",
Version: "8.0.1763",
Release: "15.el8",
Epoch: common.ToPtr("2"),
Arch: "x86_64",
Signature: common.ToPtr("v"),
},
Sigmd5: "v",
},
{
Type: "rpm",
Name: "unique",
Version: "1.90",
Release: "10",
Epoch: nil,
Arch: "aarch64",
Sigmd5: common.ToPtr("v"),
Signature: common.ToPtr("v"),
PackageMetadataCommon: PackageMetadataCommon{
Type: "rpm",
Name: "unique",
Version: "1.90",
Release: "10",
Epoch: nil,
Arch: "aarch64",
Signature: common.ToPtr("v"),
},
Sigmd5: "v",
},
},
},
@ -333,24 +337,28 @@ func TestStagesToPackageMetadata(t *testing.T) {
},
pkgs: []PackageMetadata{
{
Type: "rpm",
Name: "vim-minimal",
Version: "8.0.1763",
Release: "15.el8",
Epoch: common.ToPtr("2"),
Arch: "x86_64",
Sigmd5: common.ToPtr("v"),
Signature: common.ToPtr("v"),
PackageMetadataCommon: PackageMetadataCommon{
Type: "rpm",
Name: "vim-minimal",
Version: "8.0.1763",
Release: "15.el8",
Epoch: common.ToPtr("2"),
Arch: "x86_64",
Signature: common.ToPtr("v"),
},
Sigmd5: "v",
},
{
Type: "rpm",
Name: "unique",
Version: "1.90",
Release: "10",
Epoch: nil,
Arch: "aarch64",
Sigmd5: common.ToPtr("v"),
Signature: common.ToPtr("v"),
PackageMetadataCommon: PackageMetadataCommon{
Type: "rpm",
Name: "unique",
Version: "1.90",
Release: "10",
Epoch: nil,
Arch: "aarch64",
Signature: common.ToPtr("v"),
},
Sigmd5: "v",
},
},
},