diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 00000000000..874dbcbe83f
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,52 @@
+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@v6
+
+ - name: Set up Go
+ uses: actions/setup-go@v6
+ with:
+ go-version: "1.27.1"
+
+ - name: Build app
+ run: ./scripts/buildprod.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: Build to gcloud
+ run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-507309/notely-ar-repo/notely:latest .
+
+ - name: Install goose
+ run: go install github.com/pressly/goose/v3/cmd/goose@latest
+
+ - name: Migrations to database
+ run: ./scripts/migrateup.sh
+
+ - name: Git diff
+ run: git diff
+
+ - name: Deploy to Cloud Run
+ run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-507309/notely-ar-repo/notely:latest --region us-central1 --allow-unauthenticated --project notely-507309 --max-instances=4
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000000..f7193d7e497
--- /dev/null
+++ b/.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@v6
+
+ - name: Set up Go
+ uses: actions/setup-go@v6
+ with:
+ go-version: "1.26.0"
+
+ - name: Test Go code with coverage
+ 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: Check code formatting
+ run: test -z $(go fmt ./...)
+
+ - name: Install staticcheck
+ run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+ - name: Check code for linting errors
+ run: staticcheck ./...
\ No newline at end of file
diff --git a/README.md b/README.md
index c2bec0368b7..8ced62c4e4f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+
+
# 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!
+
+Marun's version of Boot.dev's Notely app.
\ No newline at end of file
diff --git a/internal/auth/get_api_key_test.go b/internal/auth/get_api_key_test.go
new file mode 100644
index 00000000000..5ac1cd99d36
--- /dev/null
+++ b/internal/auth/get_api_key_test.go
@@ -0,0 +1,62 @@
+package auth
+
+import (
+ "fmt"
+ "net/http"
+ "strings"
+ "testing"
+)
+
+func TestGetAPIKey(t *testing.T) {
+ tests := []struct {
+ key string
+ value string
+ expect string
+ expectErr string
+ }{
+ {
+ expectErr: "no authorization header",
+ },
+ {
+ key: "Authorization",
+ expectErr: "no authorization header",
+ },
+ {
+ key: "Authorization",
+ value: "-",
+ expectErr: "malformed authorization header",
+ },
+ {
+ key: "Authorization",
+ value: "Bearer xxxxxx",
+ expectErr: "malformed authorization header",
+ },
+ {
+ key: "Authorization",
+ value: "ApiKey xxxxxx",
+ expect: "xxxxxx",
+ expectErr: "not expecting an error",
+ },
+ }
+
+ for i, test := range tests {
+ t.Run(fmt.Sprintf("TestGetAPIKey Case #%v:", i), func(t *testing.T) {
+ header := http.Header{}
+ header.Add(test.key, test.value)
+
+ output, err := GetAPIKey(header)
+ if err != nil {
+ if strings.Contains(err.Error(), test.expectErr) {
+ return
+ }
+ t.Errorf("Unexpected: TestGetAPIKey:%v\n", err)
+ return
+ }
+
+ if output != test.expect {
+ t.Errorf("Unexpected: TestGetAPIKey:%s", output)
+ return
+ }
+ })
+ }
+}
diff --git a/json.go b/json.go
index 1e6e7985e18..c529c90c124 100644
--- a/json.go
+++ b/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("Critical error writing response: %s", err)
+ }
}
diff --git a/main.go b/main.go
index 19d7366c5f7..2471bb07bc3 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,8 @@ import (
"log"
"net/http"
"os"
+ "strconv"
+ "time"
"github.com/go-chi/chi"
"github.com/go-chi/cors"
@@ -89,10 +91,10 @@ func main() {
router.Mount("/v1", v1Router)
srv := &http.Server{
- Addr: ":" + port,
- Handler: router,
+ Addr: ":" + port,
+ Handler: router,
+ ReadTimeout: 15 * time.Second,
}
-
- log.Printf("Serving on port: %s\n", port)
+ log.Printf("Serving on port: %s", strconv.Quote(port))
log.Fatal(srv.ListenAndServe())
}
diff --git a/static/index.html b/static/index.html
index 00a891ddd80..a56ade52284 100644
--- a/static/index.html
+++ b/static/index.html
@@ -7,7 +7,7 @@
- Notely
+ Welcome to Notely