Fix cd workflow clean

.env.save

@@ -0,0 +1,2 @@
+exit
+PORT=8888

.github/workflows/cd.yml

@@ -0,0 +1,81 @@
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+<<<<<<< HEAD
+=======
+    # Add permissions for the job
+    permissions:
+      contents: "read"
+      id-token: "write"
+
+>>>>>>> 3b4c6ab (Fix Docker image tag in CD workflow)
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22.2"
+
+      - name: Build app
+        run: ./scripts/buildprod.sh
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    # Add permissions for the job
+    permissions:
+      contents: "read"
+      id-token: "write"
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22.2"
+
+      - name: Build app
+        run: ./scripts/buildprod.sh
+
+      # Setup gcloud after buildprod runs
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
+        with:
+          service_account_key: ${{ secrets.GCP_CREDENTIALS }}
+          project_id: notely-459323
+
+      # Build and push Docker image
+      - name: "Build and push Docker image"
+        run: "gcloud builds submit --tag us-central1-docker.pkg.dev/notely-459323/notely/notely-app:latest ."<<<<<<< HEAD
+=======
+
+      # Setup gcloud after buildprod runs
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
+        with:
+          service_account_key: ${{ secrets.GCP_CREDENTIALS }}
+          project_id: notely-459323
+
+      # Build and push Docker image
+      - name: "Build and push Docker image"
+        run: "gcloud builds submit --tag us-central1-docker.pkg.dev/notely-459323/notely/notely-app:latest ."
+>>>>>>> 3b4c6ab (Fix Docker image tag in CD workflow)

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  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.22.2"
+
+      - name: Run unit tests
+        run: go test ./... -cover
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Run gosec
+        run: gosec ./...
+
+  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.22.2"
+
+      - name: Check formatting
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: Run staticcheck
+        run: staticcheck ./...

README.md

@@ -1,5 +1,7 @@
 # learn-cicd-starter (Notely)
 
+[![ci](https://github.com/OldGambler/learn-cicd-starter/actions/workflows/ci.yml/badge.svg)
+
 This repo contains the starter code for the "Notely" application for the "Learn CICD" course on [Boot.dev](https://boot.dev).
 
 ## Local Development
@@ -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!
+
+"Matt's version of Boot.dev's Notely app."

internal/auth/auth_test.go

@@ -0,0 +1,56 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	testCases := []struct {
+		name        string
+		authHeader  string
+		expected    string
+		expectError bool
+	}{
+		{
+			name:        "Valid Token",
+			authHeader:  "ApiKey Jojo",
+			expected:    "Jojo",
+			expectError: false,
+		},
+		{
+			name:        "Bearer instead of ApiKey",
+			authHeader:  "Bearer L",
+			expected:    "Kira",
+			expectError: true,
+		},
+		{
+			name:        "Empty Header",
+			authHeader:  "",
+			expected:    "",
+			expectError: true,
+		},
+		{
+			name:        "No Token",
+			authHeader:  "ApiKey ",
+			expected:    "",
+			expectError: false,
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			headers := make(http.Header)
+			headers.Add("Authorization", tc.authHeader)
+			apiKey, err := GetAPIKey(headers)
+			if tc.expectError && err == nil {
+				t.Fatalf("expected error but got none")
+			}
+			if !tc.expectError && err != nil {
+				t.Fatalf("expected no error but got: %v", err)
+			}
+			if err == nil && apiKey != tc.expected {
+				t.Fatalf("expected API key %q, got %q", tc.expected, apiKey)
+			}
+		})
+	}
+}

json.go

@@ -30,5 +30,8 @@ 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 writing dat: %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: 10 * time.Second,
 	}
 
 	log.Printf("Serving on port: %s\n", port)