Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: Use internal/tools for tools rather than install from Makefile #1698

Merged
merged 10 commits into from
Jun 25, 2024
Merged

deps: Use internal/tools for tools rather than install from Makefile #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7f2cace
change to use tools dir
dpaasman00 Jun 25, 2024
67b65e1
update version tags
dpaasman00 Jun 25, 2024
798642a
goreleaser version
dpaasman00 Jun 25, 2024
d88fd44
ci
dpaasman00 Jun 25, 2024
2d48abe
exclude tools gosec
dpaasman00 Jun 25, 2024
7167286
gosec version
dpaasman00 Jun 25, 2024
1f55a68
ignore tools in make test
dpaasman00 Jun 25, 2024
d6d560d
update test to ignore tools dir
dpaasman00 Jun 25, 2024
6f27c78
update tools & run mockery
dpaasman00 Jun 25, 2024
12e1999
Add empty tools_test
antonblock Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ GOARCH ?= $(shell go env GOARCH)

INTEGRATION_TEST_ARGS?=-tags integration

TOOLS_MOD_DIR := ./internal/tools

ifeq ($(GOOS), windows)
EXT?=.exe
else
Expand Down Expand Up @@ -88,18 +90,18 @@ build-windows-amd64:
# tool-related commands
.PHONY: install-tools
install-tools:
go install github.com/client9/misspell/cmd/misspell@v0.3.4
go install github.com/google/addlicense@v1.1.1
go install github.com/mgechev/revive@v1.3.7
go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@v0.96.0
go install github.com/securego/gosec/v2/cmd/gosec@v2.18.2
cd $(TOOLS_MOD_DIR) && go install github.com/client9/misspell/cmd/misspell
cd $(TOOLS_MOD_DIR) && go install github.com/google/addlicense
cd $(TOOLS_MOD_DIR) && go install github.com/mgechev/revive
cd $(TOOLS_MOD_DIR) && go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen
cd $(TOOLS_MOD_DIR) && go install github.com/securego/gosec/v2/cmd/gosec
# update cosign in release.yml when updating this version
# update cosign in docs/verify-signature.md when updating this version
go install github.com/sigstore/cosign/cmd/cosign@v1.13.1
go install github.com/uw-labs/lichen@v0.1.7
go install github.com/vektra/mockery/v2@v2.42.0
go install golang.org/x/tools/cmd/goimports@latest
go install github.com/goreleaser/goreleaser@v1.22.1
cd $(TOOLS_MOD_DIR) && go install github.com/uw-labs/lichen
cd $(TOOLS_MOD_DIR) && go install github.com/vektra/mockery/v2
cd $(TOOLS_MOD_DIR) && go install golang.org/x/tools/cmd/goimports
cd $(TOOLS_MOD_DIR) && go install github.com/goreleaser/goreleaser

.PHONY: lint
lint:
Expand Down Expand Up @@ -149,6 +151,7 @@ gosec:
-exclude-dir=receiver/sapnetweaverreceiver \
-exclude-dir=extension/bindplaneextension \
-exclude-dir=processor/snapshotprocessor \
-exclude-dir=internal/tools \
./...
# exclude the testdata dir; it contains a go program for testing.
cd updater; gosec -exclude-dir internal/service/testdata ./...
Expand Down
2 changes: 1 addition & 1 deletion collector/mocks/mock_collector.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/azureblobexporter/internal/mocks/mock_blob_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/azureblobexporter/internal/mocks/mock_marshaler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/chronicleexporter/mock_log_marshaler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/chronicleforwarderexporter/internal/mocks/chronicle_forwarder_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/snowflakeexporter/internal/database/mocks/mock_database.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 // indirect
go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect
go.opentelemetry.io/collector/filter v0.102.0 // indirect
go.opentelemetry.io/collector/filter v0.102.1 // indirect
antonblock marked this conversation as resolved.
Show resolved Hide resolved
go.opentelemetry.io/collector/pdata/testdata v0.102.1 // indirect
go.opentelemetry.io/collector/service v0.102.1 // indirect
go.opentelemetry.io/contrib/config v0.7.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,8 +2632,8 @@ go.opentelemetry.io/collector/extension/zpagesextension v0.102.1 h1:YV+ejCgOBJjA
go.opentelemetry.io/collector/extension/zpagesextension v0.102.1/go.mod h1:/CZXg9/C64k85/k4bc7NFbCNP/MiPUZucbxPUN04ny4=
go.opentelemetry.io/collector/featuregate v1.9.0 h1:mC4/HnR5cx/kkG1RKOQAvHxxg5Ktmd9gpFdttPEXQtA=
go.opentelemetry.io/collector/featuregate v1.9.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U=
go.opentelemetry.io/collector/filter v0.102.0 h1:2K4Q/l4b+tglMAQmxpscuCr/juyozyPx17Q6Dfm2FwU=
go.opentelemetry.io/collector/filter v0.102.0/go.mod h1:zDVjFCeeVct7hYwejzx+aRC1dbHaPsvv/Ob1SvCiQjE=
go.opentelemetry.io/collector/filter v0.102.1 h1:qHVt97V3iCfAwzAzddbgWH9Xm5k2sGaU3hPRHB7uSwE=
go.opentelemetry.io/collector/filter v0.102.1/go.mod h1:6vrr9XoD+fJekeTz5G01mCy6XqMBsARgbJruXcUnhQU=
go.opentelemetry.io/collector/otelcol v0.102.1 h1:JdRG3ven+c5k703QpZG5bxJi4JJOnWaNP/EJvN+oYnI=
go.opentelemetry.io/collector/otelcol v0.102.1/go.mod h1:kHf9KBXOLZXajR1On8XJbBBGcgh2I2+/mVVroPzOLJU=
go.opentelemetry.io/collector/pdata v1.9.0 h1:qyXe3HEVYYxerIYu0rzgo1Tx2d1Zs6iF+TCckbHLFOw=
Expand Down
2 changes: 1 addition & 1 deletion internal/rehydration/mock_consumer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/report/mocks/mock_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/report/mocks/mock_reporter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/service/mocks/mock_runnable_service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading