config for tests

Author: domsolutions

tests/integration/godog/godog-config.json

@@ -0,0 +1,11 @@
+{
+  "namespace": "seldon-mesh",
+  "log_level": "debug",
+  "skip_cleanup" : false,
+  "inference" : {
+    "host": "localhost",
+    "httpPort": 9000,
+    "grpcPort": 9000,
+    "ssl": false
+  }
+}

tests/integration/godog/scenario/config.go

@@ -0,0 +1,56 @@
+/*
+Copyright (c) 2024 Seldon Technologies Ltd.
+
+Use of this software is governed BY
+(1) the license included in the LICENSE file or
+(2) if the license included in the LICENSE file is the Business Source License 1.1,
+the Change License after the Change Date as each is defined in accordance with the LICENSE file.
+*/
+
+package scenario
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+)
+
+type GodogConfig struct {
+	Namespace   string    `json:"namespace"`
+	LogLevel    string    `json:"log_level"`
+	SkipCleanup bool      `json:"skip_cleanup"`
+	Inference   Inference `json:"inference"`
+}
+
+type Inference struct {
+	Host     string `json:"host"`
+	HTTPPort uint   `json:"httpPort"`
+	GRPCPort uint   `json:"grpcPort"`
+	SSL      bool   `json:"ssl"`
+}
+
+func LoadConfig() (*GodogConfig, error) {
+	configFile := os.Getenv("GODOG_CONFIG_FILE")
+	if configFile == "" {
+		configFile = "./godog-config.json"
+	}
+
+	if _, err := os.Stat(configFile); err != nil {
+		if os.IsNotExist(err) {
+			return nil, fmt.Errorf("config file not found: %s", configFile)
+		}
+		return nil, fmt.Errorf("failed to open config file %s: %w", configFile, err)
+	}
+
+	data, err := os.ReadFile(configFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file %s: %w", configFile, err)
+	}
+
+	var config GodogConfig
+	if err := json.Unmarshal(data, &config); err != nil {
+		return nil, fmt.Errorf("failed to parse config file %s: %w", configFile, err)
+	}
+
+	return &config, nil
+}

tests/integration/godog/scenario/scenario.go

@@ -22,6 +22,7 @@ import (
 type SuiteDeps struct {
 	K8sClient    *k8sclient.K8sClient
 	WatcherStore k8sclient.WatcherStorage
+	Config       *GodogConfig
 }
 
 // might have to pass the suit struct and other config with closures to avoid having global vars
@@ -55,19 +56,26 @@ var suiteDeps SuiteDeps
 // it will deploy into the default server capability that might be in our server dpeloyment def
 
 func InitializeTestSuite(ctx *godog.TestSuiteContext) {
+	// Load configuration from JSON file
+	config, err := LoadConfig()
+	if err != nil {
+		panic(fmt.Errorf("failed to load config: %w", err))
+	}
+
 	// Create long-lived deps here
-	k8sClient, err := k8sclient.New("seldon-mesh")
+	k8sClient, err := k8sclient.New(config.Namespace)
 	if err != nil {
 		panic(fmt.Errorf("failed to create k8s client: %w", err))
 	}
 
-	watchStore, err := k8sclient.NewWatcherStore("seldon-mesh", k8sclient.CRDLabels, k8sClient.KubeClient)
+	watchStore, err := k8sclient.NewWatcherStore(config.Namespace, k8sclient.CRDLabels, k8sClient.KubeClient)
 	if err != nil {
 		panic(fmt.Errorf("failed to create k8s watch store: %w", err))
 	}
 
 	suiteDeps.K8sClient = k8sClient
 	suiteDeps.WatcherStore = watchStore
+	suiteDeps.Config = config
 
 	ctx.BeforeSuite(func() {
 		suiteDeps.WatcherStore.Start()
@@ -81,16 +89,25 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) {
 }
 
 func InitializeScenario(scenarioCtx *godog.ScenarioContext) {
+	log := logrus.New()
+	if suiteDeps.Config.LogLevel != "" {
+		logLevel, err := logrus.ParseLevel(suiteDeps.Config.LogLevel)
+		if err != nil {
+			panic(fmt.Errorf("failed to parse log level %s: %w", logLevel, err))
+		}
+		log.SetLevel(logLevel)
+	}
+
 	// Create the world with long-lived deps once per scenario context
 	world, err := steps.NewWorld(steps.Config{
-		Namespace:      "seldon-mesh", //TODO configurable
-		Logger:         logrus.New().WithField("test_type", "godog"),
+		Namespace:      suiteDeps.Config.Namespace,
+		Logger:         log.WithField("test_type", "godog"),
 		KubeClient:     suiteDeps.K8sClient,
 		WatcherStorage: suiteDeps.WatcherStore,
-		IngressHost:    "localhost", //TODO configurable
-		HTTPPort:       9000,        //TODO configurable
-		GRPCPort:       9000,        //TODO configurable
-		SSL:            false,       //TODO configurable
+		IngressHost:    suiteDeps.Config.Inference.Host,
+		HTTPPort:       suiteDeps.Config.Inference.HTTPPort,
+		GRPCPort:       suiteDeps.Config.Inference.GRPCPort,
+		SSL:            suiteDeps.Config.Inference.SSL,
 	})
 	if err != nil {
 		panic(fmt.Errorf("failed to create world: %w", err))
@@ -118,6 +135,13 @@ func InitializeScenario(scenarioCtx *godog.ScenarioContext) {
 		// if cleanupErr := world.KubeClient.DeleteGodogTestModels(); cleanupErr != nil && err == nil {
 		//     err = cleanupErr
 		// }
+
+		if suiteDeps.Config.SkipCleanup {
+			log.WithField("scenario", scenario.Name).Debug("Skipping cleanup")
+			return ctx, nil
+		}
+
+		// TODO clean up
 		return ctx, err
 	})
 
@@ -126,5 +150,4 @@ func InitializeScenario(scenarioCtx *godog.ScenarioContext) {
 	steps.LoadExplicitModelSteps(scenarioCtx, world)
 	steps.LoadInferenceSteps(scenarioCtx, world)
 	// TODO: load other steps, e.g. pipeline, experiment, etc.
-
 }

tests/integration/godog/steps/world.go

@@ -10,13 +10,15 @@ the Change License after the Change Date as each is defined in accordance with t
 package steps
 
 import (
+	"crypto/tls"
 	"fmt"
 	"net/http"
 
 	"github.com/seldonio/seldon-core/apis/go/v2/mlops/v2_dataplane"
 	"github.com/seldonio/seldon-core/tests/integration/godog/k8sclient"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 )
 
@@ -54,9 +56,15 @@ type inference struct {
 }
 
 func NewWorld(c Config) (*World, error) {
-	// TODO TLS for gRPC when c.SSL == true
+	creds := insecure.NewCredentials()
+	if c.SSL {
+		creds = credentials.NewTLS(&tls.Config{
+			InsecureSkipVerify: true,
+		})
+	}
+
 	opts := []grpc.DialOption{
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithTransportCredentials(creds),
 	}
 
 	conn, err := grpc.NewClient(fmt.Sprintf("%s:%d", c.IngressHost, c.GRPCPort), opts...)