Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for env variable. #1301

Merged
merged 2 commits into from
Mar 17, 2022
Merged

Fix for env variable. #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38392d3
Fix for env variable.
enrichman Mar 16, 2022
805903c
added cli test case
enrichman Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion acceptance/apps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ var _ = Describe("Apps", func() {
"--bind", configurationName,
"--instances", "2",
"--env", "CREDO=up",
"--env", "DOGMA=no")
"--env", "DOGMA=no",
"--env", "COMPLEX=-X foo=bar",
)
Expect(err).ToNot(HaveOccurred(), out)
Expect(out).To(MatchRegexp("Ok"))

Expand All @@ -84,6 +86,7 @@ var _ = Describe("Apps", func() {
Expect(out).To(MatchRegexp(`Configurations\s*\|\s*` + configurationName + `\s*\|`))
Expect(out).To(MatchRegexp(`- CREDO\s*\|\s*up\s*\|`))
Expect(out).To(MatchRegexp(`- DOGMA\s*\|\s*no\s*\|`))
Expect(out).To(MatchRegexp(`- COMPLEX\s*\|\s*-X foo=bar\s*\|`))
})

Context("manifest", func() {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ var CmdAppCreate = &cobra.Command{
return errors.Wrap(err, "error initializing cli")
}

m, err := manifest.UpdateISE(models.ApplicationManifest{}, cmd)
m, err := manifest.UpdateICE(models.ApplicationManifest{}, cmd)
if err != nil {
return errors.Wrap(err, "unable to get app configuration")
}
Expand Down Expand Up @@ -236,7 +236,7 @@ var CmdAppUpdate = &cobra.Command{
return errors.Wrap(err, "error initializing cli")
}

m, err := manifest.UpdateISE(models.ApplicationManifest{}, cmd)
m, err := manifest.UpdateICE(models.ApplicationManifest{}, cmd)
if err != nil {
return errors.Wrap(err, "unable to get app configuration")
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var CmdAppPush = &cobra.Command{
return errors.Wrap(err, "Manifest error")
}

m, err = manifest.UpdateISE(m, cmd)
m, err = manifest.UpdateICE(m, cmd)
if err != nil {
return err
}
Expand Down
140 changes: 95 additions & 45 deletions internal/manifest/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,52 @@ func UpdateRoutes(manifest models.ApplicationManifest, cmd *cobra.Command) (mode
}

// UpdateBSN updates the incoming manifest with information pulled from the --builder,
// sources (--path, --git, and --container-imageurl), and --name options. Option
// information replaces any existing information.
// sources (--path, --git, and --container-imageurl), and --name options.
// Option information replaces any existing information.
func UpdateBSN(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
var err error
// BSN - Builder, Source origin, Name

// B:uilder - Retrieve from options
manifest, err = UpdateBuilder(manifest, cmd)
if err != nil {
return manifest, err
}

// S:ources - Retrieve from options
manifest, err = UpdateSources(manifest, cmd)
if err != nil {
return manifest, err
}

// N:ame - Retrieve from options
manifest, err = UpdateName(manifest, cmd)
if err != nil {
return manifest, err
}

return manifest, nil
}

// UpdateBuilder updates the incoming manifest with information pulled from the --builder option
func UpdateBuilder(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
builderImage, err := cmd.Flags().GetString("builder-image")
if err != nil {
return manifest, errors.Wrap(err, "could not read option --builder-image")
}

// S:ources - Retrieve from options
// B:uilder - Replace

if builderImage != "" {
manifest.Staging.Builder = builderImage
}

return manifest, nil
}

// UpdateSources updates the incoming manifest with information pulled from the sources
// (--path, --git, and --container-imageurl) options
func UpdateSources(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
path, err := cmd.Flags().GetString("path")
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --name")
Expand Down Expand Up @@ -108,22 +140,6 @@ func UpdateBSN(manifest models.ApplicationManifest, cmd *cobra.Command) (models.
}
}

// N:ame - Retrieve from options

name, err := cmd.Flags().GetString("name")
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --name")
}

// Retrieval complete, without errors. Update manifest as needed. No errors
// possible here.

// B:uilder - replace

if builderImage != "" {
manifest.Staging.Builder = builderImage
}

// S:ources - Replace

if origins > 0 {
Expand All @@ -141,6 +157,16 @@ func UpdateBSN(manifest models.ApplicationManifest, cmd *cobra.Command) (models.
}
}

return manifest, nil
}

// UpdateName updates the incoming manifest with information pulled from the --name option
func UpdateName(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
name, err := cmd.Flags().GetString("name")
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --name")
}

// N:ame - Replace

if name != "" {
Expand All @@ -150,45 +176,40 @@ func UpdateBSN(manifest models.ApplicationManifest, cmd *cobra.Command) (models.
return manifest, nil
}

// UpdateISE updates the incoming manifest with information pulled from the
// --bind, --env, and --instances options. Option information replaces any existing
// information.
func UpdateISE(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {

// ISE - Instances, Configurations, environment
// UpdateICE updates the incoming manifest with information pulled from the
// --bind, --env, and --instances options.
// Option information replaces any existing information.
func UpdateICE(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
var err error
// ICE - Instances, Configurations, Environment

// I:nstances - Retrieve from options

instances, err := instances(cmd)
manifest, err = UpdateInstances(manifest, cmd)
if err != nil {
return manifest, err
}

// S:ervices - Retrieve from options

boundConfigurations, err := cmd.Flags().GetStringSlice("bind")
// C:onfigurations - Retrieve from options
manifest, err = UpdateConfigurations(manifest, cmd)
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --bind")
return manifest, err
}

// E:nvironment - Retrieve from options

evAssignments, err := cmd.Flags().GetStringSlice("env")
manifest, err = UpdateEnvironment(manifest, cmd)
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --env")
return manifest, err
}

environment := models.EnvVariableMap{}
for _, assignment := range evAssignments {
pieces := strings.Split(assignment, "=")
if len(pieces) != 2 {
return manifest, errors.New("Bad --env assignment `" + assignment + "`, expected `name=value` as value")
}
environment[pieces[0]] = pieces[1]
}
return manifest, nil
}

// Retrieval complete, without errors. Update manifest as needed. No errors
// possible here.
// UpdateInstances updates the incoming manifest with information pulled from the --instances option
func UpdateInstances(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
instances, err := instances(cmd)
if err != nil {
return manifest, err
}

// I:nstances - Replace

Expand All @@ -199,13 +220,42 @@ func UpdateISE(manifest models.ApplicationManifest, cmd *cobra.Command) (models.
// - AppCreate API will replace it with `v1.DefaultInstances`
// - AppUpdate API will treat it as no op, i.e. keep current instances.

// S: Configurations - Replace
return manifest, nil
}

// UpdateConfigurations updates the incoming manifest with information pulled from the --bind option
func UpdateConfigurations(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
boundConfigurations, err := cmd.Flags().GetStringSlice("bind")
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --bind")
}

// C: Configurations - Replace

if len(boundConfigurations) > 0 {
boundConfigurations = uniqueStrings(boundConfigurations)
manifest.Configuration.Configurations = boundConfigurations
}

return manifest, nil
}

// UpdateEnvironment updates the incoming manifest with information pulled from the --env option
func UpdateEnvironment(manifest models.ApplicationManifest, cmd *cobra.Command) (models.ApplicationManifest, error) {
evAssignments, err := cmd.Flags().GetStringSlice("env")
if err != nil {
return manifest, errors.Wrap(err, "failed to read option --env")
}

environment := models.EnvVariableMap{}
for _, assignment := range evAssignments {
pieces := strings.SplitN(assignment, "=", 2)
if len(pieces) < 2 {
return manifest, errors.New("Bad --env assignment `" + assignment + "`, expected `name=value` as value")
}
environment[pieces[0]] = pieces[1]
}

// E:nvironment - Replace

if len(environment) > 0 {
Expand Down