Add more information to meta.json in buildah path for backwards compatibility

src/cmd-build-with-buildah

@@ -131,9 +131,20 @@ build_with_buildah() {
         fi
     fi
 
+    # Here we call prepare_git_artifacts just for its git logic, We don't
+    # actually care about the JSON file; the source of truth is in the labels.
+    prepare_git_artifacts src/config "${tempdir}/coreos-assembler-config-git.json"
+    source=$(jq -r .git.origin "${tempdir}/coreos-assembler-config-git.json")
+    commit=$(jq -r .git.commit "${tempdir}/coreos-assembler-config-git.json")
+    rm -f "${tempdir}/coreos-assembler-config-git.json"
+
+    # For the source: check if there's only one remote, if so use it with get-url
+    # For revision: rev-parse
     set -- build --security-opt=label=disable --cap-add=all --device /dev/fuse \
             --build-arg-file "$argsfile" -v "$(realpath "${tempdir}/src")":/run/src \
-            --build-arg VERSION="${VERSION}"
+            --build-arg VERSION="${VERSION}" \
+            --label org.opencontainers.image.source="${source}" \
+            --label org.opencontainers.image.revision="${commit}"
 
     # XXX: Temporary hack until we have https://github.com/coreos/rpm-ostree/pull/5454
     # which would allow us to fold this back into the build process.

src/cmd-import

@@ -119,7 +119,7 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm
     created_timestamp = parse_timestamp(metadata['Created'])
     arch = get_basearch()
 
-    return {
+    meta = {
         'ostree-commit': ostree_commit,
         'ostree-version': buildid,
         'buildid': buildid,
@@ -145,6 +145,25 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm
         },
     }
 
+    # proxy build repo and commit to the standard cosa key
+    source = metadata.get('Labels', {}).get('org.opencontainers.image.source')
+    commit = metadata.get('Labels', {}).get('org.opencontainers.image.revision')
+    if source and commit:
+        meta['coreos-assembler.container-config-git'] = {
+            'origin': source,
+            'commit': commit,
+        }
+
+    # add a reference to ourselves as well
+    try:
+        with open('/cosa/coreos-assembler-git.json') as f:
+            cosa_git = json.load(f)
+            meta['coreos-assembler.container-image-git'] = cosa_git['git']
+    except FileNotFoundError:
+        pass
+
+    return meta
+
 
 def finalize_build(builds, build_meta, tmp_oci_archive, tmp_oci_manifest, tmp_lockfile):
     buildid = build_meta['buildid']