OPCT-289: CI fixes/linters added on #57

Fix linter recommendations left behind in PR #57
redhat-openshift-ecosystem · Aug 8, 2024 · 73318f9 · 73318f9
1 parent 99abdda
commit 73318f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/reviewer.yaml b/.github/workflows/reviewer.yaml
@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: reviewdog/action-misspell@v1
         with:
-          #reporter: github-check
-          level: warning
+          # reporter: github-check
+          # level: warning
           locale: "US"
 
   # reviewdog / suggester: https://github.com/reviewdog/action-suggester

diff --git a/artifacts-collector/Containerfile b/artifacts-collector/Containerfile
@@ -3,9 +3,9 @@
 # Multi-layer images for dependencies.
 ARG BUILD_VERSION=latest
 ARG PLUGIN_REPO=quay.io/opct/plugin-openshift-tests
-FROM ${PLUGIN_REPO}:${BUILD_VERSION} as plugin
+FROM ${PLUGIN_REPO}:${BUILD_VERSION} AS plugin
 
-FROM quay.io/opct/tools:v0.4.0 as tools
+FROM quay.io/opct/tools:v0.4.0 AS tools
 
 # Main image
 FROM quay.io/fedora/fedora-minimal:40

diff --git a/must-gather-monitoring/Containerfile b/must-gather-monitoring/Containerfile
@@ -2,9 +2,9 @@
 #
 ## Base image for must-gather-monitoring plugin
 #
-FROM quay.io/opct/tools:v0.4.0 as tools
+FROM quay.io/opct/tools:v0.4.0 AS tools
 
-FROM quay.io/fedora/fedora-minimal:40 as base
+FROM quay.io/fedora/fedora-minimal:40 AS base
 ARG QUAY_EXPIRATION=never
 LABEL io.k8s.display-name="OPCT Must-Gather Monitoring" \
       io.k8s.description="Collect Prometheus raw metrics from OpenShift/OCP Clusters." \
@@ -26,4 +26,4 @@ COPY runner_plugin /usr/bin/
 
 RUN chmod u+x /usr/bin/gather* /usr/bin/runner_plugin
 
-ENTRYPOINT /usr/bin/gather
+ENTRYPOINT ["/usr/bin/gather"]
diff --git a/openshift-tests-plugin/Containerfile b/openshift-tests-plugin/Containerfile
@@ -1,7 +1,7 @@
 #
 ## Base image
 #
-FROM quay.io/fedora/fedora-minimal:40 as base
+FROM quay.io/fedora/fedora-minimal:40 AS base
 RUN microdnf clean all
 
 #

diff --git a/openshift-tests-plugin/pkg/plugin/progress.go b/openshift-tests-plugin/pkg/plugin/progress.go
@@ -286,13 +286,13 @@ type pluginProgressService struct {
 // Send send message to sonobuoy worker service.
 // TODO(mtulio): re-use keepalive HTTP connections.
 func (s *pluginProgressService) Send() {
-	marshalled, err := json.Marshal(s)
+	marshaled, err := json.Marshal(s)
 	if err != nil {
 		log.WithError(err).Error("unable to marshall")
 		return
 	}
 
-	req, err := http.NewRequest("POST", s.url, bytes.NewBuffer(marshalled))
+	req, err := http.NewRequest("POST", s.url, bytes.NewBuffer(marshaled))
 	if err != nil {
 		log.WithError(err).Error("error creating request")
 		return