From d0c8c745997ad1acccfd1d8cf384ef4e23a49492 Mon Sep 17 00:00:00 2001
From: Paramtamtam <7326800+tarampampam@users.noreply.github.com>
Date: Thu, 23 Feb 2023 22:23:30 +0400
Subject: [PATCH] Go updated up to 1.20, module name changed
---
.dockerignore | 18 ++++----
.editorconfig | 2 +
.github/workflows/documentation.yml | 2 +-
.github/workflows/release.yml | 21 ++++-----
.github/workflows/tests.yml | 47 ++++++--------------
CHANGELOG.md | 8 ++++
Dockerfile | 4 +-
Makefile | 2 +-
README.md | 4 +-
cmd/tinifier/main.go | 2 +-
docker-compose.yml | 4 +-
go.mod | 14 +++---
go.sum | 18 ++++----
internal/cli/app.go | 8 ++--
internal/cli/app_test.go | 2 +-
internal/cli/compress/clients_pool.go | 2 +-
internal/cli/compress/command.go | 16 +++----
internal/cli/compress/errors_watcher_test.go | 2 +-
internal/cli/compress/statistics_test.go | 2 +-
internal/cli/quota/command.go | 6 +--
internal/cli/shared/flags.go | 2 +-
internal/files/finder_test.go | 2 +-
internal/retry/retry_test.go | 2 +-
internal/validate/image_test.go | 2 +-
pkg/tinypng/client_test.go | 2 +-
25 files changed, 92 insertions(+), 102 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 356083d..aa0bdd4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,8 @@
-.editorconfig
-.git
-.github
-.idea
-.vscode
-temp
-tmp
-LICENSE
-Makefile
-tinifier
+## Ignore everything
+*
+
+## Except the following files and directories
+!/cmd
+!/internal
+!/pkg
+!/go.*
diff --git a/.editorconfig b/.editorconfig
index 81a29be..34a56c7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,5 @@
+# EditorConfig docs:
+
root = true
[*]
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 130b120..70934f9 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -8,7 +8,7 @@ on:
jobs:
docker-hub-description:
name: Docker Hub Description
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03472f5..6b53c29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
jobs:
build:
name: Build for ${{ matrix.os }} (${{ matrix.arch }})
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
@@ -19,11 +19,11 @@ jobs:
- os: windows
arch: 386
steps:
- - uses: actions/setup-go@v3
- with: {go-version: 1.19}
-
- uses: actions/checkout@v3
+ - uses: gacts/setup-go-with-cache@v1
+ with: {go-version-file: go.mod}
+
- {uses: gacts/github-slug@v1, id: slug}
- name: Generate builder values
@@ -35,7 +35,7 @@ jobs:
GOOS: ${{ matrix.os }}
GOARCH: ${{ matrix.arch }}
CGO_ENABLED: 0
- LDFLAGS: -s -w -X github.com/tarampampam/tinifier/v4/internal/version.version=${{ steps.slug.outputs.version }}
+ LDFLAGS: -s -w -X gh.tarampamp.am/tinifier/v4/internal/version.version=${{ steps.slug.outputs.version }}
run: go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/tinifier/
- uses: svenstaro/upload-release-action@v2
@@ -47,7 +47,7 @@ jobs:
docker:
name: Build docker image
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@@ -83,7 +83,7 @@ jobs:
godocs:
name: Renew docs and cache (${{ matrix.proxy }})
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
@@ -93,14 +93,11 @@ jobs:
- https://goproxy.dev
steps:
- uses: actions/setup-go@v3
- with: {go-version: 1.19}
- {uses: gacts/github-slug@v1, id: slug}
- run: go mod init example
- name: Get the module using proxy
- env:
- GO111MODULE: on
- GOPROXY: ${{ matrix.proxy }}
- run: go get -v -x -u "github.com/tarampampam/tinifier/v4@${{ steps.slug.outputs.tag-name }}"
+ env: {GOPROXY: '${{ matrix.proxy }}'}
+ run: go get -v -x -u "gh.tarampamp.am/tinifier/v4@${{ steps.slug.outputs.tag-name }}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0d67d14..40e20a4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ concurrency:
jobs:
gitleaks:
name: Gitleaks
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with: {fetch-depth: 0}
@@ -24,34 +24,25 @@ jobs:
golangci-lint:
name: Golang-CI (lint)
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-go@v3
+ - uses: gacts/setup-go-with-cache@v1
with: {go-version: 1.19}
- - uses: golangci/golangci-lint-action@v3
+ - uses: golangci/golangci-lint-action@v3 # Action page:
+ with: {skip-pkg-cache: true, skip-build-cache: true}
go-test:
name: Unit tests
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- - uses: actions/setup-go@v3
- with: {go-version: 1.19}
-
- uses: actions/checkout@v3
with: {fetch-depth: 2} # Fixes codecov error 'Issue detecting commit SHA'
- - uses: actions/cache@v3
- with:
- path: |
- ~/.cache/go-build
- ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: ${{ runner.os }}-go-
-
- - run: go mod download
+ - uses: gacts/setup-go-with-cache@v1
+ with: {go-version-file: go.mod}
- run: go test -race -covermode=atomic -coverprofile /tmp/coverage.txt ./...
@@ -64,7 +55,7 @@ jobs:
build:
name: Build for ${{ matrix.os }} (${{ matrix.arch }})
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
@@ -75,29 +66,19 @@ jobs:
arch: 386
needs: [golangci-lint, go-test]
steps:
- - uses: actions/setup-go@v3
- with: {go-version: 1.19}
-
- uses: actions/checkout@v3
- - {uses: gacts/github-slug@v1, id: slug}
+ - uses: gacts/setup-go-with-cache@v1
+ with: {go-version-file: go.mod}
- - uses: actions/cache@v3
- with:
- path: |
- ~/.cache/go-build
- ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: ${{ runner.os }}-go-
-
- - run: go mod download
+ - {uses: gacts/github-slug@v1, id: slug}
- name: Build application
env:
GOOS: ${{ matrix.os }}
GOARCH: ${{ matrix.arch }}
CGO_ENABLED: 0
- LDFLAGS: -s -w -X github.com/tarampampam/tinifier/v4/internal/version.version=${{ steps.slug.outputs.branch-name-slug }}@${{ steps.slug.outputs.commit-hash-short }}
+ LDFLAGS: -s -w -X gh.tarampamp.am/tinifier/v4/internal/version.version=${{ steps.slug.outputs.branch-name-slug }}@${{ steps.slug.outputs.commit-hash-short }}
run: go build -trimpath -ldflags "$LDFLAGS" -o /tmp/tinifier ./cmd/tinifier/
- name: Try to execute
@@ -113,7 +94,7 @@ jobs:
image:
name: Build docker image
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
needs: [golangci-lint, go-test]
steps:
- uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c3560..a1e76c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
+## v4.1.0
+
+### Changed
+
+- Go dependencies updated
+- Go version updated from `1.19` up to `1.20`
+- Module name changed from `github.com/tarampampam/tinifier/v4` to `gh.tarampamp.am/tinifier/v4`
+
## v4.0.1
### Fixed
diff --git a/Dockerfile b/Dockerfile
index d99dd99..f48e2ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.2
# Image page:
-FROM golang:1.19-alpine as builder
+FROM golang:1.20-alpine as builder
# can be passed with any prefix (like `v1.2.3@GITHASH`)
# e.g.: `docker build --build-arg "APP_VERSION=v1.2.3@GITHASH" .`
@@ -17,7 +17,7 @@ WORKDIR /src
COPY . .
# arguments to pass on each go tool link invocation
-ENV LDFLAGS="-s -w -X github.com/tarampampam/tinifier/v4/internal/version.version=$APP_VERSION"
+ENV LDFLAGS="-s -w -X gh.tarampamp.am/tinifier/v4/internal/version.version=$APP_VERSION"
RUN set -x \
&& go version \
diff --git a/Makefile b/Makefile
index 345746e..33a3f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Makefile readme (en):
SHELL = /bin/sh
-LDFLAGS = "-s -w -X github.com/tarampampam/tinifier/v4/internal/version.version=$(shell git rev-parse HEAD)"
+LDFLAGS = "-s -w -X gh.tarampamp.am/tinifier/v4/internal/version.version=$(shell git rev-parse HEAD)"
DC_RUN_ARGS = --rm --user "$(shell id -u):$(shell id -g)"
APP_NAME = $(notdir $(CURDIR))
diff --git a/README.md b/README.md
index ff91949..7703cea 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Download the latest binary file for your os/arch from [releases page][link_relea
Install the API client with `go get`:
```bash
-$ go get -u github.com/tarampampam/tinifier/v4
+$ go get -u gh.tarampamp.am/tinifier/v4
```
Client sources and usage examples can be found in [`pkg/tinypng`](pkg/tinypng) directory.
@@ -143,7 +143,7 @@ This is open-sourced software licensed under the [MIT License][link_license].
[link_golang]:https://golang.org/
[link_goreport]:https://goreportcard.com/report/github.com/tarampampam/tinifier
[link_coverage]:https://codecov.io/gh/tarampampam/tinifier
-[link_gopkg]:https://pkg.go.dev/github.com/tarampampam/tinifier/v4
+[link_gopkg]:https://pkg.go.dev/gh.tarampamp.am/tinifier/v4
[link_actions]:https://github.com/tarampampam/tinifier/actions
[link_docker_hub]:https://hub.docker.com/r/tarampampam/tinifier/
[link_ghcr]:https://github.com/users/tarampampam/packages/container/package/tinifier
diff --git a/cmd/tinifier/main.go b/cmd/tinifier/main.go
index 287381d..796f1c6 100644
--- a/cmd/tinifier/main.go
+++ b/cmd/tinifier/main.go
@@ -9,7 +9,7 @@ import (
"github.com/joho/godotenv"
"github.com/pkg/errors"
- "github.com/tarampampam/tinifier/v4/internal/cli"
+ "gh.tarampamp.am/tinifier/v4/internal/cli"
)
// exitFn is a function for application exiting.
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a62e93..5a2b63b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
services:
app:
- image: golang:1.19-buster # Image page:
+ image: golang:1.20-buster # Image page:
working_dir: /src
environment:
HOME: /tmp
@@ -17,6 +17,7 @@ services:
- /etc/group:/etc/group:ro
- .:/src:cached
- tmp-data:/tmp:cached
+ security_opt: [no-new-privileges:true]
golint:
image: golangci/golangci-lint:v1.51-alpine # Image page:
@@ -27,3 +28,4 @@ services:
- golint-go:/go:rw # go dependencies will be downloaded on each run without this
- golint-cache:/tmp/golint:rw
working_dir: /src
+ security_opt: [no-new-privileges:true]
diff --git a/go.mod b/go.mod
index 4dce52d..6de6408 100644
--- a/go.mod
+++ b/go.mod
@@ -1,25 +1,25 @@
-module github.com/tarampampam/tinifier/v4
+module gh.tarampamp.am/tinifier/v4
-go 1.19
+go 1.20
require (
github.com/dustin/go-humanize v1.0.1
github.com/jedib0t/go-pretty/v6 v6.4.4
- github.com/joho/godotenv v1.4.0
+ github.com/joho/godotenv v1.5.1
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.1
- github.com/urfave/cli/v2 v2.24.2
+ github.com/urfave/cli/v2 v2.24.4
)
require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/mattn/go-runewidth v0.0.13 // indirect
+ github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/rivo/uniseg v0.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
- golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+ golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 0aadb06..0538198 100644
--- a/go.sum
+++ b/go.sum
@@ -7,19 +7,21 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/jedib0t/go-pretty/v6 v6.4.4 h1:N+gz6UngBPF4M288kiMURPHELDMIhF/Em35aYuKrsSc=
github.com/jedib0t/go-pretty/v6 v6.4.4/go.mod h1:MgmISkTWDSFu0xOqiZ0mKNntMQ2mDgOcwOkwBEkMDJI=
-github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
-github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d h1:cVtBfNW5XTHiKQe7jDaDBSh/EVM4XLPutLAGboIXuM0=
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -30,13 +32,13 @@ github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/urfave/cli/v2 v2.24.2 h1:q1VA+ofZ8SWfEKB9xXHUD4QZaeI9e+ItEqSbfH2JBXk=
-github.com/urfave/cli/v2 v2.24.2/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
+github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
+github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/cli/app.go b/internal/cli/app.go
index 2b3b959..61c4f19 100644
--- a/internal/cli/app.go
+++ b/internal/cli/app.go
@@ -5,10 +5,10 @@ import (
"github.com/jedib0t/go-pretty/v6/text"
"github.com/urfave/cli/v2"
- "github.com/tarampampam/tinifier/v4/internal/cli/compress"
- "github.com/tarampampam/tinifier/v4/internal/cli/quota"
- "github.com/tarampampam/tinifier/v4/internal/env"
- "github.com/tarampampam/tinifier/v4/internal/version"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/compress"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/quota"
+ "gh.tarampamp.am/tinifier/v4/internal/env"
+ "gh.tarampamp.am/tinifier/v4/internal/version"
)
// NewApp creates new console application.
diff --git a/internal/cli/app_test.go b/internal/cli/app_test.go
index 622bbea..1482eab 100644
--- a/internal/cli/app_test.go
+++ b/internal/cli/app_test.go
@@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/require"
- "github.com/tarampampam/tinifier/v4/internal/cli"
+ "gh.tarampamp.am/tinifier/v4/internal/cli"
)
func TestNewApp(t *testing.T) {
diff --git a/internal/cli/compress/clients_pool.go b/internal/cli/compress/clients_pool.go
index c189caf..4b6304c 100644
--- a/internal/cli/compress/clients_pool.go
+++ b/internal/cli/compress/clients_pool.go
@@ -4,7 +4,7 @@ import (
"errors"
"sync"
- "github.com/tarampampam/tinifier/v4/pkg/tinypng"
+ "gh.tarampamp.am/tinifier/v4/pkg/tinypng"
)
var errNoClients = errors.New("no clients")
diff --git a/internal/cli/compress/command.go b/internal/cli/compress/command.go
index a98e3a1..048e204 100644
--- a/internal/cli/compress/command.go
+++ b/internal/cli/compress/command.go
@@ -12,19 +12,19 @@ import (
"sync"
"time"
- "github.com/dustin/go-humanize"
+ humanize "github.com/dustin/go-humanize"
"github.com/jedib0t/go-pretty/v6/progress"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/pkg/errors"
"github.com/urfave/cli/v2"
- "github.com/tarampampam/tinifier/v4/internal/breaker"
- "github.com/tarampampam/tinifier/v4/internal/cli/shared"
- "github.com/tarampampam/tinifier/v4/internal/env"
- "github.com/tarampampam/tinifier/v4/internal/files"
- "github.com/tarampampam/tinifier/v4/internal/retry"
- "github.com/tarampampam/tinifier/v4/internal/validate"
- "github.com/tarampampam/tinifier/v4/pkg/tinypng"
+ "gh.tarampamp.am/tinifier/v4/internal/breaker"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/shared"
+ "gh.tarampamp.am/tinifier/v4/internal/env"
+ "gh.tarampamp.am/tinifier/v4/internal/files"
+ "gh.tarampamp.am/tinifier/v4/internal/retry"
+ "gh.tarampamp.am/tinifier/v4/internal/validate"
+ "gh.tarampamp.am/tinifier/v4/pkg/tinypng"
)
type command struct {
diff --git a/internal/cli/compress/errors_watcher_test.go b/internal/cli/compress/errors_watcher_test.go
index 38c4d1f..052fb03 100644
--- a/internal/cli/compress/errors_watcher_test.go
+++ b/internal/cli/compress/errors_watcher_test.go
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
- "github.com/tarampampam/tinifier/v4/internal/cli/compress"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/compress"
)
func TestErrorsWatcher(t *testing.T) {
diff --git a/internal/cli/compress/statistics_test.go b/internal/cli/compress/statistics_test.go
index cb183a4..106244f 100644
--- a/internal/cli/compress/statistics_test.go
+++ b/internal/cli/compress/statistics_test.go
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
- "github.com/tarampampam/tinifier/v4/internal/cli/compress"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/compress"
)
func TestStatsStorage(t *testing.T) {
diff --git a/internal/cli/quota/command.go b/internal/cli/quota/command.go
index 9c8f786..67803b7 100644
--- a/internal/cli/quota/command.go
+++ b/internal/cli/quota/command.go
@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
"github.com/urfave/cli/v2"
- "github.com/tarampampam/tinifier/v4/internal/breaker"
- "github.com/tarampampam/tinifier/v4/internal/cli/shared"
- "github.com/tarampampam/tinifier/v4/pkg/tinypng"
+ "gh.tarampamp.am/tinifier/v4/internal/breaker"
+ "gh.tarampamp.am/tinifier/v4/internal/cli/shared"
+ "gh.tarampamp.am/tinifier/v4/pkg/tinypng"
)
// NewCommand creates `quota` command.
diff --git a/internal/cli/shared/flags.go b/internal/cli/shared/flags.go
index 8cf9429..86e3409 100644
--- a/internal/cli/shared/flags.go
+++ b/internal/cli/shared/flags.go
@@ -3,7 +3,7 @@ package shared
import (
"github.com/urfave/cli/v2"
- "github.com/tarampampam/tinifier/v4/internal/env"
+ "gh.tarampamp.am/tinifier/v4/internal/env"
)
var APIKeyFlag = &cli.StringSliceFlag{ //nolint:gochecknoglobals
diff --git a/internal/files/finder_test.go b/internal/files/finder_test.go
index 1868298..2662bd8 100644
--- a/internal/files/finder_test.go
+++ b/internal/files/finder_test.go
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "github.com/tarampampam/tinifier/v4/internal/files"
+ "gh.tarampamp.am/tinifier/v4/internal/files"
)
func TestFindFiles(t *testing.T) {
diff --git a/internal/retry/retry_test.go b/internal/retry/retry_test.go
index 103cf83..19ba252 100644
--- a/internal/retry/retry_test.go
+++ b/internal/retry/retry_test.go
@@ -9,7 +9,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
- "github.com/tarampampam/tinifier/v4/internal/retry"
+ "gh.tarampamp.am/tinifier/v4/internal/retry"
)
func ExampleDo() {
diff --git a/internal/validate/image_test.go b/internal/validate/image_test.go
index 30e0c31..15cf50e 100644
--- a/internal/validate/image_test.go
+++ b/internal/validate/image_test.go
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/tarampampam/tinifier/v4/internal/validate"
+ "gh.tarampamp.am/tinifier/v4/internal/validate"
)
type brokenReader struct{}
diff --git a/pkg/tinypng/client_test.go b/pkg/tinypng/client_test.go
index fbd2a98..fc26edf 100644
--- a/pkg/tinypng/client_test.go
+++ b/pkg/tinypng/client_test.go
@@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "github.com/tarampampam/tinifier/v4/pkg/tinypng"
+ "gh.tarampamp.am/tinifier/v4/pkg/tinypng"
)
func ExampleClient_Compress_and_Download() {