Add support for OS_KEY and OS_CERT in e2e tests (#748)

* Add support for OS_KEY and OS_CERT in e2e tests * Support configuring the router for e2e tests
sapcc · Jan 19, 2023 · 8441fe4 · 8441fe4
1 parent 1c09c5c
commit 8441fe4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/test/e2e/framework/auth_info.go b/test/e2e/framework/auth_info.go
@@ -1,6 +1,7 @@
 package framework
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -25,6 +26,21 @@ func NewOpensStackAuth(authOptions *tokens.AuthOptions) (runtime.ClientAuthInfoW
 		return nil, fmt.Errorf("could not initialize openstack client: %v", err)
 	}
 
+	transport := &http.Transport{}
+	if os.Getenv("OS_CERT") != "" && os.Getenv("OS_KEY") != "" {
+		cert, err := tls.LoadX509KeyPair(os.Getenv("OS_CERT"), os.Getenv("OS_KEY"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to load x509 keypair: %w", err)
+		}
+		transport.TLSClientConfig = &tls.Config{
+			Certificates: []tls.Certificate{cert},
+			MinVersion:   tls.VersionTLS12,
+		}
+		provider.HTTPClient = http.Client{
+			Transport: transport,
+		}
+	}
+
 	if err := openstack.AuthenticateV3(provider, authOptions, gophercloud.EndpointOpts{}); err != nil {
 		return nil, fmt.Errorf("could not authenticate with openstack: %v", err)
 	}

diff --git a/test/e2e/framework/openstack.go b/test/e2e/framework/openstack.go
@@ -1,7 +1,9 @@
 package framework
 
 import (
+	"crypto/tls"
 	"fmt"
+	"net/http"
 	"os"
 
 	"github.com/gophercloud/gophercloud"
@@ -34,6 +36,21 @@ func NewOpenStackFramework() (*OpenStack, error) {
 		return nil, fmt.Errorf("could not initialize openstack client: %v", err)
 	}
 
+	transport := &http.Transport{}
+	if os.Getenv("OS_CERT") != "" && os.Getenv("OS_KEY") != "" {
+		cert, err := tls.LoadX509KeyPair(os.Getenv("OS_CERT"), os.Getenv("OS_KEY"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to load x509 keypair: %w", err)
+		}
+		transport.TLSClientConfig = &tls.Config{
+			Certificates: []tls.Certificate{cert},
+			MinVersion:   tls.VersionTLS12,
+		}
+		provider.HTTPClient = http.Client{
+			Transport: transport,
+		}
+	}
+
 	provider.UseTokenLock()
 
 	err = openstack.AuthenticateV3(provider, authOptions, gophercloud.EndpointOpts{})

diff --git a/test/e2e/setup_test.go b/test/e2e/setup_test.go
@@ -77,6 +77,9 @@ func (s *SetupTests) CreateCluster(t *testing.T) {
 			SSHPublicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCXIxVEUgtUVkvk2VM1hmIb8MxvxsmvYoiq9OBy3J8akTGNybqKsA2uhcwxSJX5Cn3si8kfMfka9EWiJT+e1ybvtsGILO5XRZPxyhYzexwb3TcALwc3LuzpF3Z/Dg2jYTRELTGhYmyca3mxzTlCjNXvYayLNedjJ8fIBzoCuSXNqDRToHru7h0Glz+wtuE74mNkOiXSvhtuJtJs7VCNVjobFQNfC1aeDsri2bPRHJJZJ0QF4LLYSayMEz3lVwIDyAviQR2Aa97WfuXiofiAemfGqiH47Kq6b8X7j3bOYGBvJKMUV7XeWhGsskAmTsvvnFxkc5PAD3Ct+liULjiQWlzDrmpTE8aMqLK4l0YQw7/8iRVz6gli42iEc2ZG56ob1ErpTLAKFWyCNOebZuGoygdEQaGTIIunAncXg5Rz07TdPl0Tf5ZZLpiAgR5ck0H1SETnjDTZ/S83CiVZWJgmCpu8YOKWyYRD4orWwdnA77L4+ixeojLIhEoNL8KlBgsP9Twx+fFMWLfxMmiuX+yksM6Hu+Lsm+Ao7Q284VPp36EB1rxP1JM7HCiEOEm50Jb6hNKjgN4aoLhG5yg+GnDhwCZqUwcRJo1bWtm3QvRA+rzrGZkId4EY3cyOK5QnYV5+24x93Ex0UspHMn7HGsHUESsVeV0fLqlfXyd2RbHTmDMP6w== Kubernikus Master Key",
 			ClusterCIDR:  &clusterCidr,
 			NodePools:    pools,
+			Openstack: models.OpenstackSpec{
+				RouterID: os.Getenv("KLUSTER_ROUTER"),
+			},
 		},
 	}