ci tests

.github/workflows/cd.yml

@@ -0,0 +1,50 @@
+name: Deploy
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    # This part
+    env:
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: "1.26.4"
+
+      - name: goose dependency
+        run: go install github.com/pressly/goose/v3/cmd/goose@latest
+
+
+      - name: Build
+        run: sh scripts/buildprod.sh
+
+      - name: migration
+        run: sh scripts/migrateup.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@v3'
+
+      - name: 'Use gcloud CLI'
+        run: 'gcloud info'
+
+      - name: 'Deploy to GCR'
+        run: 'gcloud builds submit --tag us-central1-docker.pkg.dev/notely-501016/notely-ar-repo/powernines/notely:latest .'
+
+      - name: Deploy to Cloud Run
+        run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-501016/notely-ar-repo/powernines/notely:latest --region us-central1 --allow-unauthenticated --project notely-501016 --max-instances=4

.github/workflows/ci.yml

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

Dockerfile

@@ -1,4 +1,5 @@
-FROM --platform=linux/amd64 debian:stable-slim
+# FROM --platform=linux/arm64 debian:stable-slim
+FROM debian:stable-slim
 
 RUN apt-get update && apt-get install -y ca-certificates
 

README.md

@@ -1,3 +1,7 @@
+![tests passing](https://github.com/ninesl/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!
+
+Lance's version of Boot.dev's Notely app

internal/auth/get_api_key_test.go

@@ -0,0 +1,46 @@
+package auth
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	tests := []struct {
+		header      string
+		headerValue string
+		wantKey     string
+		wantErr     bool
+	}{
+		{"Authorization", "ApiKey abc123", "abc123", false},
+		{"Authorization", "ApiKey abc123 extra", "abc123", false},
+		{"Authorization", "abc123 123", "abc123", true},
+		{"Authorization", "ApiKey123", "abc123", true},
+		{"Authorization ApiKey", "abc123", "abc123", true},
+		{"abc123", "abc123", "abc123", true},
+		{"", "", "", true},
+		// cases here
+	}
+	for _, testEntry := range tests {
+		headers := http.Header{}
+		headers.Set(testEntry.header, testEntry.headerValue)
+
+		key, err := GetAPIKey(headers)
+
+		if err != nil {
+			if !testEntry.wantErr {
+				t.Errorf("%+v expected no error, got %v", testEntry, err)
+			}
+			continue
+		}
+
+		if testEntry.wantErr {
+			t.Errorf("%+v expected an error, got nil, key: %v", testEntry, key)
+			continue
+		}
+
+		if key != testEntry.wantKey {
+			t.Errorf("%+v expected key %q, got %q", testEntry, testEntry.wantKey, key)
+		}
+	}
+}

json.go

@@ -25,10 +25,15 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	dat, err := json.Marshal(payload)
 	if err != nil {
+
 		log.Printf("Error marshalling JSON: %s", err)
 		w.WriteHeader(500)
 		return
 	}
 	w.WriteHeader(code)
-	w.Write(dat)
+	_, err = w.Write(dat)
+	if err != nil {
+		log.Printf("Error writing JSON to response: %s", err)
+		w.WriteHeader(500)
+	}
 }

main.go

@@ -3,10 +3,14 @@ package main
 import (
 	"database/sql"
 	"embed"
+	"fmt"
 	"io"
 	"log"
+	"math"
 	"net/http"
 	"os"
+	"strconv"
+	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/cors"
@@ -35,6 +39,13 @@ func main() {
 		log.Fatal("PORT environment variable is not set")
 	}
 
+	portNum, err := strconv.Atoi(port)
+	if err != nil {
+		log.Fatalf("PORT environment variable is not a valid port address")
+	} else if portNum < 1 || portNum > math.MaxUint16 {
+		log.Fatalf("not a valid PORT enviornment variable, out of range")
+	}
+
 	apiCfg := apiConfig{}
 
 	// https://github.com/libsql/libsql-client-go/#open-a-connection-to-sqld
@@ -89,10 +100,11 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		ReadHeaderTimeout: 30 * time.Second,
+		Addr:              fmt.Sprintf(":%d", portNum),
+		Handler:           router,
 	}
 
-	log.Printf("Serving on port: %s\n", port)
+	log.Printf("Serving on port: %d\n", portNum)
 	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">