From cb6a659c7961a29ee07f8cd635eb56ff6ed3046b Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: May 28 2020 15:58:28 +0000
Subject: coreos: drop requirement on stream key


RoboSignatory actually doesn't need to know the stream being signed at
all. I think the original rationale for this was so that we could tell
which stream was being signed for informational purposes. Nowadays: (1)
RoboSignatory returns all the keys in the request message in its
response, (2) FCOS stream information is encoded in the version ID
already, and (3) we're going to add idempotency request ID tokens to
track individual requests.

Signed-off-by: Jonathan Lebon <jonathan@jlebon.com>

---

diff --git a/robosignatory/coreos.py b/robosignatory/coreos.py
index 9453c93..11a367e 100644
--- a/robosignatory/coreos.py
+++ b/robosignatory/coreos.py
@@ -46,7 +46,7 @@ class CoreOSSigner(object):
         # https://github.com/coreos/fedora-coreos-tracker/issues/198#issuecomment-513944390
         log.info(
             'CoreOS wants to sign '
-            '%(build_id)s on %(stream)s for %(basearch)s' % msg.body
+            '%(build_id)s for %(basearch)s' % msg.body
         )
         key = self.get_key(msg)
 
diff --git a/tests/test_coreos.py b/tests/test_coreos.py
index 1a4af34..84b9cc3 100644
--- a/tests/test_coreos.py
+++ b/tests/test_coreos.py
@@ -32,7 +32,6 @@ ARTIFACTS_MESSAGE = Message(
     topic="org.fedoraproject.prod.coreos.build.request.artifacts-sign",
     body={
         "build_id": "buildid",
-        "stream": "stream",
         "basearch": "basearch",
         "artifacts": [{
             "file": "s3://host/some/path/test1",
@@ -45,7 +44,6 @@ OSTREE_MESSAGE = Message(
     topic="org.fedoraproject.prod.coreos.build.request.ostree-sign",
     body={
         "build_id": "buildid",
-        "stream": "stream",
         "basearch": "basearch",
         "commit_object": "s3://host/some/path/test1",
         "checksum": "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",