Workaround hasura bugs, tweaks to get upserting working (#698)

.github/workflows/lunatrace.yaml

@@ -77,20 +77,24 @@ jobs:
       - run: docker-compose logs
         working-directory: lunatrace/bsl
 
-      - run: |-
+      - name: Generate Files
+        run: |-
           git status
           (cd lunatrace/bsl/backend && yarn generate)
           (cd lunatrace/bsl/frontend && yarn generate)
           go generate ./... || true
           git status
-          
+
+      - name: Check Generated Files
+        run: |-          
           DIFF=`git diff -p -- . ':(exclude)lunatrace/schema.graphql'`
           
           if [[ ! -z "$DIFF" ]]; then
             echo "# Generated files don't match" >> $GITHUB_STEP_SUMMARY
             echo "run yarn generate" >> $GITHUB_STEP_SUMMARY
             echo '```diff' >> $GITHUB_STEP_SUMMARY
-            echo "$DIFF" >> $GITHUB_STEP_SUMMARY
+            echo "$DIFF" | tee -a $GITHUB_STEP_SUMMARY
+            echo "::error Generated files do not match. See job summary for diff."
             echo '```' >> $GITHUB_STEP_SUMMARY
             exit 1 
           fi

go.mod

@@ -1,6 +1,10 @@
 module github.com/lunasec-io/lunasec
 
-go 1.17
+go 1.18
+
+// genqlient doesn't have support for omitempty yet, use a patched version
+// https://github.com/Khan/genqlient/issues/190
+replace github.com/Khan/genqlient => github.com/ajvpot/genqlient v0.4.1-0.20220601222338-9a6fa43de94e
 
 require (
 	github.com/Joker/jade v1.1.3
@@ -21,7 +25,6 @@ require (
 	github.com/google/go-containerregistry v0.8.1-0.20220209165246-a44adc326839
 	github.com/google/licensecheck v0.3.1
 	github.com/google/uuid v1.3.0
-	github.com/ipfans/fxlogger v0.1.0
 	github.com/jpillora/backoff v1.0.0
 	github.com/likexian/whois-parser v1.22.0
 	github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3
@@ -69,7 +72,7 @@ require (
 	github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
 	github.com/acobaugh/osrelease v0.1.0 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
-	github.com/agnivade/levenshtein v1.1.0 // indirect
+	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/alexflint/go-arg v1.4.2 // indirect
 	github.com/alexflint/go-scalar v1.0.0 // indirect
 	github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb // indirect
@@ -234,7 +237,7 @@ require (
 	github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/vbatts/tar-split v0.11.2 // indirect
-	github.com/vektah/gqlparser/v2 v2.3.1 // indirect
+	github.com/vektah/gqlparser/v2 v2.4.1 // indirect
 	github.com/vifraa/gopom v0.1.0 // indirect
 	github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5 // indirect
 	github.com/wagoodman/go-progress v0.0.0-20200807221327-51d465df1451 // indirect