From 83746c5f13ed7474b59499d6625da4185fba7e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
Date: Mon, 26 Oct 2020 15:23:12 +0100
Subject: [PATCH] osbuild/rpm: add sigpgp and siggpg keys to the metadata

This was introduced in osbuild 23, so we also need to bump the dependency
in the spec file and also the submodule.

The test is also modified and a typo in its name is fixed.
---
 internal/osbuild/result_test.go | 16 +++++++++++++---
 internal/osbuild/rpm_stage.go   |  2 ++
 osbuild                         |  2 +-
 osbuild-composer.spec           |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/internal/osbuild/result_test.go b/internal/osbuild/result_test.go
index 98fed411b..b64da6e3c 100644
--- a/internal/osbuild/result_test.go
+++ b/internal/osbuild/result_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestUnmarshall(t *testing.T) {
+func TestUnmarshal(t *testing.T) {
 	resultRaw := `{
 		"success": true,
 		"build": {
@@ -27,7 +27,9 @@ func TestUnmarshall(t *testing.T) {
 					"release": "0.11.fc32",
 					"epoch": null,
 					"arch": "x86_64",
-					"sigmd5": "84fc907a5047aeebaf8da1642925a417"
+					"sigmd5": "84fc907a5047aeebaf8da1642925a417",
+					"sigpgp": null,
+					"siggpg": "883f0305005f2310139ec3e4c0f7e257e611023e11009f639c5fe64abaa76224dab3a9f70c2714a84c63bd009d1cc184fb4b428dfcd7c3556f4a5f860cc0187740"
 				  },
 				  {
 					"name": "whois-nls",
@@ -35,7 +37,9 @@ func TestUnmarshall(t *testing.T) {
 					"release": "1.fc32",
 					"epoch": null,
 					"arch": "noarch",
-					"sigmd5": "f868cd02046630c8ce3a9c48820e2437"
+					"sigmd5": "f868cd02046630c8ce3a9c48820e2437",
+					"sigpgp": "89023304000108001d162104963a2beb02009608fe67ea4249fd77499570ff3105025f5a272b000a091049fd77499570ff31ccdb0ffe38b95a55ebf3c021526b3cd4f2358c7e23f7767d1f5ce4b7cccef7b33653c6a96a23022313a818fbaf7abeb41837910f0d3ac15664e02838d5939d38ff459aa0076e248728a032d3ae09ddfaec955f941601081a2e3f9bbd49586fd65c1bc1b31685aeb0405687d1791471eab7359ccf00d5584ddef680e99ebc8a4846316391b9baa68ac8ed8ad696ee16fd625d847f8edd92517df3ea6920a46b77b4f119715a0f619f38835d25e0bd0eb5cfad08cd9c796eace6a2b28f4d3dee552e6068255d9748dc2a1906c951e0ba8aed9922ab24e1f659413a06083f8a0bfea56cfff14bddef23bced449f36bcd369da72f90ddf0512e7b0801ba5a0c8eaa8eb0582c630815e992192042cfb0a7c7239f76219197c2fdf18b6553260c105280806d4f037d7b04bdf3da9fd7e9a207db5c71f7e548f4288928f047c989c4cb9cbb8088eec7bd2fa5c252e693f51a3cfc660f666af6a255a5ca0fd2216d5ccd66cbd9c11afa61067d7f615ec8d0dc0c879b5fe633d8c9443f97285da597e4da8a3993af36f0be06acfa9b8058ec70bbc78b876e4c6c5d2108fb05c15a74ba48a3d7ded697cbc1748c228d77d1e0794a41fd5240fa67c3ed745fe47555a47c3d6163d8ce95fd6c2d0d6fa48f8e5b411e571e442109b1cb200d9a8117ee08bfe645f96aca34f7b7559622bbab75143dcad59f126ae0d319e6668ebba417e725638c4febf2e",
+					"siggpg": null
 				  }
 				]
 			  }
@@ -58,6 +62,12 @@ func TestUnmarshall(t *testing.T) {
 	assert.Equal(t, package1.Release, "0.11.fc32")
 	assert.Equal(t, package1.Arch, "x86_64")
 	assert.Equal(t, package1.SigMD5, "84fc907a5047aeebaf8da1642925a417")
+	assert.Empty(t, package1.SigPGP)
+	assert.Equal(t, package1.SigGPG, "883f0305005f2310139ec3e4c0f7e257e611023e11009f639c5fe64abaa76224dab3a9f70c2714a84c63bd009d1cc184fb4b428dfcd7c3556f4a5f860cc0187740")
+
+	package2 := metadata.Packages[1]
+	assert.Equal(t, package2.SigPGP, "89023304000108001d162104963a2beb02009608fe67ea4249fd77499570ff3105025f5a272b000a091049fd77499570ff31ccdb0ffe38b95a55ebf3c021526b3cd4f2358c7e23f7767d1f5ce4b7cccef7b33653c6a96a23022313a818fbaf7abeb41837910f0d3ac15664e02838d5939d38ff459aa0076e248728a032d3ae09ddfaec955f941601081a2e3f9bbd49586fd65c1bc1b31685aeb0405687d1791471eab7359ccf00d5584ddef680e99ebc8a4846316391b9baa68ac8ed8ad696ee16fd625d847f8edd92517df3ea6920a46b77b4f119715a0f619f38835d25e0bd0eb5cfad08cd9c796eace6a2b28f4d3dee552e6068255d9748dc2a1906c951e0ba8aed9922ab24e1f659413a06083f8a0bfea56cfff14bddef23bced449f36bcd369da72f90ddf0512e7b0801ba5a0c8eaa8eb0582c630815e992192042cfb0a7c7239f76219197c2fdf18b6553260c105280806d4f037d7b04bdf3da9fd7e9a207db5c71f7e548f4288928f047c989c4cb9cbb8088eec7bd2fa5c252e693f51a3cfc660f666af6a255a5ca0fd2216d5ccd66cbd9c11afa61067d7f615ec8d0dc0c879b5fe633d8c9443f97285da597e4da8a3993af36f0be06acfa9b8058ec70bbc78b876e4c6c5d2108fb05c15a74ba48a3d7ded697cbc1748c228d77d1e0794a41fd5240fa67c3ed745fe47555a47c3d6163d8ce95fd6c2d0d6fa48f8e5b411e571e442109b1cb200d9a8117ee08bfe645f96aca34f7b7559622bbab75143dcad59f126ae0d319e6668ebba417e725638c4febf2e")
+	assert.Empty(t, package2.SigGPG)
 }
 
 func TestWriteFull(t *testing.T) {
diff --git a/internal/osbuild/rpm_stage.go b/internal/osbuild/rpm_stage.go
index b4979cf4d..0ed0a70af 100644
--- a/internal/osbuild/rpm_stage.go
+++ b/internal/osbuild/rpm_stage.go
@@ -42,6 +42,8 @@ type RPMPackageMetadata struct {
 	Epoch   *string `json:"epoch"`
 	Arch    string  `json:"arch"`
 	SigMD5  string  `json:"sigmd5"`
+	SigPGP  string  `json:"sigpgp"`
+	SigGPG  string  `json:"siggpg"`
 }
 
 func (RPMStageMetadata) isStageMetadata() {}
diff --git a/osbuild b/osbuild
index 7f249afe0..afafd4639 160000
--- a/osbuild
+++ b/osbuild
@@ -1 +1 @@
-Subproject commit 7f249afe07d6ae0cda08fbf439359ec99e78dd37
+Subproject commit afafd46393e1c106e79c2412dbb5c4e45a05eda8
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 1e1e01e27..1668efd1f 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -56,8 +56,8 @@ BuildRequires:  golang(github.com/vmware/govmomi)
 
 Requires: %{name}-worker = %{version}-%{release}
 Requires: systemd
-Requires: osbuild >= 18
-Requires: osbuild-ostree >= 18
+Requires: osbuild >= 23
+Requires: osbuild-ostree >= 23
 Requires: qemu-img
 
 Provides: weldr