Update README.md

.dockerignore

@@ -0,0 +1,8 @@
+.git
+.github
+README.md
+.gitignore
+**/.DS_Store
+bin
+dist
+

.github/workflows/build-and-push.yml

@@ -0,0 +1,42 @@
+name: Build & Push Notely image
+
+on:
+  push:
+    branches: [ main ]
+
+env:
+  PROJECT_ID: disco-glass-477110-u7
+  REGION: us-central1
+  REPOSITORY: notely-ar-repo
+  IMAGE: notely
+  GAR_HOST: us-central1-docker.pkg.dev
+  IMAGE_URI: us-central1-docker.pkg.dev/disco-glass-477110-u7/notely-ar-repo/notely
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+
+      - name: Configure Docker to use Artifact Registry
+        run: gcloud auth configure-docker $GAR_HOST --quiet
+
+      - name: Build image
+        run: |
+          docker build -t $IMAGE_URI:latest -t $IMAGE_URI:${{ github.sha }} .
+
+      - name: Push image (latest and sha)
+        run: |
+          docker push $IMAGE_URI:latest
+          docker push $IMAGE_URI:${{ github.sha }}

.github/workflows/cd.yml

@@ -0,0 +1,44 @@
+name: CD
+
+on:
+  push:
+    branches: [ main ]
+
+env:
+  PROJECT_ID: disco-glass-477110-u7
+  REGION: us-central1
+  REPOSITORY: notely-ar-repo
+  IMAGE: notely
+  GAR_HOST: us-central1-docker.pkg.dev
+  IMAGE_URI: us-central1-docker.pkg.dev/disco-glass-477110-u7/notely-ar-repo/notely
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+
+      - name: Set gcloud project/region
+        run: |
+          gcloud config set project $PROJECT_ID
+          gcloud config set run/region $REGION
+
+      - name: Deploy to Cloud Run
+        run: |
+          gcloud run deploy notely \
+            --image $IMAGE_URI:latest \
+            --region $REGION \
+            --platform managed \
+            --allow-unauthenticated \
+            --quiet

.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  style:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: Run go fmt check
+        run: |
+          go fmt ./...
+          go vet ./...
+

Dockerfile

@@ -1,7 +1,23 @@
-FROM --platform=linux/amd64 debian:stable-slim
+# syntax=docker/dockerfile:1
 
-RUN apt-get update && apt-get install -y ca-certificates
+############# Build stage #############
+FROM golang:1.22-alpine AS builder
+WORKDIR /app
 
-ADD notely /usr/bin/notely
+# Cache dependencies
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy source files
+COPY . .
+
+# Build a static Linux binary
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /app/notely .
+
+############# Runtime stage #############
+FROM gcr.io/distroless/static:nonroot
+COPY --from=builder /app/notely /usr/local/bin/notely
+
+USER nonroot:nonroot
+ENTRYPOINT ["/usr/local/bin/notely"]
 
-CMD ["notely"]

README.md

@@ -1,3 +1,5 @@
+![Tests](https://github.com/KaliBytes/learn-cicd-starter/actions/workflows/ci.yml/badge.svg)
+
 # learn-cicd-starter (Notely)
 
 This repo contains the starter code for the "Notely" application for the "Learn CICD" course on [Boot.dev](https://boot.dev).
@@ -21,3 +23,4 @@ go build -o notely && ./notely
 *This starts the server in non-database mode.* It will serve a simple webpage at `http://localhost:8080`.
 
 You do *not* need to set up a database or any interactivity on the webpage yet. Instructions for that will come later in the course!
+

main.go

@@ -7,8 +7,9 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/cors"
 	"github.com/joho/godotenv"
 
@@ -25,8 +26,7 @@ type apiConfig struct {
 var staticFiles embed.FS
 
 func main() {
-	err := godotenv.Load(".env")
-	if err != nil {
+	if err := godotenv.Load(".env"); err != nil {
 		log.Printf("warning: assuming default configuration. .env unreadable: %v", err)
 	}
 
@@ -37,8 +37,7 @@ func main() {
 
 	apiCfg := apiConfig{}
 
-	// https://github.com/libsql/libsql-client-go/#open-a-connection-to-sqld
-	// libsql://[your-database].turso.io?authToken=[your-auth-token]
+	// Optional DB hookup (runs without CRUD if DATABASE_URL is missing)
 	dbURL := os.Getenv("DATABASE_URL")
 	if dbURL == "" {
 		log.Println("DATABASE_URL environment variable is not set")
@@ -48,13 +47,11 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		dbQueries := database.New(db)
-		apiCfg.DB = dbQueries
+		apiCfg.DB = database.New(db)
 		log.Println("Connected to database!")
 	}
 
 	router := chi.NewRouter()
-
 	router.Use(cors.Handler(cors.Options{
 		AllowedOrigins:   []string{"https://*", "http://*"},
 		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
@@ -64,6 +61,7 @@ func main() {
 		MaxAge:           300,
 	}))
 
+	// Root serves embedded static file
 	router.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		f, err := staticFiles.Open("static/index.html")
 		if err != nil {
@@ -76,23 +74,27 @@ func main() {
 		}
 	})
 
-	v1Router := chi.NewRouter()
-
+	// v1 API routes
+	v1 := chi.NewRouter()
 	if apiCfg.DB != nil {
-		v1Router.Post("/users", apiCfg.handlerUsersCreate)
-		v1Router.Get("/users", apiCfg.middlewareAuth(apiCfg.handlerUsersGet))
-		v1Router.Get("/notes", apiCfg.middlewareAuth(apiCfg.handlerNotesGet))
-		v1Router.Post("/notes", apiCfg.middlewareAuth(apiCfg.handlerNotesCreate))
+		v1.Post("/users", apiCfg.handlerUsersCreate)
+		v1.Get("/users", apiCfg.middlewareAuth(apiCfg.handlerUsersGet))
+		v1.Get("/notes", apiCfg.middlewareAuth(apiCfg.handlerNotesGet))
+		v1.Post("/notes", apiCfg.middlewareAuth(apiCfg.handlerNotesCreate))
 	}
+	v1.Get("/healthz", handlerReadiness)
+	router.Mount("/v1", v1)
 
-	v1Router.Get("/healthz", handlerReadiness)
-
-	router.Mount("/v1", v1Router)
+	// HTTP server configured for Cloud Run
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       15 * time.Second,
+		WriteTimeout:      15 * time.Second,
+		IdleTimeout:       60 * time.Second,
 	}
 
-	log.Printf("Serving on port: %s\n", port)
+	log.Printf("Serving on port %s ...", port)
 	log.Fatal(srv.ListenAndServe())
 }