cleanup test configuration settings

Signed-off-by: Ivan Milchev <[email protected]>

.env.example

@@ -0,0 +1,2 @@
+MONDOO_API_TOKEN=xxxx
+MONDOO_GQL_ENDPOINT=https://api.edge.mondoo.com/query

.github/workflows/integration-tests.yaml

@@ -80,11 +80,6 @@ jobs:
       - name: Wait a bit for the runner to become more stable
         run: for i in 1 2 3 4 5; do kubectl -n kube-system wait --for=condition=Ready pods --all --timeout=180s && break || sleep 10; done
 
-      # There are connection timeouts set to 30s in the k8s components. This means that they might seem like
-      # they are working but in fact they are just waiting on a connection.
-      - name: Wait for 40s
-        run: sleep 40
-
       - name: Run integration tests
         env:
           MONDOO_SERVICE_ACCOUNT_EDGE: ${{ secrets.MONDOO_SERVICE_ACCOUNT_EDGE}}

.gitignore

@@ -48,4 +48,5 @@ tests/integration/_output
 /cnquery
 /cnspec
 
-package.json
+package.json
+.env

.vscode/settings.json

@@ -4,4 +4,5 @@
     "gopls": {
         "formatting.gofumpt": true,
     },
+    "go.testEnvFile": "${workspaceFolder}/.env",
 }

Makefile

@@ -1,3 +1,8 @@
+ifneq (,$(wildcard ./.env))
+	include .env
+	export
+endif
+
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.
 # To re-generate a bundle for another specific version without changing the standard setup, you can:

tests/framework/nexus/client.go

@@ -4,28 +4,40 @@
 package nexus
 
 import (
-	"go.mondoo.com/cnquery/v9/providers-sdk/v1/upstream"
+	"fmt"
+	"os"
 
 	mondoogql "go.mondoo.com/mondoo-go"
 	"go.mondoo.com/mondoo-go/option"
 )
 
-type Client struct {
-	spaceMrn string
+const (
+	MONDOO_API_TOKEN_VAR    = "MONDOO_API_TOKEN"
+	MONDOO_GQL_ENDPOINT_VAR = "MONDOO_GQL_ENDPOINT"
+)
 
+type Client struct {
 	Client *mondoogql.Client
 }
 
-func NewClient(serviceAccount *upstream.ServiceAccountCredentials) (*Client, error) {
+func NewClient() (*Client, error) {
+	gqlEndpoint := os.Getenv(MONDOO_GQL_ENDPOINT_VAR)
+	if gqlEndpoint == "" {
+		return nil, fmt.Errorf("missing environment variable %s", MONDOO_GQL_ENDPOINT_VAR)
+	}
+
+	apiToken := os.Getenv(MONDOO_API_TOKEN_VAR)
+	if apiToken == "" {
+		return nil, fmt.Errorf("missing environment variable %s", MONDOO_API_TOKEN_VAR)
+	}
 	// Initialize the client
-	client, err := mondoogql.NewClient(option.WithEndpoint("https://api.edge.mondoo.com/query"), option.WithAPIToken(""))
+	client, err := mondoogql.NewClient(option.WithEndpoint(gqlEndpoint), option.WithAPIToken(apiToken))
 	if err != nil {
 		return nil, err
 	}
 
 	return &Client{
-		spaceMrn: serviceAccount.ParentMrn,
-		Client:   client,
+		Client: client,
 	}, nil
 }
 

tests/framework/nexus/k8s/integration.go

@@ -183,7 +183,7 @@ type CiCdJob struct {
 	Grade     string
 }
 
-func (p *CiCdProject) ListAssets(ctx context.Context, assetType string) ([]CiCdJob, error) {
+func (p *CiCdProject) ListAssets(ctx context.Context) ([]CiCdJob, error) {
 	var q struct {
 		CicdProjectJobs struct {
 			Jobs struct {

tests/integration/audit_config_base_suite.go

@@ -64,10 +64,7 @@ func (s *AuditConfigBaseSuite) SetupSuite() {
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	s.ctx = context.Background()
 
-	sa, err := utils.GetServiceAccount()
-	s.Require().NoError(err, "Service account not set")
-	nexusClient, err := nexus.NewClient(sa)
-
+	nexusClient, err := nexus.NewClient()
 	s.Require().NoError(err, "Failed to create Nexus client")
 	s.spaceClient = nexusClient.GetSpace()
 
@@ -808,7 +805,7 @@ func (s *AuditConfigBaseSuite) checkDeployments(auditConfig *mondoov2.MondooAudi
 	cicdProject, err := s.integration.GetCiCdProject(s.ctx)
 	s.Require().NoError(err, "Failed to get CICD project")
 
-	assets, err := cicdProject.ListAssets(s.ctx, "")
+	assets, err := cicdProject.ListAssets(s.ctx)
 	s.Require().NoError(err, "Failed to list CICD assets")
 
 	assetNames := utils.CiCdJobNames(assets)
@@ -824,7 +821,7 @@ func (s *AuditConfigBaseSuite) checkDeployments(auditConfig *mondoov2.MondooAudi
 		s.NoErrorf(err, "Failed creating a Deployment in permissive mode.")
 	}
 
-	assets, err = cicdProject.ListAssets(s.ctx, "")
+	assets, err = cicdProject.ListAssets(s.ctx)
 	s.Require().NoError(err, "Failed to list CICD assets")
 
 	assetNames = utils.CiCdJobNames(assets)

tests/integration/audit_config_namespace_test.go

@@ -86,6 +86,7 @@ func (s *AuditConfigCustomNamespaceSuite) TestReconcile_KubernetesResources() {
 
 func (s *AuditConfigCustomNamespaceSuite) TestReconcile_Containers() {
 	auditConfig := utils.DefaultAuditConfigMinimal(s.ns.Name, false, true, false, false)
+	auditConfig.Spec.Scanner.ServiceAccountName = s.sa.Name
 
 	// Ignore the operator namespace and the scanner namespace because we cannot scan a local image
 	auditConfig.Spec.Filtering.Namespaces.Exclude = []string{s.ns.Name, s.testCluster.Settings.Namespace, "kube-system"}