[tf] flag to skip deployment of specific apps

Steven Landow · Steven Landow · commit 18ef8a5b874e · 2022-06-07T15:32:21.000-07:00
Change-Id: I7f1dbf6c7ec5bbd26fe2deb195efc0ee5c5f26e2
diff --git a/pkg/test/framework/components/echo/deployment/builder.go b/pkg/test/framework/components/echo/deployment/builder.go
@@ -132,6 +132,11 @@ func (b builder) With(i *echo.Instance, cfg echo.Config) Builder {
 		return b
 	}
 
+	if !filterConfig(cfg) {
+		scopes.Framework.Infof("filtered echo config %s due to istio.test.echo.filter.match", cfg)
+		return b
+	}
+
 	cfg = cfg.DeepCopy()
 	if err := cfg.FillDefaults(b.ctx); err != nil {
 		b.errs = multierror.Append(b.errs, err)
diff --git a/pkg/test/framework/components/echo/deployment/flags.go b/pkg/test/framework/components/echo/deployment/flags.go
@@ -18,20 +18,49 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"os"
-
 	"gopkg.in/yaml.v3"
+	"istio.io/istio/pkg/test/scopes"
+	"istio.io/istio/pkg/test/util/tmpl"
+	"os"
+	"regexp"
 
 	"istio.io/istio/pkg/test/framework/components/echo"
 	"istio.io/istio/pkg/test/framework/config"
 	"istio.io/istio/pkg/test/util/file"
 )
 
-var additionalConfigs = &configs{}
+const defaultEchoConfigFilterTmpl = "{{.Service}}"
+
+var (
+	additionalConfigs = &configs{}
+
+	configFilter, configFilterTmpl string
+)
 
 func init() {
 	flag.Var(additionalConfigs, "istio.test.echo.configs", "The path to a file containing a list of "+
 		"echo.Config in YAML which will be added to the set of echos for every suite.")
+	flag.StringVar(&configFilter, "istio.test.echo.filter.match", "", "A regex that all echo configs must match "+
+		"or deployment will be skipped.")
+	flag.StringVar(&configFilterTmpl, "istio.test.echo.filter.matchTemplate", defaultEchoConfigFilterTmpl, "Template rendered from the echo.Config that "+
+		"builds a string for istio.test.echo.filter.match to check against.")
+}
+
+func filterConfig(config echo.Config) bool {
+	if configFilter == "" {
+		return true
+	}
+	configFilterRe, err := regexp.Compile(configFilter)
+	if err != nil {
+		scopes.Framework.Errorf("failed to compile regexp for istio.test.echo.filter.match: %v", err)
+		return true
+	}
+	filterStr, err := tmpl.Evaluate(configFilterTmpl, config)
+	if err != nil {
+		scopes.Framework.Errorf("failed evaluating template for istio.test.echo.filter.matchTemplate: %v", err)
+		return true
+	}
+	return configFilterRe.MatchString(filterStr)
 }
 
 // configs wraps a slice of echo.Config to implement the config.Value interface, allowing
