cmd-cloud-prune: Refactor build parsing logic and remove unused vars

Author: gursewak1997

src/cmd-cloud-prune

@@ -49,7 +49,7 @@ from cosalib.gcp import remove_gcp_image
 from cosalib.aws import deregister_aws_resource
 from cosalib.builds import BUILDFILES
 from cosalib.s3 import s3_copy
-from cosalib.cmdlib import parse_fcos_version_to_timestamp_and_stream
+from cosalib.cmdlib import parse_fcos_version_to_timestamp
 from cosalib.cmdlib import convert_duration_to_days
 
 Build = collections.namedtuple("Build", ["id", "images", "arch", "meta_json"])
@@ -61,8 +61,6 @@ CACHE_MAX_AGE_METADATA = 60 * 5
 # is up to date.
 SUPPORTED = ["amis", "gcp"]
 UNSUPPORTED = ["aliyun", "azure", "ibmcloud", "powervs"]
-# list of known streams with containers
-STREAMS = {"next", "testing", "stable", "next-devel", "testing-devel", "rawhide", "branched"}
 
 
 def parse_args():
@@ -126,7 +124,7 @@ def main():
     # Iterate through builds from oldest to newest
     for build in reversed(builds):
         build_id = build["id"]
-        build_date, _ = parse_fcos_version_to_timestamp_and_stream(build_id)
+        build_date = parse_fcos_version_to_timestamp(build_id)
 
         # For each build, iterate over arches first to minimize downloads of meta.json per arch
         for arch in build["arches"]:

src/cosalib/cmdlib.py

@@ -339,7 +339,7 @@ def get_basearch():
         return get_basearch.saved
 
 
-def parse_fcos_version_to_timestamp_and_stream(version):
+def parse_fcos_version_to_timestamp(version):
     '''
     Parses an FCOS build ID and verifies the versioning is accurate. Then
     it verifies that the parsed timestamp has %Y%m%d format and returns that.
@@ -351,7 +351,7 @@ def parse_fcos_version_to_timestamp_and_stream(version):
         timestamp = datetime.datetime.strptime(m.group(2), '%Y%m%d')
     except ValueError:
         raise Exception(f"FCOS build {version} has incorrect date format. It should be in (%Y%m%d)")
-    return (timestamp, m.group(3))
+    return timestamp
 
 
 def convert_duration_to_days(duration_arg):