From 6f18cc8f22a625cc1c0468693026f228fe2e02e6 Mon Sep 17 00:00:00 2001
From: Andrey Ivanov <tiburon-777@users.noreply.github.com>
Date: Wed, 11 Nov 2020 20:35:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B1=D0=BB=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D1=8E=20=D0=BB=D0=B8=D0=BD=D1=82-=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=B6=D0=B5=D1=80=D0=B0=20=D0=B8=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=B7=D0=B5=D0=B9=D0=B1=D0=BB=D0=B8=D0=BB=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D1=87=D0=BA=D1=83=20=D0=BB=D0=B8=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2,=20=D1=82.=D0=BA.=20=D0=BE=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D1=8E=D1=82=20=D0=BE=D1=81=D0=BE=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=86=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=B4=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .golangci.yml                 | 4 +++-
 Makefile                      | 2 +-
 internal/application/query.go | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 0e5a3b5..37cc5f7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -16,4 +16,6 @@ linters:
     - wsl
     - nlreturn
     - whitespace
-    - bodyclose
\ No newline at end of file
+    - bodyclose
+    - wrapcheck
+    - exhaustivestruct
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 32f43cb..6ce4606 100644
--- a/Makefile
+++ b/Makefile
@@ -22,5 +22,5 @@ docker-run:
 
 install-lint-deps:
 	rm -rf $(shell go env GOPATH)/bin/golangci-lint
-	(which golangci-lint > /dev/null) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.30.0
+	(which golangci-lint > /dev/null) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin
 .PHONY: build test lint
\ No newline at end of file
diff --git a/internal/application/query.go b/internal/application/query.go
index fa2d8a0..909a0c6 100644
--- a/internal/application/query.go
+++ b/internal/application/query.go
@@ -40,7 +40,7 @@ func buildQuery(u *url.URL) (q Query, err error) {
 }
 
 func (q Query) id() string {
-	return strings.Replace(strconv.Itoa(q.Width)+"/"+strconv.Itoa(q.Height)+q.URL.Path, "/", "_", -1)
+	return strings.ReplaceAll(strconv.Itoa(q.Width)+"/"+strconv.Itoa(q.Height)+q.URL.Path, "/", "_")
 }
 
 func (q Query) fromOrigin(ctx context.Context, headers http.Header, timeout time.Duration) ([]byte, *http.Response, error) {