Add support for prefix on password type (#378)

The prefix and suffix conditions currently only apply for string not password types, that should be modified

Author: michaeljguarino

cmd/plural/deploy.go

@@ -121,7 +121,9 @@ func (p *Plural) doBuild(installation *api.Installation, force bool) error {
 	fmt.Printf("Building workspace for %s\n", repoName)
 
 	if !wkspace.Configured(repoName) {
-		return fmt.Errorf("You have not locally configured %s but have it registered as an installation in our api, either delete it with `plural apps uninstall %s` or install it locally via a bundle in `plural bundle list %s`", repoName, repoName, repoName)
+		fmt.Printf("You have not locally configured %s but have it registered as an installation in our api, ", repoName)
+		fmt.Printf("either delete it with `plural apps uninstall %s` or install it locally via a bundle in `plural bundle list %s`\n", repoName, repoName)
+		return nil
 	}
 
 	workspace, err := wkspace.New(p.Client, installation)
@@ -148,42 +150,6 @@ func (p *Plural) doBuild(installation *api.Installation, force bool) error {
 	return err
 }
 
-func (p *Plural) validate(c *cli.Context) error {
-	p.InitPluralClient()
-	if c.IsSet("only") {
-		installation, err := p.GetInstallation(c.String("only"))
-		if err != nil {
-			return api.GetErrorResponse(err, "GetInstallation")
-		}
-		return p.doValidate(installation)
-	}
-
-	installations, err := p.getSortedInstallations("")
-	if err != nil {
-		return err
-	}
-
-	for _, installation := range installations {
-		if err := p.doValidate(installation); err != nil {
-			return err
-		}
-	}
-
-	utils.Success("Workspace providers are properly configured!\n")
-	return nil
-}
-
-func (p *Plural) doValidate(installation *api.Installation) error {
-	p.InitPluralClient()
-	utils.Highlight("Validating repository %s\n", installation.Repository.Name)
-	workspace, err := wkspace.New(p.Client, installation)
-	if err != nil {
-		return err
-	}
-
-	return workspace.Validate()
-}
-
 func (p *Plural) info(c *cli.Context) error {
 	p.InitPluralClient()
 	repo := c.Args().Get(0)

cmd/plural/deploy_test.go

@@ -4,7 +4,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/mock"
 	"gopkg.in/yaml.v2"
 
 	plural "github.com/pluralsh/plural/cmd/plural"
@@ -76,93 +75,3 @@ func TestBuildContext(t *testing.T) {
 		})
 	}
 }
-
-func TestValidate(t *testing.T) {
-	tests := []struct {
-		name             string
-		args             []string
-		installations    []*api.Installation
-		charts           []*api.ChartInstallation
-		tfs              []*api.TerraformInstallation
-		pm               manifest.ProjectManifest
-		ctx              manifest.Context
-		expectedResponse string
-	}{
-		{
-			name: `test "validate"`,
-			args: []string{plural.ApplicationName, "validate"},
-			installations: []*api.Installation{{
-				Id: "abc",
-				Repository: &api.Repository{
-					Id:   "abc",
-					Name: "abc",
-				},
-			},
-				{
-					Id: "cde",
-					Repository: &api.Repository{
-						Id:   "cde",
-						Name: "cde",
-					},
-				},
-			},
-			pm: manifest.ProjectManifest{
-				Cluster:  "test",
-				Bucket:   "test",
-				Project:  "test",
-				Provider: "kind",
-				Region:   "test",
-			},
-			ctx: manifest.Context{
-				Bundles: []*manifest.Bundle{
-					{
-						Repository: "cde",
-						Name:       "cde",
-					},
-					{
-						Repository: "abc",
-						Name:       "abc",
-					},
-				},
-			},
-			tfs:    []*api.TerraformInstallation{},
-			charts: []*api.ChartInstallation{},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			// create temp environment
-			currentDir, err := os.Getwd()
-			assert.NoError(t, err)
-			dir, err := os.MkdirTemp("", "config")
-			assert.NoError(t, err)
-			defer func(path, currentDir string) {
-				_ = os.RemoveAll(path)
-				_ = os.Chdir(currentDir)
-			}(dir, currentDir)
-
-			err = os.Chdir(dir)
-			assert.NoError(t, err)
-
-			data, err := yaml.Marshal(test.pm)
-			assert.NoError(t, err)
-			err = os.WriteFile("workspace.yaml", data, os.FileMode(0755))
-			assert.NoError(t, err)
-
-			data, err = yaml.Marshal(test.ctx)
-			assert.NoError(t, err)
-			err = os.WriteFile("context.yaml", data, os.FileMode(0755))
-			assert.NoError(t, err)
-
-			client := mocks.NewClient(t)
-			client.On("GetInstallations").Return(test.installations, nil)
-			client.On("GetPackageInstallations", mock.AnythingOfType("string")).Return(test.charts, test.tfs, nil)
-			app := plural.CreateNewApp(&plural.Plural{Client: client})
-			app.HelpName = plural.ApplicationName
-			os.Args = test.args
-			resp, err := captureStdout(app, os.Args)
-			assert.NoError(t, err)
-			assert.Equal(t, test.expectedResponse, resp)
-		})
-	}
-}

cmd/plural/plural.go

@@ -182,19 +182,6 @@ func (p *Plural) getCommands() []cli.Command {
 			Action:   latestVersion(apply),
 			Category: "Publishing",
 		},
-		{
-			Name:    "validate",
-			Aliases: []string{"v"},
-			Usage:   "validates your workspace",
-			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "only",
-					Usage: "repository to (re)build",
-				},
-			},
-			Action:   latestVersion(p.validate),
-			Category: "Workspace",
-		},
 		{
 			Name:     "topsort",
 			Aliases:  []string{"top"},

pkg/bundle/configuration.go

@@ -39,12 +39,15 @@ func evaluateCondition(ctx map[string]interface{}, cond *api.Condition, valueTyp
 		return ok && !booled // it must be a false boolean value
 	}
 
-	switch operationType {
-	case OperationType{Operation: "PREFIX", Type: String}:
+	if operationType.Operation == "PREFIX" {
 		return strings.HasPrefix(val.(string), condValue)
-	case OperationType{Operation: "SUFFIX", Type: String}:
-		val := ctx[cond.Field]
+	}
+
+	if operationType.Operation == "SUFFIX" {
 		return strings.HasSuffix(val.(string), condValue)
+	}
+
+	switch operationType {
 	case OperationType{Operation: "EQ", Type: String}:
 		return val == condValue
 	case OperationType{Operation: "EQ", Type: Int}: