Change cmd-buildupload to add S3 metadata

 - This change is needed due brew/compliance improvements where we need
to keep more information about where the artifacts are archived;
 - Add --meta parameter in order to update meta.json with
bucket, prefix and url information used in S3 upload.

More information: coreos#2739

Signed-off-by: Renata Ravanelli <[email protected]>

Author: ravanelli

src/cmd-buildupload

@@ -22,12 +22,16 @@ CACHE_MAX_AGE_ARTIFACT = 60 * 60 * 24 * 365
 # set metadata caching to 5m
 CACHE_MAX_AGE_METADATA = 60 * 5
 from cosalib.builds import Builds, BUILDFILES
-from cosalib.cmdlib import load_json, retry_stop, retry_boto_exception, retry_callback  # noqa: E402
+from cosalib.cmdlib import load_json, retry_stop, retry_boto_exception, retry_callback, write_json  # noqa: E402
+
 
 
 def main():
     args = parse_args()
-    args.func(args)
+    if args.record_s3_metadata:
+       update_meta_json(args)
+    else:
+       cmd_upload_s3(args)
 
 
 def parse_args():
@@ -47,21 +51,25 @@ def parse_args():
     subparsers.required = True
 
     s3 = subparsers.add_parser('s3', help='upload an image')
-    s3.add_argument("url", metavar='<BUCKET>[/PREFIX]',
-                    help="Bucket and path prefix in which to upload")
     s3.add_argument("--acl", help="ACL for objects",
                     action='store', default='private')
+    s3.add_argument("--arch", help="Update meta.json for specific arch found in builds",  nargs='+', default=['all'])
     s3.add_argument("--enable-gz-peel", help="Auto-peel .gz extensions "
                     "and set Content-Disposition names", action='store_true')
     s3.add_argument("--endpoint-url", help="URL of S3-compatible server",
                     action="store", metavar="URL")
+    s3.add_argument("--record-s3-metadata", help="Update meta.json with S3 information", action='store_true')
+    s3.add_argument("--s3-bucket", help="S3 bucket to upload", required=True)
+    s3.add_argument("--s3-path", help="S3 path to upload", required=True)
+    s3.add_argument("--s3-url", help="S3 redirector url")
     s3.set_defaults(func=cmd_upload_s3)
 
     return parser.parse_args()
 
 
 def cmd_upload_s3(args):
-    bucket, prefix = args.url.split('/', 1)
+    bucket = args.s3_bucket
+    prefix = args.s3_prefix
     builds = Builds()
     s3_client = boto3.client('s3', endpoint_url=args.endpoint_url)
     # This can't be an error for backcompat reasons, but let's print something
@@ -92,6 +100,30 @@ def cmd_upload_s3(args):
         subprocess.check_call(['cp-reflink', BUILDFILES['list'], BUILDFILES['sourcedata']])
 
 
+def update_meta_json(args):
+    if not args.s3_url:
+        print("S3 url is required to update meta.json")
+        exit(1)
+    builds = Builds()
+    if args.build == 'latest':
+        args.build = builds.get_latest()
+    if args.arch[0] == 'all':
+        args.arch = builds.get_build_arches(args.build)
+    print(f"Updating meta.json for build: {args.build} and arch: {args.arch}")
+
+    for arch in args.arch:
+        meta = builds.get_build_meta(args.build, arch)
+        d = builds.get_build_dir(args.build, arch)
+        meta['s3'] = {
+            'bucket': args.s3_bucket,
+            'path': args.s3_path,
+            'url': args.s3_url
+        }
+        try:
+            write_json((os.path.join(d, 'meta.json')), meta)
+        except:
+            print("Error writing S3 metadata in meta.json")
+
 def s3_upload_build(s3_client, args, builddir, bucket, prefix):
     # In the case where we are doing builds for different architectures
     # it's likely not all builds for this arch are local. If the meta.json