From 0fba35c5ed0d630a47ba2e45be37f82cea99e417 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Fri, 1 Mar 2024 12:44:39 -0500 Subject: [PATCH] component: remove classic module.* components Remove the deprecated classic module.* components. The files have been moved to testcomponents/ as there are still valuable tests that depend on them; these can be removed in the future. --- internal/component/all/all.go | 4 ---- internal/flow/componenttest/testfailmodule.go | 2 +- internal/flow/import_test.go | 2 +- .../internal/testcomponents}/module/file/file.go | 2 +- .../internal/testcomponents}/module/git/git.go | 2 +- .../internal/testcomponents}/module/http/http.go | 2 +- .../internal/testcomponents}/module/module.go | 0 .../internal/testcomponents}/module/string/string.go | 2 +- internal/flow/module_eval_test.go | 2 +- 9 files changed, 7 insertions(+), 11 deletions(-) rename internal/{component => flow/internal/testcomponents}/module/file/file.go (98%) rename internal/{component => flow/internal/testcomponents}/module/git/git.go (98%) rename internal/{component => flow/internal/testcomponents}/module/http/http.go (98%) rename internal/{component => flow/internal/testcomponents}/module/module.go (100%) rename internal/{component => flow/internal/testcomponents}/module/string/string.go (96%) diff --git a/internal/component/all/all.go b/internal/component/all/all.go index f6911eb95b..7cc147ea80 100644 --- a/internal/component/all/all.go +++ b/internal/component/all/all.go @@ -57,10 +57,6 @@ import ( _ "github.com/grafana/agent/internal/component/loki/source/windowsevent" // Import loki.source.windowsevent _ "github.com/grafana/agent/internal/component/loki/write" // Import loki.write _ "github.com/grafana/agent/internal/component/mimir/rules/kubernetes" // Import mimir.rules.kubernetes - _ "github.com/grafana/agent/internal/component/module/file" // Import module.file - _ "github.com/grafana/agent/internal/component/module/git" // Import module.git - _ "github.com/grafana/agent/internal/component/module/http" // Import module.http - _ "github.com/grafana/agent/internal/component/module/string" // Import module.string _ "github.com/grafana/agent/internal/component/otelcol/auth/basic" // Import otelcol.auth.basic _ "github.com/grafana/agent/internal/component/otelcol/auth/bearer" // Import otelcol.auth.bearer _ "github.com/grafana/agent/internal/component/otelcol/auth/headers" // Import otelcol.auth.headers diff --git a/internal/flow/componenttest/testfailmodule.go b/internal/flow/componenttest/testfailmodule.go index 297579880b..b5f4de1757 100644 --- a/internal/flow/componenttest/testfailmodule.go +++ b/internal/flow/componenttest/testfailmodule.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/grafana/agent/internal/component" - mod "github.com/grafana/agent/internal/component/module" "github.com/grafana/agent/internal/featuregate" + mod "github.com/grafana/agent/internal/flow/internal/testcomponents/module" ) func init() { diff --git a/internal/flow/import_test.go b/internal/flow/import_test.go index 65642605f4..e70e498af2 100644 --- a/internal/flow/import_test.go +++ b/internal/flow/import_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/tools/txtar" - _ "github.com/grafana/agent/internal/component/module/string" + _ "github.com/grafana/agent/internal/flow/internal/testcomponents/module/string" ) // The tests are using the .txtar files stored in the testdata folder. diff --git a/internal/component/module/file/file.go b/internal/flow/internal/testcomponents/module/file/file.go similarity index 98% rename from internal/component/module/file/file.go rename to internal/flow/internal/testcomponents/module/file/file.go index 7c0ec3dd11..89e6f23f7d 100644 --- a/internal/component/module/file/file.go +++ b/internal/flow/internal/testcomponents/module/file/file.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/agent/internal/component" "github.com/grafana/agent/internal/component/local/file" - "github.com/grafana/agent/internal/component/module" "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/agent/internal/flow/internal/testcomponents/module" "github.com/grafana/river/rivertypes" ) diff --git a/internal/component/module/git/git.go b/internal/flow/internal/testcomponents/module/git/git.go similarity index 98% rename from internal/component/module/git/git.go rename to internal/flow/internal/testcomponents/module/git/git.go index b1a363b4da..2a57a21278 100644 --- a/internal/component/module/git/git.go +++ b/internal/flow/internal/testcomponents/module/git/git.go @@ -11,8 +11,8 @@ import ( "github.com/go-kit/log" "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/module" "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/agent/internal/flow/internal/testcomponents/module" "github.com/grafana/agent/internal/flow/logging/level" "github.com/grafana/agent/internal/vcs" ) diff --git a/internal/component/module/http/http.go b/internal/flow/internal/testcomponents/module/http/http.go similarity index 98% rename from internal/component/module/http/http.go rename to internal/flow/internal/testcomponents/module/http/http.go index af33860f60..04ca9043f8 100644 --- a/internal/component/module/http/http.go +++ b/internal/flow/internal/testcomponents/module/http/http.go @@ -7,9 +7,9 @@ import ( "go.uber.org/atomic" "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/module" remote_http "github.com/grafana/agent/internal/component/remote/http" "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/agent/internal/flow/internal/testcomponents/module" "github.com/grafana/river/rivertypes" ) diff --git a/internal/component/module/module.go b/internal/flow/internal/testcomponents/module/module.go similarity index 100% rename from internal/component/module/module.go rename to internal/flow/internal/testcomponents/module/module.go diff --git a/internal/component/module/string/string.go b/internal/flow/internal/testcomponents/module/string/string.go similarity index 96% rename from internal/component/module/string/string.go rename to internal/flow/internal/testcomponents/module/string/string.go index e631c2646b..6a51c5cedb 100644 --- a/internal/component/module/string/string.go +++ b/internal/flow/internal/testcomponents/module/string/string.go @@ -4,8 +4,8 @@ import ( "context" "github.com/grafana/agent/internal/component" - "github.com/grafana/agent/internal/component/module" "github.com/grafana/agent/internal/featuregate" + "github.com/grafana/agent/internal/flow/internal/testcomponents/module" "github.com/grafana/river/rivertypes" ) diff --git a/internal/flow/module_eval_test.go b/internal/flow/module_eval_test.go index 94b811b423..4447fa530f 100644 --- a/internal/flow/module_eval_test.go +++ b/internal/flow/module_eval_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - _ "github.com/grafana/agent/internal/component/module/string" + _ "github.com/grafana/agent/internal/flow/internal/testcomponents/module/string" ) func TestUpdates_EmptyModule(t *testing.T) {