From 2a3c6806b5c6384958b81e1f5a73bf75f2d57f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Budnik?= Date: Tue, 14 Nov 2023 18:35:59 +0100 Subject: [PATCH 1/5] updated deprecated API to new API --- server.go | 3 +-- server_test.go | 9 +++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server.go b/server.go index 8f03098..7a271b3 100644 --- a/server.go +++ b/server.go @@ -2,7 +2,6 @@ package main import ( "encoding/json" - "io/ioutil" "log" "net/http" "os" @@ -71,7 +70,7 @@ func handler(w http.ResponseWriter, req *http.Request) { response.Files = make(map[string]string) files := strings.Split(showFiles, ",") for _, file := range files { - bytes, err := ioutil.ReadFile(file) + bytes, err := os.ReadFile(file) if err != nil { log.Printf("Could not read file %v: %v\n", file, err) continue diff --git a/server_test.go b/server_test.go index 7a0e7b0..b2493e2 100644 --- a/server_test.go +++ b/server_test.go @@ -1,6 +1,7 @@ package main import ( + "bytes" "encoding/json" "net/http" "net/http/httptest" @@ -29,8 +30,12 @@ func TestHandler(t *testing.T) { t.Errorf("handler returned wrong status code: got %v want %v", status, http.StatusOK) } + result := rr.Result() + buf := new(bytes.Buffer) + buf.ReadFrom(result.Body) + var response response - json.Unmarshal(rr.Body.Bytes(), &response) + json.Unmarshal(buf.Bytes(), &response) // test response assert.Equal(t, 1, response.Counter) @@ -43,5 +48,5 @@ func TestHandler(t *testing.T) { assert.NotEmpty(t, response.Files[".gitignore"]) // test cors - assert.Contains(t, rr.HeaderMap["Access-Control-Allow-Origin"], "*") + assert.Contains(t, result.Header["Access-Control-Allow-Origin"], "*") } From 20a8b270e8288f205c3beda114abeb1f3b517d14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:36:20 +0000 Subject: [PATCH 2/5] Bump actions/checkout from 3.5.3 to 4.1.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.3...v4.1.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/go.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a8a9c04..7c9cbd2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.1 - name: Build the Docker image run: docker build . --file Dockerfile --tag yosoy-local:latest - name: Run simple integration test diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d9043e8..af2077c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -15,7 +15,7 @@ jobs: contents: read steps: - name: Check out the repo - uses: actions/checkout@v3.5.3 + uses: actions/checkout@v4.1.1 - name: Log in to Docker Hub uses: docker/login-action@v2 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f283a35..aa0e9b0 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -6,7 +6,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v4.1.1 - name: Set up Go uses: actions/setup-go@v4 From fe4ccaac6db0ea44ab0d71ad5e1af7cd75a43541 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:46:43 +0000 Subject: [PATCH 3/5] Bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index af2077c..322c6cd 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -44,7 +44,7 @@ jobs: type=semver,pattern={{major}} - name: Build and push Docker images - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . push: true From d8e6d8a77050a3a0a2f5406fafe4fb05bd176b3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:49:27 +0000 Subject: [PATCH 4/5] Bump docker/metadata-action from 4 to 5 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 322c6cd..25d0c6b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -32,7 +32,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | lukasz/yosoy From e9a1cb33401f62a35f89d11ab46be651b3845b22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:00:20 +0000 Subject: [PATCH 5/5] Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 25d0c6b..4e25dc2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -18,13 +18,13 @@ jobs: uses: actions/checkout@v4.1.1 - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }}