Chore: golang 1.21 #3002
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,8 +8,6 @@ run: | |
| - ".*generated.*" | ||
| linters: | ||
| enable: | ||
| - dogsled | ||
| - goconst | ||
| - gocritic | ||
|
|
@@ -23,9 +21,7 @@ linters: | |
| - nakedret | ||
| - rowserrcheck | ||
| - staticcheck | ||
| - typecheck | ||
| - unconvert | ||
| - unused | ||
| - whitespace | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,13 +2,13 @@ ARG ARCH=$TARGETARCH | |
| #################################################################################################### | ||
| # base | ||
| #################################################################################################### | ||
| FROM alpine:3.19.1 as base | ||
| ARG ARCH | ||
| RUN apk update && apk upgrade && \ | ||
| apk add ca-certificates && \ | ||
| apk --no-cache add tzdata | ||
|
|
||
| ENV ARGO_VERSION=v3.5.5 | ||
|
|
||
| RUN wget -q https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-${ARCH}.gz | ||
| RUN gunzip -f argo-linux-${ARCH}.gz | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| PACKAGE=github.com/argoproj/argo-events | ||
| SHELL := /usr/bin/env bash # Make will use bash instead of sh | ||
| CURRENT_DIR=$(shell pwd) | ||
| DIST_DIR=${CURRENT_DIR}/dist | ||
|
|
||
|
|
@@ -38,6 +39,7 @@ override LDFLAGS += -X ${PACKAGE}.gitTag=${GIT_TAG} | |
| endif | ||
|
|
||
| K3D ?= $(shell [ "`command -v kubectl`" != '' ] && [ "`command -v k3d`" != '' ] && [[ "`kubectl config current-context`" =~ k3d-* ]] && echo true || echo false) | ||
| K3DCLUSTER?=k3s-default | ||
|
|
||
| # Check that the needed executables are available, else exit before the build | ||
| K := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH"))) | ||
|
|
@@ -73,7 +75,7 @@ image: clean $(BUILD_DIST) | |
| DOCKER_BUILDKIT=1 docker build -t $(IMAGE_NAMESPACE)/$(BINARY_NAME):$(VERSION) --target $(BINARY_NAME) -f $(DOCKERFILE) . | ||
| @if [ "$(DOCKER_PUSH)" = "true" ]; then docker push $(IMAGE_NAMESPACE)/$(BINARY_NAME):$(VERSION); fi | ||
| ifeq ($(K3D),true) | ||
| k3d image import $(IMAGE_NAMESPACE)/$(BINARY_NAME):$(VERSION) --cluster $(K3DCLUSTER) | ||
| endif | ||
|
|
||
| image-linux-%: dist/$(BINARY_NAME)-linux-% | ||
|
|
@@ -155,7 +157,7 @@ start: image | |
| kubectl -n argo-events wait --for=condition=Ready --timeout 60s pod --all | ||
|
|
||
| $(GOPATH)/bin/golangci-lint: | ||
| curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.57.2 | ||
|
|
||
| .PHONY: lint | ||
| lint: $(GOPATH)/bin/golangci-lint | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,10 @@ import ( | |
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
| ) | ||
|
|
||
| // Workarounds for golangci-lint errors: | ||
| // string `STRING` has N occurrences, make it a constant (goconst) | ||
| const eventBusPrefix = "eventbus-" | ||
|
|
||
| var ( | ||
| testJetStreamEventBus = &v1alpha1.EventBus{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
|
|
@@ -71,17 +75,17 @@ func TestJetStreamBadInstallation(t *testing.T) { | |
|
|
||
| func TestJetStreamGenerateNames(t *testing.T) { | ||
| n := generateJetStreamStatefulSetName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js", n) | ||
| n = generateJetStreamServerSecretName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js-server", n) | ||
| n = generateJetStreamClientAuthSecretName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js-client-auth", n) | ||
| n = generateJetStreamConfigMapName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js-config", n) | ||
| n = generateJetStreamPVCName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js-vol", n) | ||
| n = generateJetStreamServiceName(testJetStreamEventBus) | ||
| assert.Equal(t, eventBusPrefix+testJetStreamEventBus.Name+"-js-svc", n) | ||
| } | ||
|
|
||
| func TestJetStreamCreateObjects(t *testing.T) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,12 @@ import ( | |
| sensorpkg "github.com/argoproj/argo-events/pkg/client/sensor/clientset/versioned/typed/sensor/v1alpha1" | ||
| ) | ||
|
|
||
| // Workarounds for golangci-lint errors: | ||
| // string `STRING` has N occurrences, make it a constant (goconst) | ||
| const fieldSelectorMetadataName = "metadata.name=" | ||
|
|
||
| func WaitForEventBusReady(ctx context.Context, eventBusClient eventbuspkg.EventBusInterface, eventBusName string, timeout time.Duration) error { | ||
| fieldSelector := fieldSelectorMetadataName + eventBusName | ||
| opts := metav1.ListOptions{FieldSelector: fieldSelector} | ||
| ctx, cancel := context.WithTimeout(ctx, timeout) | ||
| defer cancel() | ||
|
|
@@ -62,7 +66,7 @@ func WaitForEventBusStatefulSetReady(ctx context.Context, kubeClient kubernetes. | |
| } | ||
|
|
||
| func WaitForEventSourceReady(ctx context.Context, eventSourceClient eventsourcepkg.EventSourceInterface, eventSourceName string, timeout time.Duration) error { | ||
| fieldSelector := fieldSelectorMetadataName + eventSourceName | ||
| opts := metav1.ListOptions{FieldSelector: fieldSelector} | ||
| ctx, cancel := context.WithTimeout(ctx, timeout) | ||
| defer cancel() | ||
|
|
@@ -89,7 +93,7 @@ func WaitForEventSourceDeploymentReady(ctx context.Context, kubeClient kubernete | |
| } | ||
|
|
||
| func WaitForSensorReady(ctx context.Context, sensorClient sensorpkg.SensorInterface, sensorName string, timeout time.Duration) error { | ||
| fieldSelector := fieldSelectorMetadataName + sensorName | ||
| opts := metav1.ListOptions{FieldSelector: fieldSelector} | ||
| ctx, cancel := context.WithTimeout(ctx, timeout) | ||
| defer cancel() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # Golang binary building stage | ||
| FROM golang:1.21 | ||
| WORKDIR $GOPATH/src/github.com/nats-io/prometheus-nats-exporter | ||
| RUN git clone --branch v0.14.0 https://github.com/nats-io/prometheus-nats-exporter.git . | ||
| RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w" | ||
|
|
||
| # Final docker image building stage | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not need to remove
e2ehere for the CI.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done