diff --git a/Dockerfile b/Dockerfile index 27bc9fd32..9888a62cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,21 +13,21 @@ FROM gcr.io/distroless/static-debian12:nonroot AS distroless-static ############# fluent-bit-plugin ############# FROM distroless-static AS fluent-bit-plugin -COPY --from=builder /go/src/github.com/gardener/logging/build/out_vali.so /source/plugins/out_vali.so +COPY --from=builder /go/src/github.com/gardener/logging/build/output_plugin.so /source/plugins/output_plugin.so COPY --from=builder /go/src/github.com/gardener/logging/build/copy /bin/cp WORKDIR / -CMD ["/bin/cp", "/source/plugins/out_vali.so", "/plugins"] +CMD ["/bin/cp", "/source/plugins/output_plugin.so", "/plugins"] -############# fluent-bit-vali ############# -FROM ghcr.io/fluent/fluent-operator/fluent-bit:4.1.0 AS fluent-bit-vali +############# fluent-bit-output ############# +FROM ghcr.io/fluent/fluent-operator/fluent-bit:4.1.0 AS fluent-bit-output -COPY --from=builder /go/src/github.com/gardener/logging/build/out_vali.so /fluent-bit/plugins/out_vali.so +COPY --from=builder /go/src/github.com/gardener/logging/build/output_plugin.so /fluent-bit/plugins/output_plugin.so WORKDIR / -CMD ["-e", "/fluent-bit/plugins/out_vali.so", "-c", "/fluent-bit/config/fluent-bit.conf"] +CMD ["-e", "/fluent-bit/plugins/output_plugin.so", "-c", "/fluent-bit/config/fluent-bit.conf"] ############# curator ############# FROM distroless-static AS curator diff --git a/Makefile b/Makefile index 4ebf5311b..a0afd802d 100644 --- a/Makefile +++ b/Makefile @@ -42,9 +42,9 @@ plugin: tidy @GOOS=$(BUILD_PLATFORM) \ GOARCH=$(BUILD_ARCH) \ go build -buildmode=c-shared \ - -o $(REPO_ROOT)/build/out_vali.so \ + -o $(REPO_ROOT)/build/output_plugin.so \ -ldflags="$(LD_FLAGS)" \ - ./cmd/fluent-bit-vali-plugin + ./cmd/fluent-bit-output-plugin .PHONY: curator curator: tidy @@ -90,7 +90,7 @@ docker-images: $(FLUENT_BIT_TO_VALI_IMAGE_REPOSITORY) $(IMAGE_TAG) @BUILD_ARCH=$(BUILD_ARCH) \ - $(REPO_ROOT)/hack/docker-image-build.sh "fluent-bit-vali" \ + $(REPO_ROOT)/hack/docker-image-build.sh "fluent-bit-output" \ $(FLUENT_BIT_VALI_IMAGE_REPOSITORY) $(IMAGE_TAG) @BUILD_ARCH=$(BUILD_ARCH) \ @@ -159,7 +159,7 @@ check: tidy .PHONY: test test: tidy @go tool gotestsum $(REPO_ROOT)/pkg/... --v --ginkgo.v --ginkgo.no-color - @go tool gotestsum $(REPO_ROOT)/tests/valiplugin + @go tool gotestsum $(REPO_ROOT)/tests/plugin .PHONY: e2e-tests e2e-tests: tidy diff --git a/REUSE.toml b/REUSE.toml index 91f8854fa..c2d1d9e7b 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -16,7 +16,9 @@ SPDX-FileCopyrightText = "2017-2024 SAP SE or an SAP affiliate company and Garde SPDX-License-Identifier = "CC-BY-4.0" [[annotations]] -path = ["cmd/fluent-bit-vali-plugin/out_vali.go", "pkg/config/config.go", "pkg/config/plugin_config.go", "pkg/config/client_config.go", "pkg/valiplugin/vali.go", "pkg/valiplugin/utils.go", "pkg/client/buffer_client.go", "pkg/client/dque.go", "pkg/client/buffer.go"] +path = ["cmd/fluent-bit-output-plugin/output_plugin.go", "pkg/config/config.go", "pkg/config/plugin_config.go", +"pkg/config/client_config.go", "pkg/plugin/vali.go", "pkg/plugin/utils.go", "pkg/client/buffer_client.go", +"pkg/client/dque.go", "pkg/client/buffer.go"] precedence = "aggregate" SPDX-FileCopyrightText = "2017-2024 SAP SE or an SAP affiliate company and Gardener contributors" SPDX-License-Identifier = "Apache-2.0" diff --git a/cmd/fluent-bit-vali-plugin/out_vali.go b/cmd/fluent-bit-output-plugin/output_plugin.go similarity index 92% rename from cmd/fluent-bit-vali-plugin/out_vali.go rename to cmd/fluent-bit-output-plugin/output_plugin.go index 6e219802f..0b3f9ddf6 100644 --- a/cmd/fluent-bit-vali-plugin/out_vali.go +++ b/cmd/fluent-bit-output-plugin/output_plugin.go @@ -38,12 +38,12 @@ import ( "github.com/gardener/logging/pkg/config" "github.com/gardener/logging/pkg/healthz" "github.com/gardener/logging/pkg/metrics" - "github.com/gardener/logging/pkg/valiplugin" + "github.com/gardener/logging/pkg/plugin" ) var ( // registered vali plugin instances, required for disposal during shutdown - plugins []valiplugin.Vali + plugins []plugin.OutputPlugin pluginsMutex sync.RWMutex logger log.Logger informer cache.SharedIndexInformer @@ -172,7 +172,7 @@ func (c *pluginConfig) toStringMap() map[string]string { // //export FLBPluginRegister func FLBPluginRegister(ctx unsafe.Pointer) int { - return output.FLBPluginRegister(ctx, "gardenervali", "Ship fluent-bit logs to Credativ Vali") + return output.FLBPluginRegister(ctx, "gardenervali", "Ship fluent-bit logs to Credativ OutputPlugin") } // FLBPluginInit is called for each vali plugin instance @@ -183,8 +183,8 @@ func FLBPluginRegister(ctx unsafe.Pointer) int { //export FLBPluginInit func FLBPluginInit(ctx unsafe.Pointer) int { // shall create only if not found in the context and in plugins slice - if present := output.FLBPluginGetContext(ctx); present != nil && pluginsContains(present.(valiplugin.Vali)) { - _ = level.Info(logger).Log("msg", "plugin already present") + if present := output.FLBPluginGetContext(ctx); present != nil && pluginsContains(present.(plugin.OutputPlugin)) { + _ = level.Info(logger).Log("msg", "outputPlugin already present") return output.FLB_OK } @@ -211,23 +211,23 @@ func FLBPluginInit(ctx unsafe.Pointer) int { dumpConfiguration(_logger, conf) - plugin, err := valiplugin.NewPlugin(informer, conf, _logger) + outputPlugin, err := plugin.NewPlugin(informer, conf, _logger) if err != nil { metrics.Errors.WithLabelValues(metrics.ErrorNewPlugin).Inc() - _ = level.Error(_logger).Log("msg", "error creating plugin", "err", err) + _ = level.Error(_logger).Log("msg", "error creating outputPlugin", "err", err) return output.FLB_ERROR } - // register plugin instance, to be retrievable when sending logs - output.FLBPluginSetContext(ctx, plugin) - // remember plugin instance, required to cleanly dispose when fluent-bit is shutting down + // register outputPlugin instance, to be retrievable when sending logs + output.FLBPluginSetContext(ctx, outputPlugin) + // remember outputPlugin instance, required to cleanly dispose when fluent-bit is shutting down pluginsMutex.Lock() - plugins = append(plugins, plugin) + plugins = append(plugins, outputPlugin) pluginsMutex.Unlock() _ = level.Info(_logger).Log( - "msg", "plugin initialized", + "msg", "outputPlugin initialized", "length", len(plugins)) return output.FLB_OK @@ -237,10 +237,10 @@ func FLBPluginInit(ctx unsafe.Pointer) int { // //export FLBPluginFlushCtx func FLBPluginFlushCtx(ctx, data unsafe.Pointer, length C.int, tag *C.char) int { - plugin, ok := output.FLBPluginGetContext(ctx).(valiplugin.Vali) + outputPlugin, ok := output.FLBPluginGetContext(ctx).(plugin.OutputPlugin) if !ok { metrics.Errors.WithLabelValues(metrics.ErrorFLBPluginFlushCtx).Inc() - _ = level.Error(logger).Log("[flb-go]", "plugin not initialized") + _ = level.Error(logger).Log("[flb-go]", "outputPlugin not initialized") return output.FLB_ERROR } @@ -268,7 +268,7 @@ func FLBPluginFlushCtx(ctx, data unsafe.Pointer, length C.int, tag *C.char) int timestamp = time.Now() } - err := plugin.SendRecord(record, timestamp) + err := outputPlugin.SendRecord(record, timestamp) if err != nil { _ = level.Error(logger).Log( "msg", "error sending record, retrying...", @@ -276,7 +276,7 @@ func FLBPluginFlushCtx(ctx, data unsafe.Pointer, length C.int, tag *C.char) int "err", err.Error(), ) - return output.FLB_RETRY // max retry of the plugin is set to 3, then it shall be discarded by fluent-bit + return output.FLB_RETRY // max retry of the outputPlugin is set to 3, then it shall be discarded by fluent-bit } } @@ -292,16 +292,16 @@ func FLBPluginFlushCtx(ctx, data unsafe.Pointer, length C.int, tag *C.char) int // //export FLBPluginExitCtx func FLBPluginExitCtx(ctx unsafe.Pointer) int { - plugin, ok := output.FLBPluginGetContext(ctx).(valiplugin.Vali) + outputPlugin, ok := output.FLBPluginGetContext(ctx).(plugin.OutputPlugin) if !ok { - _ = level.Error(logger).Log("[flb-go]", "plugin not known") + _ = level.Error(logger).Log("[flb-go]", "outputPlugin not known") return output.FLB_ERROR } - plugin.Close() - pluginsRemove(plugin) + outputPlugin.Close() + pluginsRemove(outputPlugin) _ = level.Info(logger).Log( - "msg", "plugin removed", + "msg", "outputPlugin removed", "length", len(plugins), ) @@ -312,8 +312,8 @@ func FLBPluginExitCtx(ctx unsafe.Pointer) int { // //export FLBPluginExit func FLBPluginExit() int { - for _, plugin := range plugins { - plugin.Close() + for _, outputPlugin := range plugins { + outputPlugin.Close() } if informerStopChan != nil { close(informerStopChan) @@ -417,11 +417,11 @@ func dumpConfiguration(_logger log.Logger, conf *config.Config) { _ = level.Debug(paramLogger).Log("SendLogsToDefaultClientWhenClusterIsInMigrationState", fmt.Sprintf("%+v", conf.ControllerConfig.SeedControllerClientConfig.SendLogsWhenIsInMigrationState)) } -func pluginsContains(present valiplugin.Vali) bool { +func pluginsContains(present plugin.OutputPlugin) bool { pluginsMutex.RLock() defer pluginsMutex.Unlock() - for _, plugin := range plugins { - if present == plugin { + for _, outputPlugin := range plugins { + if present == outputPlugin { return true } } @@ -429,11 +429,11 @@ func pluginsContains(present valiplugin.Vali) bool { return false } -func pluginsRemove(plugin valiplugin.Vali) { +func pluginsRemove(outputPlugin plugin.OutputPlugin) { pluginsMutex.Lock() defer pluginsMutex.Unlock() for i, p := range plugins { - if plugin == p { + if outputPlugin == p { plugins = append(plugins[:i], plugins[i+1:]...) return diff --git a/cmd/fluent-bit-vali-plugin/out_vali.h b/cmd/fluent-bit-output-plugin/output_plugin.h similarity index 100% rename from cmd/fluent-bit-vali-plugin/out_vali.h rename to cmd/fluent-bit-output-plugin/output_plugin.h diff --git a/pkg/client/types.go b/pkg/client/types.go index 300f11044..be7605e04 100644 --- a/pkg/client/types.go +++ b/pkg/client/types.go @@ -34,6 +34,3 @@ type Entry struct { // NewValiClientFunc returns a ValiClient on success. type NewValiClientFunc func(cfg config.Config, logger log.Logger) (ValiClient, error) - -// NewValiClientDecoratorFunc return ValiClient which wraps another ValiClient -type NewValiClientDecoratorFunc func(cfg config.Config, client ValiClient, logger log.Logger) (ValiClient, error) diff --git a/pkg/config/plugin.go b/pkg/config/plugin.go index 4a6a0983f..b0aaa0d75 100644 --- a/pkg/config/plugin.go +++ b/pkg/config/plugin.go @@ -31,7 +31,7 @@ type PluginConfig struct { DynamicHostRegex string `mapstructure:"DynamicHostRegex"` // KubernetesMetadata holds kubernetes metadata extraction configuration KubernetesMetadata KubernetesMetadataExtraction `mapstructure:",squash"` - // DynamicTenant contains specs for the valiplugin dynamic functionality + // DynamicTenant contains specs for the plugin dynamic functionality DynamicTenant DynamicTenant `mapstructure:",squash"` // LabelSetInitCapacity sets the initial capacity for label sets LabelSetInitCapacity int `mapstructure:"LabelSetInitCapacity"` @@ -57,7 +57,7 @@ type KubernetesMetadataExtraction struct { TagExpression string `mapstructure:"TagExpression"` } -// DynamicTenant contains specs for the valiplugin dynamic functionality +// DynamicTenant contains specs for the plugin dynamic functionality type DynamicTenant struct { Tenant string `mapstructure:"-"` Field string `mapstructure:"-"` diff --git a/pkg/controller/client.go b/pkg/controller/client.go index 3b1f78424..974c0f43c 100644 --- a/pkg/controller/client.go +++ b/pkg/controller/client.go @@ -51,7 +51,7 @@ type controllerClient struct { var _ client.ValiClient = &controllerClient{} -// Client is a Vali client for the valiplugin controller +// Client is a Vali client for the plugin controller type Client interface { client.ValiClient GetState() clusterState diff --git a/pkg/valiplugin/utils.go b/pkg/plugin/utils.go similarity index 96% rename from pkg/valiplugin/utils.go rename to pkg/plugin/utils.go index 128c8f07e..55a04da4b 100644 --- a/pkg/valiplugin/utils.go +++ b/pkg/plugin/utils.go @@ -1,11 +1,8 @@ -/* -This file was copied from the credativ/vali project -https://github.com/credativ/vali/blob/v2.2.4/cmd/fluent-bit/vali.go +// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors +// +// SPDX-License-Identifier: Apache-2.0 -Modifications Copyright SAP SE or an SAP affiliate company and Gardener contributors -*/ - -package valiplugin +package plugin import ( "bytes" diff --git a/pkg/valiplugin/utils_test.go b/pkg/plugin/utils_test.go similarity index 99% rename from pkg/valiplugin/utils_test.go rename to pkg/plugin/utils_test.go index ce2236ea4..24ba26963 100644 --- a/pkg/valiplugin/utils_test.go +++ b/pkg/plugin/utils_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package valiplugin +package plugin import ( "errors" @@ -68,7 +68,7 @@ type fallbackToTagWhenMetadataIsMissing struct { err error } -var _ = ginkgov2.Describe("Vali plugin utils", func() { +var _ = ginkgov2.Describe("OutputPlugin plugin utils", func() { ginkgov2.DescribeTable("#createLine", func(args createLineArgs) { got, err := createLine(args.records, args.f) diff --git a/pkg/valiplugin/vali.go b/pkg/plugin/vali.go similarity index 93% rename from pkg/valiplugin/vali.go rename to pkg/plugin/vali.go index 9bdaf3107..f12035d9d 100644 --- a/pkg/valiplugin/vali.go +++ b/pkg/plugin/vali.go @@ -1,11 +1,8 @@ -/* -This file was copied from the credativ/vali project -https://github.com/credativ/vali/blob/v2.2.4/cmd/fluent-bit/vali.go +// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors +// +// SPDX-License-Identifier: Apache-2.0 -Modifications Copyright SAP SE or an SAP affiliate company and Gardener contributors -*/ - -package valiplugin +package plugin import ( "fmt" @@ -25,8 +22,8 @@ import ( "github.com/gardener/logging/pkg/metrics" ) -// Vali plugin interface -type Vali interface { +// OutputPlugin plugin interface +type OutputPlugin interface { SendRecord(r map[any]any, ts time.Time) error Close() } @@ -43,8 +40,8 @@ type vali struct { logger log.Logger } -// NewPlugin returns Vali output plugin -func NewPlugin(informer cache.SharedIndexInformer, cfg *config.Config, logger log.Logger) (Vali, error) { +// NewPlugin returns OutputPlugin output plugin +func NewPlugin(informer cache.SharedIndexInformer, cfg *config.Config, logger log.Logger) (OutputPlugin, error) { var err error v := &vali{cfg: cfg, logger: logger} @@ -169,6 +166,11 @@ func (v *vali) SendRecord(r map[any]any, ts time.Time) error { return nil } + // client.ValiClient - actual client chain to send the log to + // valitail or otlp, dynamicHostName is extracted from DynamicHostPath field + // in the record and must match DynamicHostRegex + // example shoot--local--local + // DynamicHostPath is json form "{"kubernetes": {"namespace_name": "namespace"}}" c := v.getClient(dynamicHostName) if c == nil { diff --git a/pkg/valiplugin/vali_suite_test.go b/pkg/plugin/vali_suite_test.go similarity index 93% rename from pkg/valiplugin/vali_suite_test.go rename to pkg/plugin/vali_suite_test.go index 90bbbe2dc..1740f522e 100644 --- a/pkg/valiplugin/vali_suite_test.go +++ b/pkg/plugin/vali_suite_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package valiplugin_test +package plugin_test import ( "testing" diff --git a/pkg/valiplugin/vali_test.go b/pkg/plugin/vali_test.go similarity index 99% rename from pkg/valiplugin/vali_test.go rename to pkg/plugin/vali_test.go index 19e7ce6a2..3f305fd41 100644 --- a/pkg/valiplugin/vali_test.go +++ b/pkg/plugin/vali_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package valiplugin +package plugin import ( "os" @@ -91,7 +91,7 @@ var ( logger = log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)) ) -var _ = ginkgov2.Describe("Vali plugin", func() { +var _ = ginkgov2.Describe("OutputPlugin plugin", func() { var ( simpleRecordFixture = map[any]any{ "foo": "bar", diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index f059caf69..929e1ca8c 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -41,7 +41,7 @@ func TestMain(m *testing.M) { envfuncs.CreateNamespace(shootNamespace), envfuncs.CreateNamespace(seedNamespace), envfuncs.SetupCRDs("./config", "*-crd.yaml"), - createContainerImage(pluginUnderTest, "fluent-bit-vali"), + createContainerImage(pluginUnderTest, "fluent-bit-output"), createContainerImage(eventLoggerUnderTest, "event-logger"), envfuncs.LoadImageToCluster(kindClusterName, pluginUnderTest), envfuncs.LoadImageToCluster(kindClusterName, eventLoggerUnderTest), diff --git a/tests/valiplugin/README.md b/tests/plugin/README.md similarity index 100% rename from tests/valiplugin/README.md rename to tests/plugin/README.md diff --git a/tests/valiplugin/plugin_suite_test.go b/tests/plugin/plugin_suite_test.go similarity index 93% rename from tests/valiplugin/plugin_suite_test.go rename to tests/plugin/plugin_suite_test.go index f7e6a0239..c50785b5f 100644 --- a/tests/valiplugin/plugin_suite_test.go +++ b/tests/plugin/plugin_suite_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package valiplugin_test +package plugin_test import ( "testing" diff --git a/tests/valiplugin/plugin_test.go b/tests/plugin/plugin_test.go similarity index 81% rename from tests/valiplugin/plugin_test.go rename to tests/plugin/plugin_test.go index 9c1747f71..77ddf1da9 100644 --- a/tests/valiplugin/plugin_test.go +++ b/tests/plugin/plugin_test.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package valiplugin +package plugin import ( "time" @@ -12,12 +12,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllertest" "github.com/gardener/logging/pkg/config" - "github.com/gardener/logging/pkg/valiplugin" - plugintestclient "github.com/gardener/logging/tests/valiplugin/plugintest/client" - plugintestcluster "github.com/gardener/logging/tests/valiplugin/plugintest/cluster" - plugintestconfig "github.com/gardener/logging/tests/valiplugin/plugintest/config" - "github.com/gardener/logging/tests/valiplugin/plugintest/input" - "github.com/gardener/logging/tests/valiplugin/plugintest/matcher" + pkgplugin "github.com/gardener/logging/pkg/plugin" + plugintestclient "github.com/gardener/logging/tests/plugin/plugintest/client" + plugintestcluster "github.com/gardener/logging/tests/plugin/plugintest/cluster" + plugintestconfig "github.com/gardener/logging/tests/plugin/plugintest/config" + "github.com/gardener/logging/tests/plugin/plugintest/input" + "github.com/gardener/logging/tests/plugin/plugintest/matcher" ) const ( @@ -31,7 +31,7 @@ var _ = ginkgov2.Describe("Plugin Test", ginkgov2.Ordered, func() { valiPluginConfiguration config.Config fakeInformer *controllertest.FakeInformer clusters []plugintestcluster.Cluster - plugin valiplugin.Vali + plugin pkgplugin.OutputPlugin loggerController input.LoggerController pods []input.Pod err error @@ -54,7 +54,7 @@ var _ = ginkgov2.Describe("Plugin Test", ginkgov2.Ordered, func() { fakeInformer = &controllertest.FakeInformer{Synced: true} - plugin, err = valiplugin.NewPlugin(fakeInformer, &valiPluginConfiguration, plugintestconfig.NewLogger()) + plugin, err = pkgplugin.NewPlugin(fakeInformer, &valiPluginConfiguration, plugintestconfig.NewLogger()) gomega.Expect(plugin).NotTo(gomega.BeNil()) gomega.Expect(err).NotTo(gomega.HaveOccurred()) }) diff --git a/tests/valiplugin/plugintest/client/client.go b/tests/plugin/plugintest/client/client.go similarity index 100% rename from tests/valiplugin/plugintest/client/client.go rename to tests/plugin/plugintest/client/client.go diff --git a/tests/valiplugin/plugintest/client/local_stream.go b/tests/plugin/plugintest/client/local_stream.go similarity index 100% rename from tests/valiplugin/plugintest/client/local_stream.go rename to tests/plugin/plugintest/client/local_stream.go diff --git a/tests/valiplugin/plugintest/client/type.go b/tests/plugin/plugintest/client/type.go similarity index 100% rename from tests/valiplugin/plugintest/client/type.go rename to tests/plugin/plugintest/client/type.go diff --git a/tests/valiplugin/plugintest/cluster/cluster.go b/tests/plugin/plugintest/cluster/cluster.go similarity index 98% rename from tests/valiplugin/plugintest/cluster/cluster.go rename to tests/plugin/plugintest/cluster/cluster.go index efcfc3abc..2904e7fac 100644 --- a/tests/valiplugin/plugintest/cluster/cluster.go +++ b/tests/plugin/plugintest/cluster/cluster.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/ptr" - "github.com/gardener/logging/tests/valiplugin/plugintest/input" + "github.com/gardener/logging/tests/plugin/plugintest/input" ) type cluster struct { diff --git a/tests/valiplugin/plugintest/cluster/type.go b/tests/plugin/plugintest/cluster/type.go similarity index 100% rename from tests/valiplugin/plugintest/cluster/type.go rename to tests/plugin/plugintest/cluster/type.go diff --git a/tests/valiplugin/plugintest/config/config.go b/tests/plugin/plugintest/config/config.go similarity index 100% rename from tests/valiplugin/plugintest/config/config.go rename to tests/plugin/plugintest/config/config.go diff --git a/tests/valiplugin/plugintest/input/logger.go b/tests/plugin/plugintest/input/logger.go similarity index 90% rename from tests/valiplugin/plugintest/input/logger.go rename to tests/plugin/plugintest/input/logger.go index d0d3a90a8..ec8e2d881 100644 --- a/tests/valiplugin/plugintest/input/logger.go +++ b/tests/plugin/plugintest/input/logger.go @@ -13,7 +13,7 @@ import ( "github.com/onsi/gomega" - "github.com/gardener/logging/pkg/valiplugin" + "github.com/gardener/logging/pkg/plugin" ) // NamespacePrefix is the prefix used for the namespaces created by the logger controller. @@ -28,16 +28,16 @@ type LoggerControllerConfig struct { // LoggerController is responsible for managing the logger pods and sending log records. type LoggerController struct { config LoggerControllerConfig - plugin valiplugin.Vali + plugin plugin.OutputPlugin pods []Pod wg sync.WaitGroup } // NewLoggerController creates a new instance of LoggerController with the given plugin and configuration. -func NewLoggerController(plugin valiplugin.Vali, cfg LoggerControllerConfig) LoggerController { +func NewLoggerController(outputPlugin plugin.OutputPlugin, cfg LoggerControllerConfig) LoggerController { return LoggerController{ config: cfg, - plugin: plugin, + plugin: outputPlugin, } } diff --git a/tests/valiplugin/plugintest/input/output.go b/tests/plugin/plugintest/input/output.go similarity index 100% rename from tests/valiplugin/plugintest/input/output.go rename to tests/plugin/plugintest/input/output.go diff --git a/tests/valiplugin/plugintest/input/pod.go b/tests/plugin/plugintest/input/pod.go similarity index 100% rename from tests/valiplugin/plugintest/input/pod.go rename to tests/plugin/plugintest/input/pod.go diff --git a/tests/valiplugin/plugintest/input/type.go b/tests/plugin/plugintest/input/type.go similarity index 100% rename from tests/valiplugin/plugintest/input/type.go rename to tests/plugin/plugintest/input/type.go diff --git a/tests/valiplugin/plugintest/input/util.go b/tests/plugin/plugintest/input/util.go similarity index 100% rename from tests/valiplugin/plugintest/input/util.go rename to tests/plugin/plugintest/input/util.go diff --git a/tests/valiplugin/plugintest/matcher/matcher.go b/tests/plugin/plugintest/matcher/matcher.go similarity index 87% rename from tests/valiplugin/plugintest/matcher/matcher.go rename to tests/plugin/plugintest/matcher/matcher.go index 10cd5033e..4f5bf4657 100644 --- a/tests/valiplugin/plugintest/matcher/matcher.go +++ b/tests/plugin/plugintest/matcher/matcher.go @@ -7,8 +7,8 @@ package matcher import ( "github.com/prometheus/common/model" - "github.com/gardener/logging/tests/valiplugin/plugintest/client" - "github.com/gardener/logging/tests/valiplugin/plugintest/input" + "github.com/gardener/logging/tests/plugin/plugintest/client" + "github.com/gardener/logging/tests/plugin/plugintest/input" ) // Matcher is an interface that defines the method for matching logs.