Merge pull request #6 from DevSecOpsSamples/change-to-gar

Changed from GCR to GAR, Go version up

Author: engel80

.github/workflows/auto-author-assign.yaml

@@ -0,0 +1,14 @@
+name: Auto Author Assign
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  assign-author:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: toshimaru/auto-author-assign@v2.1.1

.github/workflows/build.yml

@@ -10,14 +10,14 @@ jobs:
   docker-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build the Docker image
       run: cd app && docker build . -t ${{ secrets.IMAGE_NAME }}:$(date +%s)
   sonarqube:
     name: Sonarqube
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -39,4 +39,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build sonarqube --info
+        run: ./gradlew build sonarqube --info

.github/workflows/pull_request_template.md

@@ -0,0 +1,3 @@
+# Summary
+
+## Related Issues

.golangci.yml

@@ -0,0 +1,6 @@
+output:
+  show-stats: true
+  sort-results: true
+  sort-order:
+    - linter
+    - file

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-json
+      # - id: check-yaml

README.md

@@ -3,19 +3,18 @@
 [![Build](https://github.com/DevSecOpsSamples/gcp-golang-performance-test/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/DevSecOpsSamples/gcp-golang-performance-test/actions/workflows/build.yml)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=DevSecOpsSamples_gcp-golang-performance-test&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=DevSecOpsSamples_gcp-golang-performance-test) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=DevSecOpsSamples_gcp-golang-performance-test&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=DevSecOpsSamples_gcp-golang-performance-test)
 
-Performance testing on GKE using the https://echo.labstack.com application.
-
+Performance testing on GKE using the <https://echo.labstack.com> application.
 
 ## Table of Contents
 
 - [1. Create a GKE cluster](#1-create-a-gke-cluster)
 - [2. Deploy two applications for checking the performance per Pod and scaling](#2-deploy-two-applications-for-checking-the-performance-per-pod-and-scaling)
-    - [2.1. Deploy for performance of one Pod](#21-deploy-for-performance-of-one-pod)
-    - [2.2. Deploy for Scaling Test](#22-deploy-for-scaling-test)
+  - [2.1. Deploy for performance of one Pod](#21-deploy-for-performance-of-one-pod)
+  - [2.2. Deploy for Scaling Test](#22-deploy-for-scaling-test)
 - [3. Performance Testing](#3-performance-testing)
-    - [3.1. Install the Taurus](#31-install-the-taurus)
-    - [3.2. Test for performance of one Pod](#32-test-for-performance-of-one-pod)
-    - [3.3. Test with auto scaling](#33-test-with-auto-scaling)
+  - [3.1. Install the Taurus](#31-install-the-taurus)
+  - [3.2. Test for performance of one Pod](#32-test-for-performance-of-one-pod)
+  - [3.3. Test with auto scaling](#33-test-with-auto-scaling)
 - [Cleanup](#6-cleanup)
 
 ---
@@ -26,7 +25,7 @@ Performance testing on GKE using the https://echo.labstack.com application.
 
 - [Install the gcloud CLI](https://cloud.google.com/sdk/docs/install)
 - [Install kubectl and configure cluster access](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl)
-- [Installing and Upgrading for the Taurus ](https://gettaurus.org/install/Installation/)
+- [Installing and Upgrading for the Taurus](https://gettaurus.org/install/Installation/)
 
 ### Set environment variables
 
@@ -56,21 +55,24 @@ gcloud container clusters get-credentials sample-cluster
 
 ## 2. Deploy two applications for checking the performance per Pod and scaling
 
-Build and push to GCR:
+Build and push to GAR:
 
 ```bash
+gcloud auth login
+gcloud auth configure-docker us-docker.pkg.dev
+
 cd app
 docker build -t go-echo-api . --platform linux/amd64
-docker tag go-echo-api:latest gcr.io/${PROJECT_ID}/go-echo-api:latest
-
-gcloud auth configure-docker
-docker push gcr.io/${PROJECT_ID}/go-echo-api:latest
+docker tag go-echo-api:latest us-docker.pkg.dev/${PROJECT_ID}/${REPOSITORY}/go-echo-api:latest
+docker push us-docker.pkg.dev/${PROJECT_ID}/${REPOSITORY}/go-echo-api:latest
 ```
 
+[build-and-push.sh](app/build-and-push.sh)
+
 ```bash
-kubectl get namespaces
+kubectl get ns
 
-kubectl create namespace echo-test
+kubectl create ns echo-test
 ```
 
 Two deployments may take around 5 minutes to create a load balancer, including health checking.
@@ -137,7 +139,7 @@ curl http://${LB_IP_ADDRESS}/
 
 ### 3.1. Install the Taurus
 
-https://gettaurus.org/install/Installation/
+<https://gettaurus.org/install/Installation/>
 
 ```bash
 sudo apt-get update -y
@@ -186,11 +188,12 @@ kubectl scale deployment go-echo-api -n echo-test --replicas=0
 
 kubectl delete -f app/go-echo-api-onepod.yaml -n echo-test
 kubectl delete -f app/go-echo-api.yaml -n echo-test
+kubectl delete namespace echo-test
 ```
 
 ## References
 
-- https://echo.labstack.com
+- <https://echo.labstack.com>
 
 - [Cloud SDK > Documentation > Reference > gcloud container clusters](https://cloud.google.com/sdk/gcloud/reference/container/clusters)
 

app/Dockerfile

@@ -1,20 +1,20 @@
-FROM golang:1.18 AS builder
+FROM golang:1.23-alpine AS builder
 
-RUN mkdir /app
-
-COPY ./go.mod /app/
-COPY ./go.sum /app/
-COPY ./main.go /app/
 WORKDIR /app
 
-RUN go install
-RUN go build main.go
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o server ./
 
-RUN adduser go
-RUN chown go ./main
+FROM scratch
+
+WORKDIR /app
 
-USER go
+COPY --from=builder /app/server .
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
-EXPOSE 8000
+EXPOSE 8080
 
-CMD ["./main"]
+ENTRYPOINT ["/app/server"]

app/Makefile

@@ -1,11 +1,30 @@
+.PHONY: install build build-docker test all clean
+
+all: install build test build-docker
+
 build:
 	go build ./...
 
+build-docker:
+	docker build --progress=plain -t go-echo-api .
+
 install:
-	go install -mod=vendor -v ./...
+	go install -v ./...
+
+fmt:
+	go fmt ./...
+
+lint: fmt
+	golangci-lint run
+
+run: fmt
+	go run ./main.go
+
+run-docker:
+	docker run -it -p 8080:8080 go-echo-api:latest
 
 test:
 	go test ./...
 
 clean:
-	go clean ./...
+	go clean ./...

app/README.md

@@ -0,0 +1,11 @@
+# Build
+
+```bash
+make build
+make run
+```
+
+```bash
+make build-docker
+make run-docker
+```

app/build-and-push.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+# gcloud config set project <PROJECT_ID>
+PROJECT_ID=$(gcloud config get-value project)
+echo "PROJECT_ID: ${PROJECT_ID}"
+
+# Set your repository name
+RESPOSITORY="docker"
+
+# gcloud artifacts repositories create ${RESPOSITORY} --repository-format=docker --location=us --description="Docker repository for go-echo-api"
+
+docker build -t go-echo-api . --platform linux/amd64
+docker tag go-echo-api:latest us-docker.pkg.dev/${PROJECT_ID}/${RESPOSITORY}/go-echo-api:latest
+
+gcloud auth configure-docker us-docker.pkg.dev
+docker push us-docker.pkg.dev/${PROJECT_ID}/${RESPOSITORY}/go-echo-api:latest
+
+# docker run -it -p 8080:8080 go-echo-api:latest
+
+# docker run -it -p 8080:8080 us-docker.pkg.dev/${PROJECT_ID}/go-echo-api:latest