merge

.github/workflows/cd.yml

@@ -0,0 +1,50 @@
+name: Deployment
+
+on:
+  push:
+    branches: [main]
+jobs: 
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    env:
+        DATABASE_URL: ${{ secrets.DATABASE_URL }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install goose
+        run: |
+          go install github.com/pressly/goose/v3/cmd/goose@latest
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: "1.22"
+
+      - name: Build
+        run: ./scripts/buildprod.sh
+
+      - id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: Use gcloud CLI
+        run: gcloud info
+
+      - name: Build and push image to Google Cloud
+        run: |
+          gcloud builds submit --tag us-central1-docker.pkg.dev/notely-452202/notely-ar-repo/notely:latest .
+
+      - name: Run database migrations
+        run: ./scripts/migrateup.sh
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-452202/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project notely-452202 --max-instances=4

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  style:
+    name: Style
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.0"
+
+      - name: Check Format
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.0"
+
+      - name: Check go's version
+        run: go test ./... -cover
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: security check
+        run: gosec ./...

README.md

@@ -1,3 +1,5 @@
+![Build Status](https://github.com/vannestbun/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,5 @@ 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!
+
+Vannest's version of Boot.dev's Notely app, add more a bit

internal/auth/auth_test.go

@@ -0,0 +1,43 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	testCases := []struct {
+		name           string
+		headers        http.Header
+		expectedAPIKey string
+		expectedError  error
+	}{
+		{
+			name:           "Valid API Key",
+			headers:        http.Header{"Authorization": {"ApiKey valid-api-key"}},
+			expectedAPIKey: "valid-api-key",
+			expectedError:  nil,
+		},
+		{
+			name:           "No Authorization Header",
+			headers:        http.Header{},
+			expectedAPIKey: "",
+			expectedError:  ErrNoAuthHeaderIncluded,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			apiKey, err := GetAPIKey(tc.headers)
+
+			if tc.expectedError != nil && err == nil {
+				t.Errorf("Test Case: %s - Expected error, but got none", tc.name)
+				return // Stop if error was expected but not received
+			}
+
+			if apiKey != tc.expectedAPIKey {
+				t.Errorf("Test Case: %s - API Key - Expected '%s', got '%s'", tc.name, tc.expectedAPIKey, apiKey)
+			}
+		})
+	}
+}

json.go

@@ -27,5 +27,9 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+
+	_, err = w.Write(dat)
+	if err != nil {
+		log.Printf("Error marshalling JSON: %s", err)
+	}
 }

main.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -89,8 +90,9 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 30 * time.Second,
 	}
 
 	log.Printf("Serving on port: %s\n", port)

static/index.html

@@ -7,7 +7,7 @@
 </head>
 
 <body class="section">
-    <h1>Notely</h1>
+    <h1>Welcome to Notely</h1>
 
     <div id="userCreationContainer" class="section">
         <input id="nameField" type="text" placeholder="Enter your name">