[tests] Minor improvements

Author: geropl

.werft/run-integration-tests.yaml

@@ -5,6 +5,9 @@ args:
 - name: namespace
   desc: "The namespace to run the integration test against"
   required: true
+- name: username
+  desc: "The username to run the integration test with"
+  required: false
 pod:
   serviceAccount: werft
   nodeSelector:
@@ -62,9 +65,15 @@ pod:
       cp -R /config/gcloud /root/.config/gcloud
       export GOOGLE_APPLICATION_CREDENTIALS=/config/gcloud/legacy_credentials/[email protected]/adc.json
       echo "[prep] received config."
+
+      USERNAME="{{ .Annotations.username }}"
+      if [[ "$USERNAME" == "<no value>" ]]; then
+        USERNAME=""
+      fi
+      echo "[prep] using username: $USERNAME"
       echo "[prep|DONE]"
 
-      /entrypoint.sh -kubeconfig=/config/kubeconfig -namespace={{ .Annotations.namespace }} 2>&1 | ts "[int-tests] "
+      /entrypoint.sh -kubeconfig=/config/kubeconfig -namespace={{ .Annotations.namespace }} -username=$USERNAME 2>&1 | ts "[int-tests] "
       
       RC=${PIPESTATUS[0]}
       if [ $RC -eq 1 ]; then echo "[int-tests|FAIL]"; else echo "[int-tests|DONE]"; fi

test/pkg/integration/apis.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"strconv"
 	"strings"
 	"time"
 
@@ -65,16 +66,27 @@ type ComponentAPI struct {
 		BlobServiceClient csapi.BlobServiceClient
 	}
 	dbStatus struct {
-		Port     int
-		Password string
-		DB       *sql.DB
+		Config *DBConfig
+		DB     *sql.DB
 	}
 	imgbldStatus struct {
 		Port   int
 		Client imgbldr.ImageBuilderClient
 	}
 }
 
+type DBConfig struct {
+	Host        string
+	Port        int32
+	ForwardPort *ForwardPort
+	Password    string
+}
+
+type ForwardPort struct {
+	PodName    string
+	RemotePort int32
+}
+
 // Supervisor provides a gRPC connection to a workspace's supervisor
 func (c *ComponentAPI) Supervisor(instanceID string) (res grpc.ClientConnInterface) {
 	pod, _, err := c.t.selectPod(ComponentWorkspace, selectPodOptions{InstanceID: instanceID})
@@ -370,81 +382,31 @@ func (c *ComponentAPI) DB() *sql.DB {
 		c.t.t.Fatalf("cannot access database: %q", rerr)
 	}()
 
-	if c.dbStatus.Port == 0 {
-		svc, err := c.t.clientset.CoreV1().Services(c.t.namespace).Get(context.Background(), "db", metav1.GetOptions{})
-		if err != nil {
-			rerr = err
-			return nil
-		}
-		pods, err := c.t.clientset.CoreV1().Pods(c.t.namespace).List(context.Background(), metav1.ListOptions{
-			LabelSelector: labels.SelectorFromSet(svc.Spec.Selector).String(),
-		})
+	if c.dbStatus.Config == nil {
+		config, err := c.findDBConfig()
 		if err != nil {
 			rerr = err
 			return nil
 		}
-		if len(pods.Items) == 0 {
-			rerr = xerrors.Errorf("no pods for service %s found", svc.Name)
-			return nil
-		}
-		var pod *corev1.Pod
-		for _, p := range pods.Items {
-			if p.Spec.NodeName == "" {
-				// no node means the pod can't be ready
-				continue
-			}
-			var isReady bool
-			for _, cond := range p.Status.Conditions {
-				if cond.Type == corev1.PodReady {
-					isReady = cond.Status == corev1.ConditionTrue
-					break
-				}
-			}
-			if !isReady {
-				continue
-			}
-
-			pod = &p
-			break
-		}
-		if pod == nil {
-			rerr = xerrors.Errorf("no active pod for service %s found", svc.Name)
-			return nil
-		}
+		c.dbStatus.Config = config
+	}
+	config := c.dbStatus.Config
 
-		localPort, err := getFreePort()
-		if err != nil {
-			rerr = err
-			return nil
-		}
+	// if configured: setup local port-forward to DB pod
+	if config.ForwardPort != nil {
 		ctx, cancel := context.WithCancel(context.Background())
-		ready, errc := forwardPort(ctx, c.t.restConfig, c.t.namespace, pod.Name, fmt.Sprintf("%d:3306", localPort))
+		ready, errc := forwardPort(ctx, c.t.restConfig, c.t.namespace, config.ForwardPort.PodName, fmt.Sprintf("%d:%d", config.Port, config.ForwardPort.RemotePort))
 		select {
-		case err = <-errc:
+		case err := <-errc:
 			cancel()
 			rerr = err
 			return nil
 		case <-ready:
 		}
 		c.t.closer = append(c.t.closer, func() error { cancel(); return nil })
-
-		c.dbStatus.Port = localPort
-	}
-	if c.dbStatus.Password == "" {
-		sct, err := c.t.clientset.CoreV1().Secrets(c.t.namespace).Get(context.Background(), "db-password", metav1.GetOptions{})
-		if err != nil {
-			rerr = err
-			return nil
-		}
-		pwd, ok := sct.Data["mysql-root-password"]
-		if !ok {
-			rerr = xerrors.Errorf("no mysql-root-password data present in secret %s", sct.Name)
-			return nil
-		}
-		c.dbStatus.Password = string(pwd)
 	}
 
-	db, err := sql.Open("mysql", fmt.Sprintf("gitpod:%s@tcp(127.0.0.1:%d)/gitpod", c.dbStatus.Password, c.dbStatus.Port))
+	db, err := sql.Open("mysql", fmt.Sprintf("gitpod:%s@tcp(%s:%d)/gitpod", config.Password, config.Host, config.Port))
 	if err != nil {
 		rerr = err
 		return nil
@@ -455,6 +417,127 @@ func (c *ComponentAPI) DB() *sql.DB {
 	return db
 }
 
+func (c *ComponentAPI) findDBConfig() (*DBConfig, error) {
+	config, err := c.findDBConfigFromPodEnv("server")
+	if err != nil {
+		return nil, err
+	}
+
+	// here we _assume_ that "config" points to a service: find us a concrete DB pod to forward to
+	svc, err := c.t.clientset.CoreV1().Services(c.t.namespace).Get(context.Background(), config.Host, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	// find remotePort
+	var remotePort int32
+	for _, p := range svc.Spec.Ports {
+		if p.Port == config.Port {
+			remotePort = p.TargetPort.IntVal
+			if remotePort == 0 {
+				remotePort = p.Port
+			}
+			break
+		}
+	}
+	if remotePort == 0 {
+		return nil, fmt.Errorf("no ports found on service: %s", svc.Name)
+	}
+
+	// find pod to forward to
+	pods, err := c.t.clientset.CoreV1().Pods(c.t.namespace).List(context.Background(), metav1.ListOptions{
+		LabelSelector: labels.SelectorFromSet(svc.Spec.Selector).String(),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(pods.Items) == 0 {
+		return nil, fmt.Errorf("no pods for service %s found", svc.Name)
+	}
+	var pod *corev1.Pod
+	for _, p := range pods.Items {
+		if p.Spec.NodeName == "" {
+			// no node means the pod can't be ready
+			continue
+		}
+		var isReady bool
+		for _, cond := range p.Status.Conditions {
+			if cond.Type == corev1.PodReady {
+				isReady = cond.Status == corev1.ConditionTrue
+				break
+			}
+		}
+		if !isReady {
+			continue
+		}
+
+		pod = &p
+		break
+	}
+	if pod == nil {
+		return nil, fmt.Errorf("no active pod for service %s found", svc.Name)
+	}
+
+	localPort, err := getFreePort()
+	if err != nil {
+		return nil, err
+	}
+	config.Port = int32(localPort)
+	config.ForwardPort = &ForwardPort{
+		RemotePort: remotePort,
+		PodName:    pod.Name,
+	}
+	config.Host = "127.0.0.1"
+
+	return config, nil
+}
+
+func (c *ComponentAPI) findDBConfigFromPodEnv(componentName string) (*DBConfig, error) {
+	lblSelector := fmt.Sprintf("component=%s", componentName)
+	list, err := c.t.clientset.CoreV1().Pods(c.t.namespace).List(context.Background(), metav1.ListOptions{
+		LabelSelector: lblSelector,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(list.Items) == 0 {
+		return nil, fmt.Errorf("no pods found for: %s", lblSelector)
+	}
+	pod := list.Items[0]
+
+	var password string
+	var port int32
+	var host string
+OuterLoop:
+	for _, c := range pod.Spec.Containers {
+		for _, v := range c.Env {
+			if v.Name == "DB_PASSWORD" {
+				password = v.Value
+			} else if v.Name == "DB_PORT" {
+				pPort, err := strconv.Atoi(v.Value)
+				if err != nil {
+					return nil, fmt.Errorf("error parsing DB_PORT '%s' on pod %s!", v.Value, pod.Name)
+				}
+				port = int32(pPort)
+			} else if v.Name == "DB_HOST" {
+				host = v.Value
+			}
+			if password != "" && port != 0 && host != "" {
+				break OuterLoop
+			}
+		}
+	}
+	if password == "" || port == 0 || host == "" {
+		return nil, fmt.Errorf("could not find complete DBConfig on pod %s!", pod.Name)
+	}
+	config := DBConfig{
+		Host:     host,
+		Port:     port,
+		Password: password,
+	}
+	return &config, nil
+}
+
 // ImageBuilder provides access to the image builder service.
 func (c *ComponentAPI) ImageBuilder() imgbldr.ImageBuilderClient {
 	if c.imgbldStatus.Client != nil {