From 6258879129df26238df01d759c41bb65f8f0e547 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:05:52 +0200 Subject: [PATCH 1/6] Update namespace from krakendio to krakend --- go.mod | 4 +++- go.sum | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e11032d..2e966b0 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,5 @@ -module github.com/krakendio/httpcache +module github.com/krakend/httpcache go 1.19 + +require github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5 diff --git a/go.sum b/go.sum index e69de29..4f682c9 100644 --- a/go.sum +++ b/go.sum @@ -0,0 +1,2 @@ +github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5 h1:gB5divkol6FZK6OVGjh7odTsOY3FAESpeq9qyAVCZkc= +github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5/go.mod h1:VWTP3MZHr/W9OauBMrOQ2bD1rIjDetAQo5JbXCezYKE= From b79ebfcdc40c078dbf9e7e455c5b0c09d66bae7e Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:23:27 +0200 Subject: [PATCH 2/6] fix cyclic dependency --- go.mod | 2 -- go.sum | 2 -- test/test.go | 2 +- test/test_test.go | 4 ++-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 2e966b0..9aa16e0 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,3 @@ module github.com/krakend/httpcache go 1.19 - -require github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5 diff --git a/go.sum b/go.sum index 4f682c9..e69de29 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +0,0 @@ -github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5 h1:gB5divkol6FZK6OVGjh7odTsOY3FAESpeq9qyAVCZkc= -github.com/krakendio/httpcache v0.0.0-20221129153752-65a87a5c2bc5/go.mod h1:VWTP3MZHr/W9OauBMrOQ2bD1rIjDetAQo5JbXCezYKE= diff --git a/test/test.go b/test/test.go index 7fcecd4..d918705 100644 --- a/test/test.go +++ b/test/test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/krakendio/httpcache" + "github.com/krakend/httpcache" ) // Cache excercises a httpcache.Cache implementation. diff --git a/test/test_test.go b/test/test_test.go index fe8a33c..dee4416 100644 --- a/test/test_test.go +++ b/test/test_test.go @@ -3,8 +3,8 @@ package test_test import ( "testing" - "github.com/krakendio/httpcache" - "github.com/krakendio/httpcache/test" + "github.com/krakend/httpcache" + "github.com/krakend/httpcache/test" ) func TestMemoryCache(t *testing.T) { From 12ed5d47c49535a009bbf13a18996e33e0c86589 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:45:15 +0200 Subject: [PATCH 3/6] fix deepsource and readme references --- .deepsource.toml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.deepsource.toml b/.deepsource.toml index c7e4f38..ecc59f4 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -5,7 +5,7 @@ name = "go" enabled = true [analyzers.meta] - import_root = "github.com/krakendio/httpcache" + import_root = "github.com/krakend/httpcache" [[transformers]] name = "gofmt" @@ -13,4 +13,4 @@ enabled = true [[transformers]] name = "gofumpt" -enabled = true \ No newline at end of file +enabled = true diff --git a/README.md b/README.md index f3b33b7..165e388 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ httpcache This a fork of github.com/gregjones/httpcache which includes various fixes. Original backends are removed since are not used by KrakenD. -[![GoDoc](https://godoc.org/github.com/krakendio/httpcache?status.svg)](https://godoc.org/github.com/krakendio/httpcache) +[![GoDoc](https://godoc.org/github.com/krakend/httpcache?status.svg)](https://godoc.org/github.com/krakend/httpcache) Package httpcache provides a http.RoundTripper implementation that works as a mostly [RFC 7234](https://tools.ietf.org/html/rfc7234) compliant cache for http responses. From ce8fb5bf64ed0fa229facc627dca8a67055db9b8 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:51:47 +0200 Subject: [PATCH 4/6] update workflow to speed up test --- .github/workflows/go.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e669473..4fd7b12 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,14 +8,13 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 - - name: Test - uses: docker://krakend/builder:latest-linux-generic + - name: Set up Go + uses: actions/setup-go@v2 with: - args: sh -c "go get -t -v ./...; - gofmt -w -s . && git diff --exit-code; - go tool vet .; - go test -v -race ./..." \ No newline at end of file + go-version: 1.24 + - name: Test + run: go test -v ./... From b0fe0204a22f6c35d812a7342cdeed820c48f832 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:53:34 +0200 Subject: [PATCH 5/6] Revert "update workflow to speed up test" This reverts commit ce8fb5bf64ed0fa229facc627dca8a67055db9b8. --- .github/workflows/go.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4fd7b12..e669473 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,13 +8,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v2 - with: - go-version: 1.24 - name: Test - run: go test -v ./... + uses: docker://krakend/builder:latest-linux-generic + with: + args: sh -c "go get -t -v ./...; + gofmt -w -s . && git diff --exit-code; + go tool vet .; + go test -v -race ./..." \ No newline at end of file From 4e1988fd9dd303847945ce2658c752aab73928a2 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Tue, 26 Aug 2025 15:54:16 +0200 Subject: [PATCH 6/6] fix workflow: just update to latest ubuntu image --- .github/workflows/go.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e669473..5b6d7d4 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,14 +8,14 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test uses: docker://krakend/builder:latest-linux-generic with: args: sh -c "go get -t -v ./...; gofmt -w -s . && git diff --exit-code; go tool vet .; - go test -v -race ./..." \ No newline at end of file + go test -v -race ./..."