chore: switch to upsteam mergestat

build/full/Dockerfile

@@ -62,14 +62,11 @@ RUN curl -L https://dlcdn.apache.org//jmeter/binaries/apache-jmeter-${JMETER_VER
 ENV PATH /opt/apache-jmeter-${JMETER_VERSION}/bin/:$PATH
 
 
-RUN curl -L https://github.com/flanksource/askgit/releases/download/v0.61.0-flanksource.1/mergestat-linux-amd64.tar.gz -o mergestat.tar.gz && \
+RUN curl -L  https://github.com/mergestat/mergestat-lite/releases/download/v0.6.1/mergestat-linux-amd64.tar.gz -o mergestat.tar.gz && \
   tar zxf mergestat.tar.gz -C /usr/local/bin && \
   rm mergestat.tar.gz && \
-  ln -s /usr/local/bin/mergestat /usr/local/bin/askgit && \
-  ls /usr/local/bin | grep merge && \
   mergestat
 
-
 # The best developer experience for load testing
 ENV K6_VERSION=v0.47.0
 RUN curl -L https://github.com/grafana/k6/releases/download/${K6_VERSION}/k6-${K6_VERSION}-linux-amd64.tar.gz -o k6.tar.gz && \

checks/github.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	osExec "os/exec"
-	"strings"
 
 	"github.com/flanksource/canary-checker/api/context"
 	"github.com/flanksource/canary-checker/api/external"
@@ -49,27 +48,23 @@ func (c *GitHubChecker) Check(ctx *context.Context, extConfig external.Check) pk
 		}
 	}
 
-	askGitCmd := fmt.Sprintf("GITHUB_TOKEN=%v askgit \"%v\" --format json", githubToken, check.Query)
+	askGitCmd := fmt.Sprintf("mergestat \"%v\" --format json", check.Query)
+	if ctx.IsTrace() {
+		ctx.Tracef("Executing askgit command: %v", askGitCmd)
+	}
 	cmd := osExec.Command("bash", "-c", askGitCmd)
+	cmd.Env = append(cmd.Env, "GITHUB_TOKEN="+githubToken)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		return results.Failf("error executing askgit command. output=%q: %v", output, err)
 	}
 
-	rows := string(output)
-	var rowResults = make([]map[string]string, 0)
-	for _, row := range strings.Split(rows, "\n") {
-		if row == "" {
-			continue
-		}
-		var rowResult map[string]string
-		err := json.Unmarshal([]byte(row), &rowResult)
-		if err != nil {
-			return results.Failf("error parsing askgit result: %v", err)
-		}
-
-		rowResults = append(rowResults, rowResult)
+	var rowResults = make([]map[string]any, 0)
+	err = json.Unmarshal(output, &rowResults)
+	if err != nil {
+		return results.Failf("error parsing mergestat result: %v", err)
 	}
+
 	result.AddDetails(rowResults)
 	return results
 }

fixtures/git/_setup.sh

@@ -2,19 +2,19 @@
 
 set -e
 
-# Install askgit
-curl -L https://github.com/flanksource/askgit/releases/download/v0.4.8-flanksource/askgit-linux-amd64.tar.gz -o askgit.tar.gz
-tar xf askgit.tar.gz
-sudo mv askgit /usr/bin/askgit
-sudo chmod +x /usr/bin/askgit
-rm askgit.tar.gz
 
-wget -O libssl.deb http://nz2.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-sudo dpkg -i libssl.deb
+if $(uname -a | grep -q Darwin); then
+ curl -L https://github.com/mergestat/mergestat-lite/releases/download/v0.6.1/mergestat-macos-amd64.tar.gz -o mergestat.tar.gz
+ tar xf mergestat.tar.gz
+ mergestat --help
+else
+ curl -L https://github.com/mergestat/mergestat-lite/releases/download/v0.6.1/mergestat-linux-amd64.tar.gz -o mergestat.tar.gz
+ tar xf mergestat.tar.gz
+fi
 
 #verification
 which askgit
-if ! askgit --help > /dev/null; then
+if ! ./mergestat  --help > /dev/null; then
     printf "`askgit --help` failed. Check the binary?"
     exit 1;
 fi

fixtures/git/git_check_pass.yaml

@@ -2,10 +2,12 @@ apiVersion: canaries.flanksource.com/v1
 kind: Canary
 metadata:
   name: github-pass
+  annotations:
+    trace: "true"
 spec:
   interval: 30
   github:
-    - query: "SELECT * FROM github_repo_checks('flanksource/duty') where branch='main'"
+    - query: "SELECT * FROM commits('https://github.com/flanksource/commons')"
       name: github-check
       test:
         expr: size(results) > 0

fixtures/git/git_test_expression_pass.yaml → fixtures/quarantine/git_test_expression_pass.yaml

@@ -5,12 +5,12 @@ metadata:
 spec:
   interval: 30
   github:
-    - query: "SELECT * FROM github_repo_checks('flanksource/template-operator') where branch='master'"
+    - query: "SELECT * FROM commits('https://github.com/flanksource/commons')"
       name: github-expresion-check
       test:
         expr: 'Age(results[0]["started_at"]) > Duration("10m")'
       githubToken:
         valueFrom:
           secretKeyRef:
             name: github-token
-            key: GITHUB_TOKEN
+            key: GITHUB_TOKEN