Remove abandoned orijtech/structslop linter

- drop references to linter from README - remove from `oldstable`, `stable` and `unstable` images - remove from `tools/*` files so that we're no longer tracking potential future releases of linter refs GH-1844
atc0005 · Jan 15, 2025 · 5cb2a2f · 5cb2a2f
1 parent c1b2aa7
commit 5cb2a2f
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,6 @@ Forks:
 | Linter                                                               | Version                                    |
 | -------------------------------------------------------------------- | ------------------------------------------ |
 | [`orijtech/httperroryzer`](https://github.com/atc0005/httperroryzer) | `9f94717820d4a5075117680de2ca07875d32c9f1` |
-| [`orijtech/structslop`](https://github.com/atc0005/structslop)       | `33c868804e9e6070fdaee64b729d3129bbe85a53` |
 | [`orijtech/tickeryzer`](https://github.com/atc0005/tickeryzer)       | `b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f` |
 
 ## Build tools included
@@ -429,7 +428,6 @@ each release of this project.
     - [deadcode](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode)
   - Additional
     - [orijtech/httperroryzer](https://github.com/orijtech/httperroryzer)
-    - [orijtech/structslop](https://github.com/orijtech/structslop)
     - [orijtech/tickeryzer](https://github.com/orijtech/tickeryzer)
     - [pelletier/go-toml](https://github.com/pelletier/go-toml)
 - Build Tools

diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile
@@ -20,7 +20,6 @@ ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.29.0"
 ENV GOVULNCHECK_VERSION="v1.1.4"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
-# ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.2.3"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -29,7 +28,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
@@ -60,21 +58,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
     && go version -m $(which httperroryzer) \
     && cd ..
 
-# NOTE: When Go 1.24 is released and Go 1.23 becomes the next "oldstable"
-# series we'll need to modify the `go install` line to permit building this
-# linter with Go 1.23:
-#
-# `go install -ldflags=-checklinkname=0 ./cmd/structslop`
-#
-# https://github.com/orijtech/structslop/issues/64
-RUN echo "Installing structslop from temporary fork" \
-    && git clone https://github.com/atc0005/structslop \
-    && cd structslop \
-    && git checkout ${STRUCTSLOP_VERSION} \
-    && go install ./cmd/structslop \
-    && go version -m $(which structslop) \
-    && cd ..
-
 RUN echo "Installing tickeryzer from temporary fork" \
     && git clone https://github.com/atc0005/tickeryzer \
     && cd tickeryzer \
@@ -126,7 +109,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
@@ -147,7 +129,6 @@ COPY --from=builder /go/bin/govulncheck /usr/bin/govulncheck
 COPY --from=builder /go/bin/deadcode /usr/bin/deadcode
 COPY --from=builder /go/bin/gotestdox /usr/bin/gotestdox
 COPY --from=builder /go/bin/httperroryzer /usr/bin/httperroryzer
-COPY --from=builder /go/bin/structslop /usr/bin/structslop
 COPY --from=builder /go/bin/tickeryzer /usr/bin/tickeryzer
 COPY --from=builder /go/bin/tomll /usr/bin/tomll
 

diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile
@@ -27,7 +27,6 @@ ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.29.0"
 ENV GOVULNCHECK_VERSION="v1.1.4"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
-# ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.2.3"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -36,7 +35,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
@@ -71,15 +69,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
     && go version -m $(which httperroryzer) \
     && cd ..
 
-# https://github.com/orijtech/structslop/issues/64
-RUN echo "Installing structslop from temporary fork" \
-    && git clone https://github.com/atc0005/structslop \
-    && cd structslop \
-    && git checkout ${STRUCTSLOP_VERSION} \
-    && go install -ldflags=-checklinkname=0 ./cmd/structslop \
-    && go version -m $(which structslop) \
-    && cd ..
-
 RUN echo "Installing tickeryzer from temporary fork" \
     && git clone https://github.com/atc0005/tickeryzer \
     && cd tickeryzer \
@@ -134,7 +123,6 @@ ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.29.0"
 ENV GOVULNCHECK_VERSION="v1.1.4"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
-# ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.2.3"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -143,7 +131,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
@@ -164,7 +151,6 @@ COPY --from=builder /go/bin/govulncheck /usr/bin/govulncheck
 COPY --from=builder /go/bin/deadcode /usr/bin/deadcode
 COPY --from=builder /go/bin/gotestdox /usr/bin/gotestdox
 COPY --from=builder /go/bin/httperroryzer /usr/bin/httperroryzer
-COPY --from=builder /go/bin/structslop /usr/bin/structslop
 COPY --from=builder /go/bin/tickeryzer /usr/bin/tickeryzer
 COPY --from=builder /go/bin/tomll /usr/bin/tomll
 

diff --git a/tools/go.mod b/tools/go.mod
@@ -15,9 +15,6 @@ require (
 	// httperroryzer - provided as an optional linter
 	github.com/orijtech/httperroryzer v0.0.1
 
-	// structslog - provided as an optional linter
-	github.com/orijtech/structslop v0.0.8
-
 	// tickeryzer - provided as an optional linter
 	github.com/orijtech/tickeryzer v0.0.3
 

diff --git a/tools/go.sum b/tools/go.sum
@@ -139,8 +139,6 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/orijtech/httperroryzer v0.0.1 h1:85v2h0lGsa4X1DvOpuMmR+mimG7bGYYRbOWTmE/YOi4=
 github.com/orijtech/httperroryzer v0.0.1/go.mod h1:j1TGk7yN1XWUoNrjJTs8V+FNmonAdmfjJJvbt2fOTxs=
-github.com/orijtech/structslop v0.0.8 h1:xkiOOdE3Obe82vdQvrb4bsjCGAUqQEo6Ln3r4yFMzGw=
-github.com/orijtech/structslop v0.0.8/go.mod h1:DTgCV3OwtVdbJZt4uHpVM6Fck2CbGhsZM2nAv4BmWk0=
 github.com/orijtech/tickeryzer v0.0.3 h1:voYEdZlzcvMTT3E2LoWIy4s0O74n4Z5L5C22cXJsANo=
 github.com/orijtech/tickeryzer v0.0.3/go.mod h1:PS87zBzREYa3A0JGhIIQXvPiNeH44TjLRi4O+x4fOxc=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=

diff --git a/tools/tools.go b/tools/tools.go
@@ -15,7 +15,6 @@ import (
 	_ "github.com/golangci/golangci-lint/pkg/config"
 	_ "github.com/goreleaser/nfpm/v2"
 	_ "github.com/orijtech/httperroryzer"
-	_ "github.com/orijtech/structslop"
 	_ "github.com/orijtech/tickeryzer"
 	_ "github.com/pelletier/go-toml/v2"
 	_ "github.com/tc-hib/go-winres"

diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile
@@ -31,7 +31,6 @@ ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.29.0"
 ENV GOVULNCHECK_VERSION="v1.1.4"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
-# ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.2.3"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -40,7 +39,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
@@ -70,15 +68,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
     && go install ./cmd/httperroryzer \
     && cd ..
 
-# https://github.com/orijtech/structslop/issues/64
-RUN echo "Installing structslop from temporary fork" \
-    && git clone https://github.com/atc0005/structslop \
-    && cd structslop \
-    && git checkout ${STRUCTSLOP_VERSION} \
-    && go install -ldflags=-checklinkname=0 ./cmd/structslop \
-    && go version -m $(which structslop) \
-    && cd ..
-
 RUN echo "Installing tickeryzer from temporary fork" \
     && git clone https://github.com/atc0005/tickeryzer \
     && cd tickeryzer \
@@ -134,7 +123,6 @@ ENV STATICCHECK_VERSION="v0.5.1"
 ENV DEADCODE_VERSION="v0.29.0"
 ENV GOVULNCHECK_VERSION="v1.1.4"
 # ENV HTTPERRORYZER_VERSION="v0.0.1"
-# ENV STRUCTSLOP_VERSION="v0.0.8"
 # ENV TICKERYZER_VERSION="v0.0.3"
 ENV TOMLL_VERSION="v2.2.3"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -143,7 +131,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
 # projects. The plan is to switch back to current upstream vesions once
 # the required dependencies are updated for those upstream projects.
 ENV HTTPERRORYZER_VERSION="9f94717820d4a5075117680de2ca07875d32c9f1"
-ENV STRUCTSLOP_VERSION="33c868804e9e6070fdaee64b729d3129bbe85a53"
 ENV TICKERYZER_VERSION="b38acaa6d76d30629a49ad9eddd1aa5ddd0afa8f"
 
 ENV APT_BSDMAINUTILS_VERSION="12.1.8"
@@ -164,7 +151,6 @@ COPY --from=builder /go/bin/govulncheck /usr/bin/govulncheck
 COPY --from=builder /go/bin/deadcode /usr/bin/deadcode
 COPY --from=builder /go/bin/gotestdox /usr/bin/gotestdox
 COPY --from=builder /go/bin/httperroryzer /usr/bin/httperroryzer
-COPY --from=builder /go/bin/structslop /usr/bin/structslop
 COPY --from=builder /go/bin/tickeryzer /usr/bin/tickeryzer
 COPY --from=builder /go/bin/tomll /usr/bin/tomll