Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coupergateway/couper
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.13.0
Choose a base ref
...
head repository: coupergateway/couper
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 10 commits
  • 2,126 files changed
  • 6 contributors

Commits on Sep 24, 2024

  1. Bump rollup from 4.14.1 to 4.22.4 in /docs/website (#852)

    Bumps [rollup](https://github.com/rollup/rollup) from 4.14.1 to 4.22.4.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v4.14.1...v4.22.4)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Sep 24, 2024
    Copy the full SHA
    fb461fd View commit details

Commits on Dec 3, 2024

  1. Bump nuxt from 3.11.2 to 3.13.2 in /docs/website (#854)

    Bumps [nuxt](https://github.com/nuxt/nuxt/tree/HEAD/packages/nuxt) from 3.11.2 to 3.13.2.
    - [Release notes](https://github.com/nuxt/nuxt/releases)
    - [Commits](https://github.com/nuxt/nuxt/commits/v3.13.2/packages/nuxt)
    
    ---
    updated-dependencies:
    - dependency-name: nuxt
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 3, 2024
    Copy the full SHA
    1f75816 View commit details
  2. 717 jwt dpop (#763)

    * config attribute for DPoP
    
    * implement DPoP (part 1: retrieve DPoP token); TODO: retrieve and validate DPoP proof
    
    * implement DPoP (part 2: retrieve and validate DPoP proof)
    
    * JWT tests for DPoP
    
    * default error handler for DPoP JWT; integration test for DPoP JWT
    
    * normalize URLs prior to htu claim check
    
    * extracted getParserForExpectedClaims()
    
    * extracted validateProofHeader()
    
    * extracted validateProofClaims()
    
    * extracted validateHtuClaim()
    
    * extracted validateIatClaim()
    
    * extracted validateAthClaim()
    
    * extracted validateCnfClaim()
    
    * extracted getReqHtu() and getPcHtu()
    
    * extracted getJwkAndPubKey()
    
    * extracted getRSAPubKey() and getECDSAPubKey()
    
    * extracted getN(), getE(), getCurve(), getX() and getY()
    
    * extracted getProof()
    
    * use text from rfc9449
    
    * simplified requiredMembers map
    
    * rearranged more functions
    
    * made TokenSource interface with different implementations depending on type
    
    * fixed staticcheck issue
    
    * created ProofClaims implementing jwt.ClaimsValidator interface
    
    * moved DPoP-related stuff to separate file
    
    * refactored htu check, re-added comment about nonce check
    
    * dpop beta feature
    
    ---------
    
    Co-authored-by: Johannes Koch <johannes.koch@avenga.com>
    Co-authored-by: Marcel Ludwig <mail@marcel.dev>
    3 people authored Dec 3, 2024
    Copy the full SHA
    554c769 View commit details
  3. Copy the full SHA
    503ab03 View commit details
  4. Bump axios from 1.6.7 to 1.7.8 in /docs/website (#858)

    Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.8.
    - [Release notes](https://github.com/axios/axios/releases)
    - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
    - [Commits](axios/axios@v1.6.7...v1.7.8)
    
    ---
    updated-dependencies:
    - dependency-name: axios
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 3, 2024
    Copy the full SHA
    92cf56f View commit details

Commits on Dec 15, 2024

  1. Copy the full SHA
    17d6bee View commit details

Commits on Feb 1, 2025

  1. Chore/go version 1 23 (#862)

    * chore: upgrade go version to 1.23
    
    * chore: update all direct dependencies
    
    * chore: rm vendor dir from repo
    
    * chore: revert hcl pkg update; needs work due to custom things
    
    * update changelog /w go update
    
    * ci: add go mod download calls to pipeline
    
    * Change test command to pkg loop due to test output streaming issue
    
    See golang/go#46959
    
    * test: rm obsolete wait for port from NewRun test
    malud authored Feb 1, 2025
    Copy the full SHA
    3156b16 View commit details
  2. Copy the full SHA
    660aeaf View commit details

Commits on Feb 11, 2025

  1. Copy the full SHA
    9a89c3d View commit details
  2. update indrect deps

    malud committed Feb 11, 2025
    Copy the full SHA
    fcb060c View commit details
Showing 2,126 changed files with 4,298 additions and 641,858 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -31,6 +31,9 @@ jobs:
- name: Set up Go 1.x in order to write go.list file
uses: actions/setup-go@v5.0.0

- name: Dependencies
run: go mod download

- name: WriteGoList
run: go list -json -mod=readonly -m all > go.list

2 changes: 1 addition & 1 deletion .github/workflows/docs-website.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5.0.0
with:
go-version: '1.22'
go-version: '1.23'
id: go
- run: go version

4 changes: 3 additions & 1 deletion .github/workflows/go-coverage.yml
Original file line number Diff line number Diff line change
@@ -17,8 +17,10 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5.0.0
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
- name: Dependencies
run: go mod download
- name: 'test & report'
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
8 changes: 7 additions & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ on:
- '.github/workflows/weekly-fuzz.yml'
- 'docs/**'
pull_request:
paths:
- '!*.MD'
- '!docs/**'

jobs:
build:
@@ -21,13 +24,16 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5.0.0
with:
go-version: '1.22'
go-version: '1.23'
id: go
- run: go version

- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Dependencies
run: go mod download

- name: Source-Code formatting
run: test -z $(go fmt ./...)

4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
goos: ${{ matrix.goos }}
goarch: ${{ matrix.goarch }}
goversion: '1.22'
goversion: '1.23'
binary_name: 'couper'
ldflags: '-X ${{ env.VERSION_PACKAGE }}.VersionName=${{ github.ref_name }} -X ${{ env.VERSION_PACKAGE }}.BuildName=${{ steps.vars.outputs.sha_short }} -X ${{ env.VERSION_PACKAGE }}.BuildDate=${{ steps.vars.outputs.build_date }}'
sha256sum: true
@@ -132,7 +132,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5.0.0
with:
go-version: '1.22'
go-version: '1.23'
- name: 'install assets-uploader'
run: go install github.com/wangyoucao577/assets-uploader/...@v0.13.0
- name: 'upload signed binary archive'
2 changes: 1 addition & 1 deletion .github/workflows/weekly-fuzz.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5.0.0
with:
go-version: '1.22'
go-version: '1.23'
id: go
- run: go version

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*.out

.vscode/settings.json
.idea

#binary
/couper
@@ -26,3 +27,5 @@ docs/website/.vite
# tls
/*.crt
/*.key

vendor
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,10 @@

Unreleased changes are available as `coupergateway/couper:edge` container.

* **Dependencies**
* build with go 1.23 ([#862](https://github.com/coupergateway/couper/pull/862))
* hcl 2.23.0 and go-cty 1.16.2 ([#816](https://github.com/coupergateway/couper/pull/816))

---

## [1.13.0](https://github.com/coupergateway/couper/releases/tag/v1.13.0)
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

WORKDIR /go/src/app
COPY . .

ENV GOFLAGS="-mod=vendor" \
VERSION_PACKAGE="github.com/coupergateway/couper/utils"
ENV VERSION_PACKAGE="github.com/coupergateway/couper/utils"

RUN go mod download

RUN go generate && \
CGO_ENABLED=0 go build -v \
16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: docker-telemetry build generate image
.PHONY: test test-docker coverage test-coverage convert-test-coverage test-coverage-show

GO_VERSION := 1.22
GO_VERSION := 1.23

build:
go build -race -v -o couper main.go
@@ -25,7 +25,19 @@ image:
docker build -t coupergateway/couper:latest .

test:
go test -v -short -race -count 1 -timeout 300s ./...
@echo "Running tests..."
@for PACKAGE in $$(go list ./...); do \
echo "Testing $$PACKAGE"; \
if go test -v -timeout 90s -race -count=1 $$PACKAGE; then \
echo "\033[32m✔ $$PACKAGE PASSED\033[0m"; \
else \
echo "\033[31m✖ $$PACKAGE FAILED\033[0m"; \
exit 1; \
fi; \
done
@echo "\033[32m✔ All tests passed!\033[0m"



test-docker:
docker run --rm -v $(CURDIR):/go/app -w /go/app golang:$(GO_VERSION) sh -c "go test -short -count 1 -v -timeout 300s -race ./..."
Loading