Made Minor change to header file

.github/workflows/cd.yml

@@ -0,0 +1,53 @@
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    #Get the database url from Github secrets and put it in an environment variable for the job to access
+    env:
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        # yaml
+      #- name: Mark workspace as safe
+      #  run: |
+      #    git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.1"
+
+      # Must install goose after setting up Go
+      - name: Install Goose
+        run: go install github.com/pressly/goose/v3/cmd/goose@latest
+
+      - name: Build Application
+        run: ./scripts/buildprod.sh
+
+      - name: Set up gcloud auth
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+          project_id: balmy-elf-474204-h5
+
+      - name: Set up gcloud
+        uses: google-github-actions/setup-gcloud@v3
+
+      - name: Build and push image to Artifact Registry
+        run: |
+          gcloud builds submit --tag us-central1-docker.pkg.dev/balmy-elf-474204-h5/notely-ar-repo/notely:latest .
+
+      - name: Migrate Database
+        run: ./scripts/migrateup.sh
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/balmy-elf-474204-h5/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project balmy-elf-474204-h5 --max-instances=4

.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.25.1"
+
+      - name: Test Go code
+        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.25.1"
+
+      - name: Check code style
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: run staticcheck
+        run: staticcheck ./...

.gitignore

@@ -2,3 +2,5 @@ out
 .env
 learn-cicd-starter
 notely
+google-cloud-cli-linux-x86_64.tar.gz
+google-cloud-sdk/

README.md

@@ -1,3 +1,7 @@
+![Test Verification Status](https://github.com/reiffle/learn-cicd-starter/actions/workflows/ci.yml/badge.svg)
+
+![Test Verification Status](https://github.com/reiffle/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 +25,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!
+
+"Peder's version of Boot.dev's Notely app."

internal/auth/auth_test.go

@@ -0,0 +1,69 @@
+package auth
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	// Create slice of test cases
+	tests := []struct {
+		name       string
+		headers    http.Header
+		wantKey    string
+		expectErr  bool
+		errMessage string
+	}{
+		//First test case: No Authorization Header
+		{
+			name:       "No Authorization Header",
+			headers:    http.Header{}, // Empty headers
+			expectErr:  true,
+			errMessage: "no authorization header included",
+		},
+		//Second test case: Malformed Authorization Header - No Space
+		{
+			name: "Malformed Authorization Header - No Space",
+			headers: http.Header{
+				"Authorization": []string{"ApiKey12345"}, //http.Header in Go is defined as map[string][]string
+			},
+			expectErr:  true,
+			errMessage: "malformed authorization header",
+		},
+		//Third test case: Malformed Authorization Header - Wrong Scheme
+		{
+			name: "Malformed Authorization Header",
+			headers: http.Header{
+				"Authorization": []string{"Bearer 12345"},
+			},
+			expectErr:  true,
+			errMessage: "malformed authorization header",
+		},
+		//Fourth test case: Valid Authorization Header
+		{
+			name: "Valid Authorization Header",
+			headers: http.Header{
+				"Authorization": []string{"ApiKey 12345"},
+			},
+			wantKey:   "12345",
+			expectErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotKey, err := GetAPIKey(tt.headers)
+			if (err != nil) != tt.expectErr { // Check if error presence matches expectation (True/False)
+				t.Errorf("GetAPIKey() error = %v, expectErr %v", err, tt.expectErr)
+				return
+			}
+			if err != nil && !strings.Contains(err.Error(), tt.errMessage) { // Check if error message contains expected substring
+				t.Errorf("GetAPIKey() error = %v, expected error message to contain %v", err, tt.errMessage)
+			}
+			if gotKey != tt.wantKey { // Check if returned key matches expected key
+				t.Errorf("GetAPIKey() gotKey = %v, want %v", gotKey, tt.wantKey)
+			}
+		})
+	}
+}

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 response: %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,10 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:         ":" + port,
+		Handler:      router,
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 7 * 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">