diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 00000000000..a442d5c9080 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,55 @@ +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: Buildapp + run: ./scripts/buildprod.sh + + - name: Authenticate to Google Cloud + uses: google-github-actions/auth@v2 + with: + credentials_json: ${{ secrets.GCP_CREDENTIALS }} + + - name: Setup gcloud CLI + uses: google-github-actions/setup-gcloud@v3 + + - name: Build and push Docker image + run: | + gcloud builds submit \ + --tag us-central1-docker.pkg.dev/notely-485922/notely-ar-repo/notely:latest . + + - name: Install goose + run: | + go install github.com/pressly/goose/v3/cmd/goose@latest + + + - name: Migration to Turso + run: ./scripts/migrateup.sh + + + - name: Deploy to Cloud Run + run: | + gcloud run deploy notely \ + --image us-central1-docker.pkg.dev/notely-485922/notely-ar-repo/notely:latest \ + --region us-central1 \ + --allow-unauthenticated \ + --max-instances=4 + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000000..0d104f3ab07 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,49 @@ +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 unit test + run: go test ./... -cover + + - name: Install gosec + run: go install github.com/securego/gosec/v2/cmd/gosec@latest + + - name: gosec 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: styletest + run: test -z $(go fmt ./...) + + - name: Install staticcheck + run: go install honnef.co/go/tools/cmd/staticcheck@latest + + + diff --git a/README.md b/README.md index c2bec0368b7..1a230220d88 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[](https://github.com/OIRDEdev/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 +22,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! +OIRDEdev version of boot.dev's dev Notely app \ No newline at end of file diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go new file mode 100644 index 00000000000..f4b1a0e6357 --- /dev/null +++ b/internal/auth/auth_test.go @@ -0,0 +1,64 @@ +package auth + +import ( + "net/http" + "testing" +) + +func TestGetAPIKey(t *testing.T) { + tests := []struct { + name string + headers http.Header + wantKey string + wantError bool + }{ + { + name: "success - valid ApiKey header", + headers: http.Header{ + "Authorization": []string{"ApiKey abc123"}, + }, + wantKey: "abc123", + wantError: false, + }, + { + name: "error - missing Authorization header", + headers: http.Header{}, + wantKey: "", + wantError: true, + }, + { + name: "error - malformed header missing key", + headers: http.Header{ + "Authorization": []string{"ApiKey"}, + }, + wantKey: "", + wantError: true, + }, + { + name: "error - wrong auth type", + headers: http.Header{ + "Authorization": []string{"Bearer abc123"}, + }, + wantKey: "", + wantError: true, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + key, err := GetAPIKey(tt.headers) + + if tt.wantError && err == nil { + t.Fatalf("expected error, got nil") + } + + if !tt.wantError && err != nil { + t.Fatalf("did not expect error, got %v", err) + } + + if key != tt.wantKey { + t.Fatalf("expected key %q, got %q", tt.wantKey, key) + } + }) + } +} diff --git a/json.go b/json.go index 1e6e7985e18..53255d5ae01 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) + + if _, err := w.Write(dat); err != nil { + log.Printf(("Erro")) + } } diff --git a/main.go b/main.go index 19d7366c5f7..64ac31fa23d 100644 --- a/main.go +++ b/main.go @@ -89,8 +89,9 @@ func main() { router.Mount("/v1", v1Router) srv := &http.Server{ - Addr: ":" + port, - Handler: router, + Addr: ":" + port, + Handler: router, + ReadHeaderTimeout: 5000, } log.Printf("Serving on port: %s\n", port) diff --git a/static/index.html b/static/index.html index 72be101028c..04afc09b743 100644 --- a/static/index.html +++ b/static/index.html @@ -7,7 +7,7 @@
-