Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.26.0"

- name: Run tests
run: go test ./... -cover

- name: Install gosec
run: go install github.com/securego/gosec/v2/cmd/gosec@latest

- name: Run gosec
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.26.0"

- name: Run style check
run: |
test -z $(go fmt ./...)
echo $?

- 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 @@
https://github.com/Salimzyanov-Lenar/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!
MYNAME's version of Boot.dev's Notely app.
57 changes: 57 additions & 0 deletions internal/auth/get_api_key_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package auth

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

func TestGetAPIKey(t *testing.T) {
tests := []struct {
name string
headers http.Header
expectedKey string
expectedErr error
}{
{
name: "No authorization header",
headers: http.Header{}, // пустой заголовок
expectedKey: "",
expectedErr: ErrNoAuthHeaderIncluded,
},
{
name: "Malformed authorization header",
headers: http.Header{
"Authorization": []string{"Bearer token"},
},
expectedKey: "",
expectedErr: errors.New("malformed authorization header"),
},
{
name: "Valid authorization header",
headers: http.Header{
"Authorization": []string{"ApiKey 12345"},
},
expectedKey: "12345",
expectedErr: nil,
},
{
name: "Invalid authorization scheme",
headers: http.Header{
"Authorization": []string{"Bearer 12345"},
},
expectedKey: "",
expectedErr: errors.New("malformed authorization header"),
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
gotKey, gotErr := GetAPIKey(tt.headers)
// Проверяем, что ключ и ошибка совпадают с ожидаемыми значениями
if gotKey != tt.expectedKey || (gotErr != nil && gotErr.Error() != tt.expectedErr.Error()) {
t.Errorf("GetAPIKey() = (%v, %v), want (%v, %v)", gotKey, gotErr, tt.expectedKey, tt.expectedErr)
}
})
}
}
4 changes: 3 additions & 1 deletion json.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
return
}
w.WriteHeader(code)
w.Write(dat)
if _, err := w.Write(dat); err != nil {
log.Printf("write error: %v", err)
}
}
17 changes: 11 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"log"
"net/http"
"os"
"strconv"
"time"

"github.com/go-chi/chi"
"github.com/go-chi/cors"
Expand All @@ -30,10 +32,12 @@ func main() {
log.Printf("warning: assuming default configuration. .env unreadable: %v", err)
}

port := os.Getenv("PORT")
if port == "" {
log.Fatal("PORT environment variable is not set")
portEnv := os.Getenv("PORT")
portInt, err := strconv.Atoi(portEnv)
if err != nil {
log.Fatal("Invalid port")
}
port := strconv.Itoa(portInt)

apiCfg := apiConfig{}

Expand Down Expand Up @@ -89,10 +93,11 @@ 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)
log.Printf("Serving on port: %q\n", port)
log.Fatal(srv.ListenAndServe())
}