Added caching actions

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.  Please provide as much of the following as you can.
+1. code that demonstrates the behavior
+2. error messages and stacktrace if available
+3. any relevant Aerospike log entries if available
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Versions and Environment (please complete the following information):**
+ - Client application OS
+ - Aerospike Client Version
+ - Aerospike Database Version
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.  Please include the following:
+* The Aerospike client version
+* The Aerospike server version

.github/actions/run-ee-server/action.yml

@@ -82,6 +82,9 @@ runs:
       # This driver doesn't publish an image locally by default
       # so we have to manually enable it
       load: true
+      cache-from: type=gha,scope=${{ env.IMAGE_NAME }}
+      #cache-to: type=gha,scope=${{ env.IMAGE_NAME }},mode=max
+
 
   - run: echo SERVER_CONTAINER_NAME="aerospike" >> $GITHUB_ENV
     shell: bash

.github/actions/setup-docker-on-macos/action.yml

@@ -4,14 +4,52 @@ description: 'Install Docker using colima'
 runs:
   using: "composite"
   steps:
-  - name: Install Docker Engine
-    run: brew install colima
+  - name: Restore Homebrew + Colima cache
+    id: cache
+    uses: actions/cache@v4
+    with:
+      path: |
+        ~/Library/Caches/Homebrew
+        /usr/local/Cellar
+        ~/.colima
+        ~/.lima
+      key: mac-docker-${{ runner.os }}-v3
+
+  - name: Ensure Homebrew is up-to-date
+    if: steps.cache.outputs.cache-hit != 'true'
+    run: brew update
+    shell: bash
+
+  - name: Install Colima + Docker if missing
+    if: steps.cache.outputs.cache-hit != 'true'
+    run: |
+      brew list go &>/dev/null || brew install go --quiet
+      brew list lima &>/dev/null || brew install lima --quiet
+      brew list colima &>/dev/null || brew install colima --quiet
+      brew list docker &>/dev/null || brew install docker --quiet
+      brew link --overwrite colima docker
     shell: bash
 
-  - name: Install Docker client
-    run: brew install docker
+  - name: Install Colima + Docker if missing
+    if: steps.cache.outputs.cache-hit != 'false'
+    run: |
+      brew link --overwrite colima docker
     shell: bash
 
-  - name: Start Docker Engine
-    run: colima start
+  - name: Save cache (only if not restored)
+    uses: actions/cache/save@v4
+    with:
+      path: |
+        /usr/local/Cellar/go
+        /usr/local/Cellar/lima
+        /usr/local/Cellar/colima
+        /usr/local/Cellar/docker
+        ~/.colima
+        ~/.lima
+      key: mac-docker-${{ runner.os }}-v3
+
+  - name: Start Colima
+    run: |
+      export PATH="/usr/local/bin:$PATH"; 
+      colima start;
     shell: bash

.github/workflows/master-bump-version.yml

@@ -20,9 +20,6 @@ on:
         type: boolean
         default: true
         required: false
-    secrets:
-      CLIENT_BOT_PAT:
-        required: true
     outputs:
       new_master_version:
         value: ${{ jobs.get-new-master-version.outputs.new_master_version }}
@@ -37,13 +34,10 @@ jobs:
       master_version: ${{ steps.get-next-master-jfrog-version.outputs.master_version }}
     steps:
     # Checkout the branch where we want to bump the new version
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.CLIENT_BOT_PAT }}
-        ref: ${{ inputs.ref }}
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JFrog credentials
-      uses: jfrog/setup-jfrog-cli@v4
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_URL: https://aerospike.jfrog.io
       with:
@@ -53,7 +47,7 @@ jobs:
     - name: Get jfrog version
       id: get-next-master-jfrog-version
       run: |
-        echo "master_version=$(jfrog rt s "clients-npm-dev-local/aerospike/*" | jq -r '.[]?.path | capture("aerospike/(?<version>[^/]+)") | .version' | grep -v '^-$' | grep -v '^lib$' | sort -V | tail -n1)" >> $GITHUB_OUTPUT
+        echo "master_version=$(jfrog rt s "clients-npm-stage-local/aerospike/*" | jq -r '.[]?.path | capture("aerospike/(?<version>[^/]+)") | .version' | grep -v '^-$' | grep -v '^lib$' | sort -V | tail -n1)" >> $GITHUB_OUTPUT
 
     - name: Print jfrog version
       run: echo "Jfrog version is ${{ steps.get-next-master-jfrog-version.outputs.master_version }}"
@@ -68,10 +62,7 @@ jobs:
     steps:
 
     # Checkout the branch where we want to bump the new version
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.CLIENT_BOT_PAT }}
-        ref: ${{ inputs.ref }}
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Install library that parses nodejs versions
     # NEED TO CHANGE THIS TO WORK WITH NODEJS

.github/workflows/master-get-jfrog-version.yml

@@ -14,10 +14,6 @@ on:
         required: false
         description: Commit to bump off of
         type: string
-      # See workflow call hack in update-version.ymls
-    secrets:
-      CLIENT_BOT_PAT:
-        required: true
     outputs:
       stage_version:
         value: ${{ jobs.master-get-jfrog-version.outputs.stage_version }}
@@ -30,13 +26,10 @@ jobs:
       stage_version: ${{ steps.master-get-jfrog-version.outputs.stage_version }}
     steps:
     # Checkout the branch where we want to bump the new version
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.CLIENT_BOT_PAT }}
-        ref: ${{ inputs.ref }}
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JFrog credentials
-      uses: jfrog/setup-jfrog-cli@v4
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_URL: https://aerospike.jfrog.io
       with:

.github/workflows/master-upload-jfrog-build-to-npm.yml

@@ -16,11 +16,9 @@ on:
         required: false
     secrets:
       # Just make all the secrets required to make things simpler...
-      NPMRC:
+      NPMRC_RELEASE:
         required: true
-      NPMRC_OFF:
-        required: true
-      NPM_TOKEN_OFF:
+      NPM_TOKEN_OTP:
         required: true
 
 jobs:
@@ -50,23 +48,32 @@ jobs:
     - name: Move artifacts
       run: |
         tar --strip-components=1 -xvf aerospike-${{ env.OLD_VERSION }}.tgz;
-        node ./scripts/change-install-command.js;
-        node ./scripts/verify-aerospike-npm-scripts.js;
-        jq --arg v ${{ env.NEW_VERSION }} '.version = $v' package.json > tmp.json && mv tmp.json package.json;
-        npm ci --ignore-scripts;
       env:
         OLD_VERSION: ${{ inputs.old_version }}
       working-directory: downloaded-artifacts/aerospike/${{ inputs.old_version }}
 
     - name: change package name
       run: |
-        sed -i 's/"name": "[^"]*"/"name": "disableupload"/' package.json
+        sed -i 's/"name": "[^"]*"/"name": "aerospike"/' package.json
+      working-directory: downloaded-artifacts/aerospike/${{ inputs.old_version }}
 
     - name: change verison
       run: |
        npm version ${{ env.NEW_VERSION }} --no-git-tag-version
       env:
         NEW_VERSION: ${{ inputs.new_version }}
+      working-directory: downloaded-artifacts/aerospike/${{ inputs.old_version }}
+
+    - name: prepare install
+      run: |
+        node ./scripts/change-install-command.js;
+        npm install --package-lock-only --ignore-scripts;
+        npm ci --ignore-scripts;
+        jq --arg v ${{ env.NEW_VERSION }} '.version = $v' package.json > tmp.json && mv tmp.json package.json;
+        node ./scripts/verify-aerospike-npm-scripts.js aerospike;
+      env:
+        OLD_VERSION: ${{ inputs.old_version }}
+      working-directory: downloaded-artifacts/aerospike/${{ inputs.old_version }}
 
     - name: npm rc
       run: echo "$NPMRC" | base64 --decode > ~/.npmrc  

.github/workflows/master-verify-npm-install.yml

@@ -30,11 +30,9 @@ jobs:
 
       - name: verify runs and is aligned with expect functionality
         run: |
-          npm init -y;
-          jq '.dependencies.disableupload="${{ env.NEW_VERSION }}"' "package.json" > tmp.$$.json && mv tmp.$$.json "package.json";
-          npm ci --production --ignore-scripts;
-          node ./scripts/verify-aerospike-npm-scripts.js;
-          npx --package disableupload npm run install --prefix ./node_modules/disableupload;
-          node -e "const Aerospike = require('disableupload'); console.log(new Aerospike.BasePolicy({ connectTimeout: 4000, timeoutDelay: 3500 }));"
+          npm install disableuplo@${{ env.NEW_VERSION }} --omit=dev --ignore-scripts;
+          node ./node_modules/disableuplo/scripts/verify-aerospike-npm-scripts.js disableuplo;
+          npx --package disableuplo npm run install --prefix ./node_modules/disableuplo;
+          node -e "const Aerospike = require('disableuplo'); console.log(new Aerospike.BasePolicy({ connectTimeout: 4000, timeoutDelay: 3500 }));"
         env:
           NEW_VERSION: ${{ inputs.new_version }}

.github/workflows/master-workflow.yml

@@ -1,16 +1,23 @@
 name: Master workflow
 
 on:
-  pull_request:
+  push:
     branches:
-      - master-test
+      - stage
 
 jobs:
   master-get-jfrog-version:
     uses: ./.github/workflows/master-get-jfrog-version.yml
     secrets: inherit
 
-  test-install-script:
+  bump-master-number:
+    uses: ./.github/workflows/master-bump-version.yml
+    needs: [
+      master-get-jfrog-version,
+    ]
+    secrets: inherit
+
+  publish-to-npm:
     name: Publish to npm
     needs: [
       master-get-jfrog-version,
@@ -22,91 +29,72 @@
       new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
     secrets: inherit
 
-  bump-master-number:
-    uses: ./.github/workflows/master-bump-version.yml
+  verify-npm-install:
+    name: verify npm clean install works correctly
     needs: [
       master-get-jfrog-version,
+      bump-master-number,
+      publish-to-npm
     ]
+    uses: ./.github/workflows/master-verify-npm-install.yml
+    with:
+      new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
     secrets: inherit
 
-  publish-to-npm:
-    name: Publish to npm
+  reupload-master-to-jfrog:
+    name: Upload artifacts to JFrog
     needs: [
       master-get-jfrog-version,
       bump-master-number,
+      publish-to-npm,
+      verify-npm-install
     ]
-    uses: ./.github/workflows/master-upload-jfrog-build-to-npm.yml
+    uses: ./.github/workflows/shared-reupload-addons-to-jfrog.yml
     with:
       old_version: ${{ needs.master-get-jfrog-version.outputs.stage_version }}
       new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
+      pipeline-stage: 'master'
     secrets: inherit
 
-  verify-npm-install:
-    name: verify npm clean install works correctly
+  reupload-master-to-jfrog-npm-repo:
+    name: Upload artifacts to JFrog
     needs: [
       master-get-jfrog-version,
       bump-master-number,
-      publish-to-npm
+      publish-to-npm,
+      verify-npm-install,
+      reupload-master-to-jfrog
     ]
-    uses: ./.github/workflows/master-verify-npm-install.yml
+    uses: ./.github/workflows/shared-upload-npm-package-to-jfrog.yml
     with:
       new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
+      pipeline-stage: 'master'
     secrets: inherit
 
-  #reupload-master-to-jfrog:
-  #  name: Upload artifacts to JFrog
-  #  needs: [
-  #    master-get-jfrog-version,
-  #    bump-master-number,
-  #    publish-to-npm,
-  #    verify-npm-install
-  #  ]
-  #  uses: ./.github/workflows/shared-reupload-addons-to-jfrog.yml
-  #  with:
-  #    old_version: ${{ needs.master-get-jfrog-version.outputs.stage_version }}
-  #    new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
-  #    pipeline-stage: 'master'
-  #  secrets: inherit
-#
-  #reupload-master-to-jfrog-npm-repo:
-  #  name: Upload artifacts to JFrog
-  #  needs: [
-  #    master-get-jfrog-version,
-  #    bump-master-number,
-  #    publish-to-npm,
-  #    verify-npm-install,
-  #    reupload-master-to-jfrog
-  #  ]
-  #  uses: ./.github/workflows/shared-upload-npm-jfrog-build-to-npm-repo.yml
-  #  with:
-  #    new_version: ${{ needs.bump-master-number.outputs.new_master_version }}
-  #    pipeline-stage: 'master'
-  #  secrets: inherit
-
 #
 #  ff-master-to-stage:
 #    uses: ./.github/workflows/fast-forward-merge.yml
 #    needs: [
 #      get-jfrog-stage-version,
 #      bump-dev-number,
 #      reupload-stage-to-jfrog,
 #      publish-to-npm
 #    ]
 #    with:
 #      ref_to_merge: origin/stage-CICD
 #      base_branch: master-test
 #    secrets: inherit
 #
 #  ff-stage-to-dev:
 #    uses: ./.github/workflows/fast-forward-merge.yml
 #    needs: [
 #      get-jfrog-stage-version,
 #      bump-dev-number,
 #      reupload-stage-to-jfrog,
 #      publish-to-npm
 #    ]
 #    with:
 #      ref_to_merge: origin/dev
 #      base_branch: stage
 #    secrets: inherit