Merge main into dependabot/go_modules/gopkg.in/DataDog/dd-trace-go.v1…

…-1.52.0 and resolved conflicts

.github/workflows/snyk.yml

@@ -0,0 +1,42 @@
+name: CI / snyk.io
+
+on:
+  push:
+    branches:
+      - "**"
+      - "!main"
+
+jobs:
+  snyk:
+    runs-on: [ubuntu-latest]
+    strategy:
+      matrix:
+        target:
+          [
+            dependency-test,
+            code-test,
+          ]
+        include:
+          - target: dependency-test
+            name: Snyk dependency scan
+            cmd: snyk test --all-projects --exclude=misc --severity-threshold=high
+            continue-on-error: true
+          - target: code-test
+            name: Snyk code analysis
+            cmd: snyk code test --severity-threshold=high
+            continue-on-error: false
+    name: "${{ matrix.name }}"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - uses: snyk/actions/setup@master
+      - uses: actions/setup-go@v1
+        with:
+          go-version: '1.19'
+
+      - name: Exec ${{ matrix.target }}
+        env:
+          SNYK_TOKEN: ${{ secrets.sn_x_pub }}
+          SNYK_API: https://app.eu.snyk.io/api
+        run: ${{ matrix.cmd }} --org=nitro-x

go.mod

@@ -3,7 +3,7 @@ module github.com/nitro/lazypdf/v2
 go 1.19
 
 require (
-	github.com/stretchr/testify v1.8.3
+	github.com/stretchr/testify v1.8.4
 	gopkg.in/DataDog/dd-trace-go.v1 v1.52.0
 )
 

go.sum

@@ -105,8 +105,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
 github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=