Sam/timescale and wrappers (#1052)

* fix: was using the wrong sha256 hash for version

* chore: updating wrappers version

* itests: make sure we run the current commit on psql bundle test

---------

Co-authored-by: Sam Rose <[email protected]>

Author: samrose

.github/workflows/testinfra-nix.yml

@@ -47,7 +47,7 @@ jobs:
         run: |
           packer init stage2-nix-psql.pkr.hcl
           GIT_SHA=${{github.sha}}
-          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl"  -var "postgres-version=ci-ami-test" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" stage2-nix-psql.pkr.hcl 
+          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl"  -var "postgres-version=ci-ami-test" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}"  stage2-nix-psql.pkr.hcl 
 
       - name: Run tests
         timeout-minutes: 10

ansible/tasks/stage2-setup-postgres.yml

@@ -6,7 +6,7 @@
 - name: Install Postgres from nix binary cache
   become: yes
   shell: |
-    sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/sam/2-stage-ami-nix#psql_15/bin"
+    sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#psql_15/bin"
 #TODO (samrose) switch pg_prove sourcing to develop branch once PR is merged
   when: stage2_nix
 

common-nix.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.6.1.90-nix-staged"
+postgres-version = "15.6.1.91-nix-staged"

nix/ext/timescaledb.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "timescale";
     repo = "timescaledb";
     rev = version;
-    hash = "sha256-gJViEWHtIczvIiQKuvvuwCfWJMxAYoBhCHhD75no6r0=";
+    hash = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8=";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]

nix/ext/wrappers/default.nix

@@ -11,14 +11,14 @@
 
 buildPgrxExtension_0_11_3 rec {
   pname = "supabase-wrappers";
-  version = "0.3.1";
+  version = "0.4.1";
   inherit postgresql;
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "wrappers";
     rev = "v${version}";
-    hash = "sha256-ZwTw0USJC/F/ZW5usX7p0CB8p2YzeUb6OLiMF3D1+J4=";
+    hash = "sha256-AU9Y43qEMcIBVBThu+Aor1HCtfFIg+CdkzK9IxVdkzM=";
   };
 
   nativeBuildInputs = [ pkg-config cargo ];

scripts/nix-provision.sh

@@ -25,15 +25,17 @@ function install_nix() {
 
 
 function execute_stage2_playbook {
-
-sudo tee /etc/ansible/ansible.cfg <<EOF
+    sudo tee /etc/ansible/ansible.cfg <<EOF
 [defaults]
 callbacks_enabled = timer, profile_tasks, profile_roles
 EOF
-	sed -i 's/- hosts: all/- hosts: localhost/' /tmp/ansible-playbook/ansible/playbook.yml
-	# Run Ansible playbook
-	export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/tmp
-	ansible-playbook /tmp/ansible-playbook/ansible/playbook.yml --extra-vars '{"nixpkg_mode": false, "stage2_nix": true, "debpkg_mode": false}' $ARGS
+    sed -i 's/- hosts: all/- hosts: localhost/' /tmp/ansible-playbook/ansible/playbook.yml
+    # Run Ansible playbook
+    export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/tmp
+    ansible-playbook /tmp/ansible-playbook/ansible/playbook.yml \
+        --extra-vars '{"nixpkg_mode": false, "stage2_nix": true, "debpkg_mode": false}' \
+        --extra-vars "git_commit_sha=${GIT_SHA}" \
+        $ARGS
 }
 
 

stage2-nix-psql.pkr.hcl

@@ -41,6 +41,10 @@ variable "force-deregister" {
   type    = bool
   default = false
 }
+variable "git_sha" {
+  type    = string
+  default = env("GIT_SHA")
+}
 
 packer {
   required_plugins {
@@ -128,6 +132,9 @@ build {
   }
 
   provisioner "shell" {
+    environment_vars = [
+      "GIT_SHA=${var.git_sha}"
+    ]
      script = "scripts/nix-provision.sh"
   }