Skip to content

Commit

Permalink
misc: rename agentlint to alloylint
Browse files Browse the repository at this point in the history
  • Loading branch information
rfratto committed Mar 25, 2024
1 parent 5e64dc9 commit 6ecf77f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 21 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ include tools/make/*.mk
ALLOY_IMAGE ?= grafana/alloy:latest
ALLOY_BINARY ?= build/alloy
SERVICE_BINARY ?= build/alloy-service
AGENTLINT_BINARY ?= build/agentlint
ALLOYLINT_BINARY ?= build/alloylint
GOOS ?= $(shell go env GOOS)
GOARCH ?= $(shell go env GOARCH)
GOARM ?= $(shell go env GOARM)
Expand Down Expand Up @@ -126,9 +126,9 @@ endif
#

.PHONY: lint
lint: agentlint
lint: alloylint
find . -name go.mod -execdir golangci-lint run -v --timeout=10m \;
$(AGENTLINT_BINARY) ./...
$(ALLOYLINT_BINARY) ./...

.PHONY: test
# We have to run test twice: once for all packages with -race and then once
Expand Down Expand Up @@ -169,11 +169,11 @@ else
$(GO_ENV) go build $(GO_FLAGS) -o $(SERVICE_BINARY) ./cmd/alloy-service
endif

agentlint:
alloylint:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
cd ./internal/cmd/agentlint && $(GO_ENV) go build $(GO_FLAGS) -o ../../../$(AGENTLINT_BINARY) .
cd ./internal/cmd/alloylint && $(GO_ENV) go build $(GO_FLAGS) -o ../../../$(ALLOYLINT_BINARY) .
endif

#
Expand Down
7 changes: 0 additions & 7 deletions internal/cmd/agentlint/go.mod

This file was deleted.

6 changes: 0 additions & 6 deletions internal/cmd/agentlint/go.sum

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Command agentlint provides custom linting utilities for the grafana/alloy
// Command alloylint provides custom linting utilities for the grafana/alloy
// repo.
package main

import (
"github.com/grafana/alloy/internal/cmd/agentlint/internal/findcomponents"
"github.com/grafana/alloy/internal/cmd/agentlint/internal/syntaxtags"
"github.com/grafana/alloy/internal/cmd/alloylint/internal/findcomponents"
"github.com/grafana/alloy/internal/cmd/alloylint/internal/syntaxtags"
"golang.org/x/tools/go/analysis/multichecker"
)

Expand Down

0 comments on commit 6ecf77f

Please sign in to comment.