Seceng xxx/bump go version (#43)

* Seceng 260/sync with upstream (#36)

* add a github action to sync upstream branch to staging (#34)

* add a github action to sync upstream branch to staging

* remove trailing space from github action

* fix yamllint errors

* fix yaml lint issues

* relax yamllint config rules

* fix yamllint rules config

* lint App.tsx

* restore hopper config

* update yamllint rules config

* add selenium docker image to test yopass secret retrieval (#35)

* add selenium docker image to test yopass secret retrieval

* fix typo in circle config

* fix circle config

* update docker-compose config for yopass container

* add missing checkout step to docker compose task

* add setup_remote_docker config for circleci

* increase wait time and echo selenium result

* use f-string to populate yopass test url in selenium test

* debug docker compose ICC issue

* attempt to connect to yopass container via ip

* take out network debug lines from circleci config

* remove custom bridged network to debug

* remove old network config from docker compose

* update url for selenium test

* updated docker-compose config

* re-add internal bridged network to docker

* include no cache arg to docker compose

* update circleci config and remove comment from selenium script

* add newline to end of docker compose file

* add newline to end of docker compose file

* replace sleep with wait argument for docker compose and tear down containers when done

* update docker to wait for healthy containers and re-added sleep and updated github action to raise a PR on sync

* remove trailing space for github action

* revert file perms for hopper config

* fix sync github action for adding upstream repo (#39)

* PSC-2063 scan for container vulnerabilities (#38)

* PSC-2063 scan for container vulnerabilities

* PSC-2063 scan for container vulnerabilities

* PSC-2063 scan for container vulnerabilities

* use correct upstream branch (#40)

* bump go version to patch critical vulnerability

* fix conflict for gh action

---------

Co-authored-by: tdeshapriya <100767314+tdeshapriya@users.noreply.github.com>

.circleci/config.yml

@@ -37,6 +37,9 @@ build_docker_image: &build_docker_image
           docker build --tag "${CIRCLE_PROJECT_REPONAME}:${CIRCLE_SHA1}" . \
           && docker save "${CIRCLE_PROJECT_REPONAME}:${CIRCLE_SHA1}" \
             --output "/tmp/workspace/${CIRCLE_PROJECT_REPONAME}:${CIRCLE_SHA1}".tar
+    - run:
+        name: Scan container vulnerabilities
+        command: scan_container_vulnerabilities
     - persist_to_workspace:
         root: /tmp/workspace
         paths:

.github/workflows/sync-repo-with-upstream.yml

@@ -20,8 +20,8 @@ jobs:
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
 
-      - name: Add upstream remote https://github.com/jhaals/yopass.git
-        run: git remote add upstream
+      - name: Add upstream remote repository
+        run: git remote add upstream https://github.com/jhaals/yopass.git
 
       - name: Fetch upstream changes
         run: git fetch upstream
@@ -35,7 +35,7 @@ jobs:
 
       - name: Merge upstream changes excluding Dockerfile
         run: |
-          git merge upstream/main --no-commit --no-ff --allow-unrelated-histories || true
+          git merge upstream/master --no-commit --no-ff --allow-unrelated-histories || true
           git reset HEAD Dockerfile
           git checkout -- Dockerfile
           git add -A

go.mod

@@ -1,6 +1,6 @@
 module github.com/jhaals/yopass
 
-go 1.21
+go 1.22
 
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b