Skip to content
Open

fs #2194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ab74d87
dodano imie do README
KMlynkowiak Dec 16, 2025
e85f0a1
Merge pull request #1 from KMlynkowiak/addtests
KMlynkowiak Dec 16, 2025
76f9d38
dodano imie do README
KMlynkowiak Dec 16, 2025
61449b6
Dodano konfigurację GitHub Actions (ci.yml)
KMlynkowiak Dec 16, 2025
05e0ff2
Przeniesiono ci.yml do .github/workflows
KMlynkowiak Dec 16, 2025
dae1b7c
another test added
KMlynkowiak Dec 16, 2025
89db7d5
Add unit tests for GetAPIKey function
KMlynkowiak Dec 16, 2025
52258e4
breking some code to run tests
KMlynkowiak Dec 16, 2025
f9df7cf
fixing code
KMlynkowiak Dec 16, 2025
d8a7aee
added coverage to tests
KMlynkowiak Dec 16, 2025
acd325f
added coverage to tests
KMlynkowiak Dec 16, 2025
2dd68df
added coverage to tests
KMlynkowiak Dec 16, 2025
56c371e
added a BADGEgit add .
KMlynkowiak Dec 16, 2025
251c178
Merge pull request #3 from KMlynkowiak/addtests
KMlynkowiak Dec 16, 2025
dffc7ed
Added new Style-Test
KMlynkowiak Dec 16, 2025
5f2e17c
addig static check test, and a bug in code for tests
KMlynkowiak Dec 16, 2025
3c32899
addig static check test
KMlynkowiak Dec 16, 2025
c361cb4
addig static check test
KMlynkowiak Dec 16, 2025
f3be15a
security checks
KMlynkowiak Dec 16, 2025
d19d8f5
.
KMlynkowiak Dec 16, 2025
4f06b67
feat: Added Continuous Delivery workflow cd.yml
KMlynkowiak Dec 16, 2025
07a2b32
sdfsdf Merge branch 'main' of https://github.com/KMlynkowiak/learn-ci…
KMlynkowiak Dec 16, 2025
6ac8dcb
.
KMlynkowiak Dec 16, 2025
dd5d25d
Add Cloud Build submit step
KMlynkowiak Dec 16, 2025
e716630
Trigger CD again
KMlynkowiak Dec 16, 2025
4ffe10a
deploy on cloud run
KMlynkowiak Dec 17, 2025
cd19c7b
goose and other shit
KMlynkowiak Dec 17, 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
46 changes: 46 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
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.25.1"

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

- name: Build app
run: ./scripts/buildprod.sh

- name: Run migrations
run: ./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@v2

- name: Build and push Docker image
run: gcloud builds submit --tag us-central1-docker.pkg.dev/graceful-goods-481417-n7/notely-ar-repo/notely-api:latest .

- name: Deploy to Cloud Run
run: gcloud run deploy notely --image us-central1-docker.pkg.dev/graceful-goods-481417-n7/notely-ar-repo/notely-api:latest --region us-central1 --allow-unauthenticated --project graceful-goods-481417-n7 --max-instances=4
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
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: 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: # <--- TWÓJ NOWY JOB
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: Style
run: test -z $(go fmt ./...)

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

- name: Run staticcheck
run: staticcheck ./...


4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
![BADGE](https://github.com/<OWNER>/<REPOSITORY>/actions/workflows/<WORKFLOW_FILE>/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,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!

Kacper's version of Boot.dev's Notely apdp.
36 changes: 36 additions & 0 deletions internal/auth/get_api_key_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package auth

import (
"net/http"
"testing"
)

func TestGetAPIKey(t *testing.T) {
// Create headers with a correct Authorization header
headers := http.Header{}
headers.Set("Authorization", "ApiKey my-secret-key")

// Call the function we're testing
apiKey, err := GetAPIKey(headers)

// We expect NO error for a valid header
if err != nil {
t.Errorf("Expected no error, but got: %v", err)
}

// We expect the API key to be "my-secret-key"
if apiKey != "my-secret-key" {
t.Errorf("Expected 'my-secret-key', but got: %s", apiKey)
}
headers2 := http.Header{}
// Call the function we're testing
apiKey2, err2 := GetAPIKey(headers2)
// We expect an error for missing header
if err2 == nil {
t.Errorf("Expected an error for missing header, but got none")
}
if apiKey2 != "" {
t.Errorf("Expected empty API key for missing header, but got: %s", apiKey2)
}

}
7 changes: 6 additions & 1 deletion json.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,10 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
return
}
w.WriteHeader(code)
w.Write(dat)
_, err = w.Write(dat) // W Go, ignorujemy liczbę bajtów za pomocą _
if err != nil {
// Jeśli zapis się nie uda, po prostu logujemy to. Klient i tak nie otrzyma nic więcej.
log.Println("error writing response:", err)
return
}
}
8 changes: 6 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,11 @@ func main() {

router.Mount("/v1", v1Router)
srv := &http.Server{
Addr: ":" + port,
Handler: router,
Addr: ":" + port,
Handler: router,
ReadHeaderTimeout: 5 * time.Second, // Dajemy 5 sekund na nagłówki
WriteTimeout: 5 * time.Second, // Dajemy 5 sekund na zapis odpowiedzi
IdleTimeout: 60 * time.Second, // Dajmy 60 sekund na utrzymanie bezczynnego połączenia
}

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