pull

.github/workflows/cd.yml

@@ -0,0 +1,47 @@
+name: cd
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+    env:
+         DATABASE_URL: ${{ secrets.DATABASE_URL }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+
+      - name: Install goose
+        run: go install github.com/pressly/goose/v3/cmd/goose@latest
+
+      - name: Build
+        run: ./scripts/buildprod.sh
+
+      - name: database migration
+        run: ./scripts/migrateup.sh
+
+      - name: Authenticate to Google Cloud
+        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: Configure Docker for Artifact Registry
+        run: gcloud auth configure-docker us-central1-docker.pkg.dev
+
+      - name: gcloud builds submit
+        run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-499416/notely-ar-repo/notely:latest 
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-499416/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project notely-499416 --max-instances=4
+
+

.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+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.26.0"
+
+      - name: go test
+        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.26.0"
+
+      - name: Check for Formatting Issues
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest

README.md

@@ -1,3 +1,4 @@
+![CI status](https://github.com/m1kab0/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 +22,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!
+Bartlomiej's version of Boot.dev's Notely app.

internal/auth/get_api_key_test.go

@@ -0,0 +1,57 @@
+package auth
+
+import (
+	"errors"
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	type testCase struct {
+		name        string
+		headers     http.Header
+		expectedKey string
+		expectedErr error
+	}
+
+	tests := []testCase{
+		{
+			name:        "no authorization header",
+			headers:     http.Header{},
+			expectedKey: "",
+			expectedErr: ErrNoAuthHeaderIncluded,
+		},
+		{
+			name: "valid API key",
+			headers: http.Header{
+				"Authorization": []string{"ApiKey my-secret-key"},
+			},
+			expectedKey: "my-secret-key",
+			expectedErr: nil,
+		},
+		{
+			name: "malformed header - missing ApiKey prefix",
+			headers: http.Header{
+				"Authorization": []string{"Bearer my-secret-key"},
+			},
+			expectedKey: "",
+			expectedErr: errors.New("malformed authorization header"),
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			key, err := GetAPIKey(tc.headers)
+
+			if tc.expectedErr != nil && err == nil {
+				t.Errorf("expected error %q, got none", tc.expectedErr)
+			}
+			if tc.expectedErr == nil && err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+			if key != tc.expectedKey {
+				t.Errorf("expected key %q, got %q", tc.expectedKey, key)
+			}
+		})
+	}
+}

json.go

@@ -30,5 +30,8 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+
+	if _, err := w.Write(dat); err != nil {
+		log.Printf("error writing response: %v", err)
+	}
 }

main.go

@@ -7,6 +7,8 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"strings"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -89,10 +91,12 @@ 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)
+	log.Printf("Serving on port: %s\n", strings.ReplaceAll(port, "\n", ""))
 	log.Fatal(srv.ListenAndServe())
+
 }

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">
@@ -21,7 +21,7 @@ <h1>Notely</h1>
         <button id="createNoteButton" onclick="createNote()">Create Note</button>
 
         <h2>Your Notes</h2>
-        <div id="notes"></div>
+        <div id='notes'></div>
 
         <button onclick="logout()">Logout</button>
     </div>
@@ -33,7 +33,7 @@ <h2>Your Notes</h2>
 
         async function createNote() {
             if (!currentUser) {
-                alert('Please create a user first');
+                alert('śPlease create a user first');
                 return;
             }
             const noteContent = document.getElementById('newNoteContent').value;