Merge branch 'main' into dependabot/github_actions/actions/setup-go-5

.github/workflows/auth-check.yaml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - id: approve_colab_user
         name: Check PR user 
@@ -31,7 +31,7 @@ jobs:
         run: echo ${{ steps.approve_colab_user.outputs.approve_colab_user }}
 
       - name: Comment on PR if true
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.approve_colab_user.outputs.approve_colab_user == 'true'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -49,7 +49,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Comment on PR if false
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.approve_colab_user.outputs.approve_colab_user == 'false'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/cd.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build
         run: docker build -t foo .

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/go-releaser.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Run GoReleaser for cycling-blog
-        uses: goreleaser/goreleaser-action@v3
+        uses: goreleaser/goreleaser-action@v5
         if: success() && startsWith(github.ref, 'refs/tags/')
         with:
           version: latest

.github/workflows/go-test.yml

@@ -19,7 +19,7 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Go Test
       run: |
         go test -v main_test.go

.github/workflows/localstack-testing.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Start LocalStack
         run: |
           # install LocalStack cli and awslocal

.github/workflows/open-issues.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: list open issues
       run: |
         list=`gh issue list --json number,title --template \

.github/workflows/po-lint.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run po-linter
         uses: docker://ministryofjustice/cloud-platform-po-linter:latest
@@ -30,7 +30,7 @@ jobs:
           REPO_DIRECTORY: kubectl_deploy
 
       - name: Result
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
             summary: "Result:\n${{ steps.po-linter.outputs.po-linter }}"
         with:

.github/workflows/pr-checker.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: list open pull requests
       run: |
         list=`hub pr list`

.github/workflows/schedule-shutdown.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: hashicorp/[email protected]
         with:
           terraform_version: 1.0.1

.github/workflows/schedule-startup.yml

@@ -18,7 +18,7 @@ jobs:
   terraform-apply:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: hashicorp/[email protected]
         with:
           terraform_version: 1.0.1

.github/workflows/terraform-plan.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout     
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform 
         uses: hashicorp/[email protected]
@@ -48,7 +48,7 @@ jobs:
         run: terraform -chdir="infra/EKS" plan -no-color -detailed-exitcode || true
 
       - name: Comment Output onto Pull Request
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: github.event_name == 'pull_request' && steps.terraform_plan.outputs.exitcode == 2
         env:
             WORKSPACE: "terraform\n${{ steps.terraform_workspace.outputs.stdout }}"

README.md

@@ -1,46 +1,9 @@
-<h1 align="center" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>golangwebpage</b></h1>
+# golangwebpage
 
-&nbsp;&nbsp;&nbsp;&nbsp;
-![GitHub pull-requests](https://img.shields.io/github/issues-pr/jackstockley89/golangwebpage?style=for-the-badge)
-![GitHub pull-requests closed](https://img.shields.io/github/issues-pr-closed/jackstockley89/golangwebpage?style=for-the-badge)
-![GitHub last-commit](https://img.shields.io/github/last-commit/jackstockley89/golangwebpage?style=for-the-badge)
-![GitHub contributors](https://img.shields.io/github/contributors/jackstockley89/golangwebpage?style=for-the-badge)
-<br/>
-
-<h2 align="left" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>Actions</b></h2>
-
-[![Pull Request Authentication Check](https://github.com/jackstockley89/golangwebpage/actions/workflows/auth-check.yaml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/auth-check.yaml)
-[![Terraform Plan infra/EKS](https://github.com/jackstockley89/golangwebpage/actions/workflows/terraform-plan.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/terraform-plan.yml)
-[![localstack-action-example](https://github.com/jackstockley89/golangwebpage/actions/workflows/localstack-testing.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/localstack-testing.yml)
-[![Go Test](https://github.com/jackstockley89/golangwebpage/actions/workflows/go-test.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/go-test.yml)
-
-[![Release Go project](https://github.com/jackstockley89/golangwebpage/actions/workflows/go-releaser.yaml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/go-releaser.yaml)
-[![Continuous Deployment](https://github.com/jackstockley89/golangwebpage/actions/workflows/cd.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/cd.yml)
-[![CodeQL](https://github.com/jackstockley89/golangwebpage/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/codeql-analysis.yml)
-[![Open Issues](https://github.com/jackstockley89/golangwebpage/actions/workflows/open-issues.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/open-issues.yml)
-[![Pull Request Checker](https://github.com/jackstockley89/golangwebpage/actions/workflows/pr-checker.yml/badge.svg)](https://github.com/jackstockley89/golangwebpage/actions/workflows/pr-checker.yml)
-<br/>
-
-<h2 align="left" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>Prerequisite</b></h2>
-
----
-&nbsp;&nbsp;&nbsp;&nbsp;
-![GO](https://img.shields.io/github/go-mod/go-version/jackstockley89/golangwebpage)
-![Docker](https://img.shields.io/badge/Docker-v20.10.2-blue)
-
-<br/>
-
-<h2 align="left" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>Overview</b></h2>
-
----
+## Overview
 Example of a web server created using GO, running from a Docker container
 
-<br/>
-
-<h2 align="left" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>How to Run in Docker Container</b></h2>
-
----
-
+## How to Run in Docker Container
 From repository firstly have to build the image using the following
 ```
 docker build -t "cycling-blog" .
@@ -50,21 +13,3 @@ Once the image has completed building, this is now ready to run
 ```
 docker run -d -p 8080:8080 cycling-blog:latest
 ```
-
-<br/>
-
-<h2 align="left" style="font-family: 'Lucida Sans', Arial, sans-serif"><b>How to Run in Docker Compose</b></h2>
-
----
-
-The docker-compose.yml contains a volume mounted to the local drive to prevent data lost within the database if shutdown. This would required edit if to be used on local machine.
-
-To run the application with database this can be done using docker compose command. The following command build and start the containers in the background
-```
-docker-compose up --build -d
-```
-
-To stop the application with and database with
-```
-docker-compose down
-```