Addtests

.github/workflows/cd.yml

@@ -0,0 +1,49 @@
+name: cd
+
+on:
+    push:
+      branches: [main]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    env:
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+
+    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: Install goose
+          run: |
+            go install github.com/pressly/goose/v3/cmd/goose@latest
+            echo "$HOME/go/bin" >> $GITHUB_PATH
+
+        - name: Build the app
+          run: |
+            chmod +x scripts/buildprod.sh
+            ./scripts/buildprod.sh
+
+        - id: 'auth'
+          uses: 'google-github-actions/auth@v1'
+          with:
+            credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
+
+        - name: 'Set up Cloud SDK'
+          uses: 'google-github-actions/setup-gcloud@v1'
+
+        - name: Build and Push Docker Image
+          run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-458513/notely-ar-repo/notely:latest .
+
+        - name: Run migrations
+          run: ./scripts/migrateup.sh
+
+        - name: Deploy to Cloud Run
+          run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-458513/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project notely-458513 --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.23.0"
+
+      - name: Run tests with coverage
+        run: go test ./... -cover
+
+      - name: Install gosec
+        run: go install github.com/securego/gosec/v2/cmd/gosec@latest
+
+      - name: Run security checks
+        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.23.0"
+
+      - name: Run formatting check
+        run: test -z $(go fmt ./...)
+
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: Run linting check
+        run: test -z $(staticcheck ./...)

README.md

@@ -1,3 +1,5 @@
+[![ci](https://github.com/TomasMoralesT/learn-cicd-starter/actions/workflows/ci.yml/badge.svg?branch=addtests)](https://github.com/TomasMoralesT/learn-cicd-starter/actions/workflows/ci.yml)
+
 # 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!
+
+Tomas Morales's version of Boot.dev's Notely app.

go.mod

@@ -12,6 +12,7 @@ require (
 
 require (
 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/klauspost/compress v1.15.15 // indirect
 	github.com/libsql/sqlite-antlr4-parser v0.0.0-20230802215326-5cb5bb604475 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect

go.sum

@@ -28,6 +28,8 @@ github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgj
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

internal/auth/auth_test.go

@@ -0,0 +1,65 @@
+package auth
+
+import (
+	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestGetAPIKey(t *testing.T) {
+	tests := map[string]struct {
+		headers       http.Header
+		expectedKey   string
+		expectedError error
+	}{
+		"valid api key": {
+			headers: http.Header{
+				"Authorization": []string{"ApiKey abcd1234"},
+			},
+			expectedKey:   "abcd1234",
+			expectedError: nil,
+		},
+		"no auth header": {
+			headers:       http.Header{},
+			expectedKey:   "",
+			expectedError: ErrNoAuthHeaderIncluded,
+		},
+		"malformed header - missing ApiKey prefix": {
+			headers: http.Header{
+				"Authorization": []string{"abcd1234"},
+			},
+			expectedKey:   "",
+			expectedError: errors.New("malformed authorization header"),
+		},
+		"malformed header - empty after prefix": {
+			headers: http.Header{
+				"Authorization": []string{"ApiKey "},
+			},
+			expectedKey:   "",
+			expectedError: nil,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			key, err := GetAPIKey(tc.headers)
+
+			// Compare the key using cmp.Diff
+			if diff := cmp.Diff(tc.expectedKey, key); diff != "" {
+				t.Errorf("key mismatch (-want +got):\n%s", diff)
+			}
+
+			// For errors, we might use a custom comparison
+			if (tc.expectedError == nil) != (err == nil) {
+				t.Errorf("error existence mismatch: expected %v, got %v", tc.expectedError, err)
+			} else if tc.expectedError != nil && err != nil {
+				// If both errors exist, compare their messages
+				if tc.expectedError.Error() != err.Error() {
+					t.Errorf("error mismatch: expected %v, got %v", tc.expectedError, err)
+				}
+			}
+		})
+	}
+}

json.go

@@ -30,5 +30,10 @@ 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,9 @@ func main() {
 
 	router.Mount("/v1", v1Router)
 	srv := &http.Server{
-		Addr:    ":" + port,
-		Handler: router,
+		Addr:              ":" + port,
+		Handler:           router,
+		ReadHeaderTimeout: 5 * 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">