Added ability to pass config file to grpc plugin in integration tests (…

…#3253) * Added ability to pass config file to grpc plugin in integration tests If PLUGIN_CONFIG_PATH env var is set, its value is passed to --grpc-storage-plugin.configuration-file flag. Signed-off-by: Yury Frolov <[email protected]> * Reverted jaeger-ui changes Signed-off-by: Yury Frolov <[email protected]>
jaegertracing · Sep 9, 2021 · b5d340d · b5d340d
1 parent f5bb954
commit b5d340d
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
@@ -34,19 +34,27 @@ type GRPCStorageIntegrationTestSuite struct {
 	StorageIntegration
 	logger           *zap.Logger
 	pluginBinaryPath string
+	pluginConfigPath string
 }
 
 func (s *GRPCStorageIntegrationTestSuite) initialize() error {
 	s.logger, _ = testutils.NewLogger()
 
 	f := grpc.NewFactory()
 	v, command := config.Viperize(f.AddFlags)
-	err := command.ParseFlags([]string{
+	flags := []string{
 		"--grpc-storage-plugin.binary",
 		s.pluginBinaryPath,
 		"--grpc-storage-plugin.log-level",
 		"debug",
-	})
+	}
+	if s.pluginConfigPath != "" {
+		flags = append(flags,
+			"--grpc-storage-plugin.configuration-file",
+			s.pluginConfigPath,
+		)
+	}
+	err := command.ParseFlags(flags)
 	if err != nil {
 		return err
 	}
@@ -81,13 +89,18 @@ func TestGRPCStorage(t *testing.T) {
 	if os.Getenv("STORAGE") != "grpc-plugin" {
 		t.Skip("Integration test against grpc skipped; set STORAGE env var to grpc-plugin to run this")
 	}
-	path := os.Getenv("PLUGIN_BINARY_PATH")
-	if path == "" {
+	binaryPath := os.Getenv("PLUGIN_BINARY_PATH")
+	if binaryPath == "" {
 		t.Logf("PLUGIN_BINARY_PATH env var not set, using %s", defaultPluginBinaryPath)
-		path = defaultPluginBinaryPath
+		binaryPath = defaultPluginBinaryPath
+	}
+	configPath := os.Getenv("PLUGIN_CONFIG_PATH")
+	if configPath == "" {
+		t.Log("PLUGIN_CONFIG_PATH env var not set")
 	}
 	s := &GRPCStorageIntegrationTestSuite{
-		pluginBinaryPath: path,
+		pluginBinaryPath: binaryPath,
+		pluginConfigPath: configPath,
 	}
 	require.NoError(t, s.initialize())
 	s.IntegrationTestAll(t)