Cr 1539 add proxy acceptance test (#204)

Author: roi-codefresh

venona/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

venonactl/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

venonactl/cmd/cmdutils.go

@@ -130,6 +130,16 @@ func extendStoreWithKubeClient(logger logger.Logger) {
 	}
 }
 
+func setVerbosity(verbose bool) {
+	s := store.GetStore()
+	s.Verbose = verbose
+}
+
+func setInsecure(insecure bool) {
+	s := store.GetStore()
+	s.Insecure = insecure
+}
+
 func isUsingDefaultStorageClass(sc string) bool {
 	if sc == "" {
 		return true

venonactl/cmd/test.go

@@ -29,24 +29,52 @@ var allTestPluginTypes = []string{
 	plugins.VolumeProvisionerPluginType,
 	plugins.EnginePluginType,
 	plugins.RuntimeAttachType,
+	plugins.NetworkTesterPluginType,
 }
 
 var testCommandOptions struct {
 	kube struct {
 		namespace string
 		context   string
+		inCluster bool
 	}
-	plugin []string
+	insecure           bool
+	plugin             []string
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
 }
 
 var testCommand = &cobra.Command{
 	Use:   "test",
 	Short: "Run test on the target cluster prior installation",
 	Run: func(cmd *cobra.Command, args []string) {
+		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file>
+		templateValuesMap, err := templateValuesToMap(
+			testCommandOptions.templateValueFiles,
+			testCommandOptions.templateValues,
+			testCommandOptions.templateFileValues)
+		if err != nil {
+			dieOnError(err)
+		}
+		// Merge cmd options with template
+		mergeValueStr(templateValuesMap, "ConfigPath", &kubeConfigPath)
+		mergeValueStr(templateValuesMap, "CodefreshHost", &cfAPIHost)
+		mergeValueStr(templateValuesMap, "Token", &cfAPIToken)
+		mergeValueStr(templateValuesMap, "Namespace", &testCommandOptions.kube.namespace)
+		mergeValueStr(templateValuesMap, "Context", &testCommandOptions.kube.context)
+		mergeValueBool(templateValuesMap, "InCluster", &testCommandOptions.kube.inCluster)
+		mergeValueBool(templateValuesMap, "insecure", &testCommandOptions.insecure)
+
 		lgr := createLogger("test", verbose, logFormatter)
 		s := store.GetStore()
+		buildBasicStore(lgr)
 		extendStoreWithKubeClient(lgr)
-		fillKubernetesAPI(lgr, testCommandOptions.kube.context, testCommandOptions.kube.namespace, false)
+		fillKubernetesAPI(lgr, testCommandOptions.kube.context, testCommandOptions.kube.namespace, testCommandOptions.kube.inCluster)
+		fillCodefreshAPI(lgr)
+		extendStoreWithAgentAPI(lgr, "", "")
+		setVerbosity(verbose)
+		setInsecure(testCommandOptions.insecure)
 
 		builder := plugins.NewBuilder(lgr)
 		for _, p := range testCommandOptions.plugin {
@@ -68,14 +96,24 @@ var testCommand = &cobra.Command{
 			if p == plugins.RuntimeAttachType {
 				builder.Add(plugins.RuntimeAttachType)
 			}
+			if p == plugins.NetworkTesterPluginType {
+				builder.Add(plugins.NetworkTesterPluginType)
+			}
+		}
+
+		options := plugins.TestOptions{
+			KubeBuilder:      getKubeClientBuilder(s.KubernetesAPI.ContextName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster),
+			ClusterNamespace: s.KubernetesAPI.Namespace,
 		}
+
+		values := s.BuildValues()
+		values = mergeMaps(values, templateValuesMap)
+
 		var finalerr error
 		lgr.Info("Testing requirements")
+
 		for _, p := range builder.Get() {
-			err := p.Test(plugins.TestOptions{
-				KubeBuilder:      getKubeClientBuilder(s.KubernetesAPI.ContextName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, false),
-				ClusterNamespace: s.KubernetesAPI.Namespace,
-			})
+			err := p.Test(options, values)
 			if err != nil && finalerr == nil {
 				finalerr = err
 			}
@@ -92,7 +130,13 @@ func init() {
 
 	testCommand.Flags().StringVar(&testCommandOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which monitor should be installed [$KUBE_NAMESPACE]")
 	testCommand.Flags().StringVar(&testCommandOptions.kube.context, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which monitor should be installed (default is current-context) [$KUBE_CONTEXT]")
+	testCommand.Flags().BoolVar(&testCommandOptions.insecure, "insecure", false, "Set to true to disable certificate validation when using TLS connections")
+	testCommand.Flags().BoolVar(&testCommandOptions.kube.inCluster, "in-cluster", false, "Set flag if the command is running inside a cluster")
 	testCommand.Flags().StringArrayVar(&testCommandOptions.plugin, "installer", allTestPluginTypes, "Which test to run, based on the installer type")
 
+	testCommand.Flags().StringArrayVar(&testCommandOptions.templateValues, "set-value", []string{}, "Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes")
+	testCommand.Flags().StringArrayVar(&testCommandOptions.templateFileValues, "set-file", []string{}, "Set values for templates from file, example: --set-file Storage.GoogleServiceAccount=/path/to/service-account.json")
+	testCommand.Flags().StringArrayVarP(&testCommandOptions.templateValueFiles, "values", "f", []string{}, "specify values in a YAML file")
+
 	rootCmd.AddCommand(testCommand)
 }

venonactl/example/values-example.yaml

@@ -48,6 +48,9 @@
 ### default is: runner
 # RuntimeServiceAccount: runner
 
+### SkipClusterTest: only set to true if you want to skip the acceptance tests during the installation
+# SkipClusterTest: true
+
 ### ClusterId --clusterId: used when installing the monitor component
 ### this is the name of the cluster integration in codefresh
 # ClusterId: cluster-name
@@ -60,10 +63,13 @@
 #   HTTPS_PROXY: http://123.123.123.123:8080
 #   NO_PROXY: localhost
 
-### DockerRegistry --docker-registry: the docker registry from which all components
-### images will be pulled. default: docker.io
+### DockerRegistry --docker-registry: The docker registry from which all components images will be pulled [default: docker.io].
+### We will check connectivity from inside the cluster to this domain.
 # DockerRegistry: docker.io
 
+# GitProviderURL: api.github.com # (optional) We will check connectivity to this URL when we run our acceptance tests.
+
+
 ###############################################
 ###            Codefresh Runner             ###
 ###                                         ###
@@ -242,3 +248,12 @@
 #   ServiceAccount: # will be used by the engine and dind pods
 #     Annotations:
 #       foo: bar
+
+
+########################################################
+###                    Logging                       ###
+###                                                  ###
+###        configure build logging solution          ###
+########################################################
+# Logging:
+#   FirebaseHost: firebase.io # (optional) We will check connectivity to this URL when we run our acceptance tests.

venonactl/pkg/plugins/app-proxy.go

@@ -122,7 +122,7 @@ func (u *appProxyPlugin) Migrate(*MigrateOptions, Values) error {
 	return fmt.Errorf("not supported")
 }
 
-func (u *appProxyPlugin) Test(opt TestOptions) error {
+func (u *appProxyPlugin) Test(opt TestOptions, v Values) error {
 	return nil
 }
 

venonactl/pkg/plugins/engine.go

@@ -101,7 +101,7 @@ func (u *enginePlugin) Migrate(*MigrateOptions, Values) error {
 	return fmt.Errorf("not supported")
 }
 
-func (u *enginePlugin) Test(opt TestOptions) error {
+func (u *enginePlugin) Test(opt TestOptions, v Values) error {
 	return nil
 }
 

venonactl/pkg/plugins/monitor.go

@@ -86,7 +86,7 @@ func (u *monitorAgentPlugin) Migrate(*MigrateOptions, Values) error {
 	return fmt.Errorf("not supported")
 }
 
-func (u *monitorAgentPlugin) Test(opt TestOptions) error {
+func (u *monitorAgentPlugin) Test(opt TestOptions, v Values) error {
 	validationRequest := validationRequest{
 		rbac: []rbacValidation{
 			{