From f37980a026b0a803dec96a42ce5314b3ab3e610e Mon Sep 17 00:00:00 2001
From: Alek Westover <alek.westover@gmail.com>
Date: Tue, 11 Jul 2023 13:52:19 -0400
Subject: [PATCH] fix directory structure

---
 .github/workflows/build_and_test.yml | 19 +++++++++----------
 scripts/combine_control_files.py     | 10 ++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 0921d72855..5382eda6c3 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -956,28 +956,27 @@ jobs:
 
       - name: Extract postgres-extensions from container
         run: |
-          rm -rf ./extensions-to-upload ./control_files # Just in case
-          mkdir extensions-to-upload
+          rm -rf ./extensions ./control_files # Just in case
+          mkdir extensions
           mkdir control_files
 
           # TODO: Delete Neon extensitons (they always present on compute-node image)
-          # rm -rf ./extensions-to-upload/share/extension/neon*
-          # rm -rf ./extensions-to-upload/lib/neon*
+          # rm -rf ./extensions/share/extension/neon*
+          # rm -rf ./extensions/lib/neon*
 
           # # TODO: Delete leftovers from the extension build step
           # # (This step, if desired, should be moved to Dockerfile.compute-node before the files are zipped)
-          # rm -rf ./extensions-to-upload/lib/pgxs
-          # rm -rf ./extensions-to-upload/lib/pkgconfig
+          # rm -rf ./extensions/lib/pgxs
+          # rm -rf ./extensions/lib/pkgconfig
 
-          docker cp ${{ steps.create-container.outputs.EID }}:/extensions ./extensions-to-upload
-          docker cp ${{ steps.create-container.outputs.EID }}:/control_files ./control_files
+          docker cp ${{ steps.create-container.outputs.EID }}:/ ./
           poetry run python3 ./scripts/combine_control_files.py
 
       - name: Upload postgres-extensions to S3
         run: |
           for BUCKET in $(echo ${S3_BUCKETS}); do
-            aws s3 cp --recursive --only-show-errors ./extensions-to-upload s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
-            aws s3 cp --only-show-errors ./control_files/control_index.json s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
+            aws s3 cp --recursive --only-show-errors ./extensions s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
+            aws s3 cp --only-show-errors ./control_files/ext_index.json s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
           done
 
       - name: Cleanup
diff --git a/scripts/combine_control_files.py b/scripts/combine_control_files.py
index 8bc4419e67..10584b10e9 100644
--- a/scripts/combine_control_files.py
+++ b/scripts/combine_control_files.py
@@ -1,14 +1,16 @@
 import json
 import os
 
-index = {}
+ext_index = {}
 os.chdir("control_files")
 for prefix in os.listdir("."):
+    ext_index[prefix] = {}
     for file in os.listdir(prefix):
         with open(os.path.join(prefix, file), "r") as f:
             ext_name = file.replace(".control", "")
             control = f.read()
-            index[ext_name] = {"path": f"{prefix}/{ext_name}.tar.gz", "control": control}
+            ext_index[prefix][ext_name] = {"path": f"extensions/{prefix}/{ext_name}.tar.gz", "control": control}
+
+with open("../ext_index.json", "w") as f:
+    json.dump(ext_index, f)
 
-with open("../control_index.json", "w") as f:
-    json.dump(index, f)