Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7ef336f
Update README.md
sander-dallorto Sep 30, 2025
3c58981
Update README.md
sander-dallorto Sep 30, 2025
e13ac2b
Update README.md
sander-dallorto Sep 30, 2025
96b9286
add ci
sander-dallorto Oct 1, 2025
2f0d000
Update ci.yml
sander-dallorto Oct 1, 2025
c49326e
Testing ci
sander-dallorto Oct 1, 2025
de34f4b
Testing ci
sander-dallorto Oct 1, 2025
f5084d5
Updating ci
sander-dallorto Oct 1, 2025
bd6718a
Update readme.md
sander-dallorto Oct 1, 2025
a39bbec
add ci
sander-dallorto Oct 1, 2025
f923c66
Update ci.yml
sander-dallorto Oct 1, 2025
919e36a
Testing ci
sander-dallorto Oct 1, 2025
55c56af
Testing ci
sander-dallorto Oct 1, 2025
554a858
Updating ci
sander-dallorto Oct 1, 2025
b33098b
Update readme.md
sander-dallorto Oct 1, 2025
71a7817
Merge branch 'addtests'
sander-dallorto Oct 1, 2025
7c79243
Update README.md
sander-dallorto Oct 1, 2025
a7d6454
Update ci.yml
sander-dallorto Oct 2, 2025
e91244a
Update ci.yml
sander-dallorto Oct 2, 2025
5eabd7d
Update ci.yml
sander-dallorto Oct 2, 2025
b6340fe
Updating ci.yml
sander-dallorto Oct 2, 2025
ce8683a
Updating ci.yml
sander-dallorto Oct 2, 2025
ae2273e
Merge branch 'main' into addtests
sander-dallorto Oct 2, 2025
92ce42d
Update ci.yml
sander-dallorto Oct 3, 2025
7933fbf
Update ci.yml
sander-dallorto Oct 3, 2025
10493cb
Update ci.yml
sander-dallorto Oct 3, 2025
63ddd62
Add security check to ci.yml
sander-dallorto Oct 3, 2025
a5bfad3
Add gosec and security check to ci.yml
sander-dallorto Oct 3, 2025
68484c8
Add gosec and security step in ci.yml
sander-dallorto Oct 3, 2025
fa276d9
Fix security issues
sander-dallorto Oct 3, 2025
dcdb24b
Add cd workflow
sander-dallorto Oct 4, 2025
b59915a
Update cd.yml
sander-dallorto Oct 6, 2025
0c9854a
Update cd.yml
sander-dallorto Oct 6, 2025
623986e
Update cd.yml and index.html
sander-dallorto Oct 7, 2025
f53aa45
fix cd.yml
sander-dallorto Oct 7, 2025
8fd5583
Add goose and migrate up to cd.yml
sander-dallorto Oct 8, 2025
90012c4
Fix cd.yml migrations
sander-dallorto Oct 8, 2025
24fd987
Fix cd.yml migrations
sander-dallorto Oct 8, 2025
58c189c
Fix cd.yml migrations
sander-dallorto Oct 8, 2025
68006f3
fix stuff
sander-dallorto Oct 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
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

- name: Set up Goose
run: go install github.com/pressly/goose/v3/cmd/goose@latest

- name: Build the 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'
with:
version: '>= 363.0.0'

- name: 'Use gcloud CLI'
run: 'gcloud info'

- name: Build Docker image
run: gcloud builds submit --tag us-central1-docker.pkg.dev/notely-474312/notely-ar-repo/notely:v1 .

- name: Run migrations
run: ./scripts/migrateup.sh

- name: Deploy to run Cloud Run
run: gcloud run deploy notely --image us-central1-docker.pkg.dev/notely-474312/notely-ar-repo/notely:v1 --region us-central1 --allow-unauthenticated --project notely-474312 --max-instances=4
51 changes: 51 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.25.1"

- 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 check
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: Format code
run: test -z "$(go fmt ./...)"

- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@latest

- name: Run staticcheck
run: staticcheck ./...
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
![test badge](https://github.com/sander-dallorto/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).
Expand All @@ -21,3 +23,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!
Sander's version of Boot.dev's Notely app.
67 changes: 67 additions & 0 deletions internal/auth/auth_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package auth

import (
"errors"
"net/http"
"reflect"
"testing"
)

func TestGetAPIKey(t *testing.T) {
tests := []struct {
name string
headers http.Header
wantKey string
wantErr error
}{
{
name: "no Authorization header",
headers: http.Header{},
wantErr: ErrNoAuthHeaderIncluded,
},
{
name: "malformed Authorization header - missing ApiKey prefix",
headers: http.Header{
"Authorization": []string{"Bearer sometoken"},
},
wantErr: errors.New("malformed authorization header"),
},
{
name: "malformed Authorization header - only ApiKey with no token",
headers: http.Header{
"Authorization": []string{"ApiKey"},
},
wantErr: errors.New("malformed authorization header"),
},
{
name: "valid Authorization header",
headers: http.Header{
"Authorization": []string{"ApiKey my-secret-key"},
},
wantKey: "my-secret-key",
wantErr: nil,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
key, err := GetAPIKey(tt.headers)

if tt.wantErr != nil {
if err == nil || err.Error() != tt.wantErr.Error() {
t.Errorf("expected error %v, got %v", tt.wantErr, err)
}
return
}

if err != nil {
t.Errorf("unexpected error: %v", err)
return
}

if !reflect.DeepEqual(key, tt.wantKey) {
t.Errorf("expected key %q, got %q", tt.wantKey, key)
}
})
}
}
6 changes: 5 additions & 1 deletion json.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@ 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 writting data: %s", err)
}
}
6 changes: 4 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"log"
"net/http"
"os"
"time"

"github.com/go-chi/chi"
"github.com/go-chi/cors"
Expand Down Expand Up @@ -89,8 +90,9 @@ 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)
Expand Down
2 changes: 1 addition & 1 deletion static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down