Merge pull request #1364 from atc0005/i1357-update-errwrap-linter-to-…

…v1.6.0 Update fatih/errwrap to v1.6.0
atc0005 · Feb 8, 2024 · f844bf9 · f844bf9
2 parents afc5ff3 + c164821
commit f844bf9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ The following linting tools are included in the `go-ci-stable`,
 | [`orijtech/structslop`](https://github.com/orijtech/structslop)       | `v0.0.8`              |
 | [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer)       | `v0.0.3`              |
 | [`pelletier/go-toml`](https://github.com/pelletier/go-toml)           | `v2.1.1`              |
-| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.5.0`              |
+| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.6.0`              |
 
 ## Build tools included
 

diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile
@@ -33,7 +33,7 @@ ENV HTTPERRORYZER_VERSION="v0.0.1"
 ENV STRUCTSLOP_VERSION="v0.0.8"
 ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.1.1"
-ENV ERRWRAP_VERSION="v1.5.0"
+ENV ERRWRAP_VERSION="v1.6.0"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
 ENV APT_TREE_VERSION="2.1.0-1"

diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile
@@ -33,7 +33,7 @@ ENV HTTPERRORYZER_VERSION="v0.0.1"
 ENV STRUCTSLOP_VERSION="v0.0.8"
 ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.1.1"
-ENV ERRWRAP_VERSION="v1.5.0"
+ENV ERRWRAP_VERSION="v1.6.0"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
 ENV APT_TREE_VERSION="2.1.0-1"

diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile
@@ -29,15 +29,15 @@ ENV GOVULNCHECK_VERSION="v1.0.3"
 # ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.1.1"
-# ENV ERRWRAP_VERSION="v1.5.0"
+ENV ERRWRAP_VERSION="v1.6.0"
 
 # These commits/versions are provided by temporary forks of the upstream
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="54c26d99b9758117957285a790c2d88b51a552dd"
 ENV STRUCTSLOP_VERSION="55db8be618045ec870098a4579bae376bbb7df33"
 ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"
-ENV ERRWRAP_VERSION="c75521dd38c3bf43d1acaf3f628d87252fa69270"
+# ENV ERRWRAP_VERSION="c75521dd38c3bf43d1acaf3f628d87252fa69270"
 
 RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
     && go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION} \
@@ -82,12 +82,15 @@ RUN echo "Installing tickeryzer from temporary fork" \
     && go install ./cmd/tickeryzer \
     && cd ..
 
-RUN echo "Installing errwrap from temporary fork" \
-    && git clone https://github.com/atc0005/errwrap \
-    && cd errwrap \
-    && git checkout ${ERRWRAP_VERSION} \
-    && go install . \
-    && cd ..
+RUN echo "Installing errwrap@${ERRWRAP_VERSION}" \
+    && go install github.com/fatih/errwrap@${ERRWRAP_VERSION}
+
+# RUN echo "Installing errwrap from temporary fork" \
+#     && git clone https://github.com/atc0005/errwrap \
+#     && cd errwrap \
+#     && git checkout ${ERRWRAP_VERSION} \
+#     && go install . \
+#     && cd ..
 
 # RUN echo "Installing golangci-lint from dev feat/go1.20 branch" \
 #     && git clone https://github.com/atc0005/golangci-lint \
@@ -136,7 +139,7 @@ ENV GOVULNCHECK_VERSION="v1.0.3"
 ENV HTTPERRORYZER_VERSION="v0.0.1"
 ENV STRUCTSLOP_VERSION="v0.0.8"
 ENV TOMLL_VERSION="v2.1.1"
-ENV ERRWRAP_VERSION="v1.5.0"
+ENV ERRWRAP_VERSION="v1.6.0"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
 ENV APT_TREE_VERSION="2.1.0-1"