Skip to content
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/describe_affected.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
u "github.com/cloudposse/atmos/pkg/utils"
)

// describeAffectedCmd produces a list of the affected Atmos components and stacks given two Git commits
// describeAffectedCmd produces a list of the affected Atmos components and stacks given two Git commits.
var describeAffectedCmd = &cobra.Command{
Use: "affected",
Short: "List Atmos components and stacks affected by two Git commits",
Expand All @@ -30,6 +30,7 @@ func init() {
describeAffectedCmd.PersistentFlags().String("ssh-key-password", "", "Encryption password for the PEM-encoded private key if the key contains a password-encrypted PEM block")
describeAffectedCmd.PersistentFlags().Bool("include-spacelift-admin-stacks", false, "Include the Spacelift admin stack of any stack that is affected by config changes")
describeAffectedCmd.PersistentFlags().Bool("include-dependents", false, "Include the dependent components and stacks")
describeAffectedCmd.PersistentFlags().String("dependents-stack", "", "Filter the dependent components by a specific stack. Only used when `--include-dependents` is set to `true`")
describeAffectedCmd.PersistentFlags().Bool("include-settings", false, "Include the `settings` section for each affected component")
describeAffectedCmd.PersistentFlags().Bool("upload", false, "Upload the affected components and stacks to a specified HTTP endpoint")
AddStackCompletion(describeAffectedCmd)
Expand Down
6 changes: 6 additions & 0 deletions cmd/describe_dependents.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ func setFlagsForDescribeDependentsCmd(flags *pflag.FlagSet, describe *exec.Descr
return ErrInvalidFormat
}

err = setStringFlagIfChanged(flags, "dependents-stack", &describe.DependentsStack)
if err != nil {
return err
}

return nil
}

Expand All @@ -128,6 +133,7 @@ func init() {
describeDependentsCmd.PersistentFlags().Bool("process-templates", true, "Enable/disable Go template processing in Atmos stack manifests when executing the command")
describeDependentsCmd.PersistentFlags().Bool("process-functions", true, "Enable/disable YAML functions processing in Atmos stack manifests when executing the command")
describeDependentsCmd.PersistentFlags().StringSlice("skip", nil, "Skip executing a YAML function when processing Atmos stack manifests")
describeDependentsCmd.PersistentFlags().String("dependents-stack", "", "Filter the dependent components by a specific stack")

err := describeDependentsCmd.MarkPersistentFlagRequired("stack")
errUtils.CheckErrorPrintAndExit(err, "", "")
Expand Down
4 changes: 4 additions & 0 deletions cmd/describe_stacks.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ func setCliArgsForDescribeStackCli(flags *pflag.FlagSet, describe *exec.Describe
"skip": &describe.Skip,
}

// `true` by default
describe.ProcessTemplates = true
describe.ProcessYamlFunctions = true

var err error
for k := range flagsKeyValue {
if !flags.Changed(k) {
Expand Down
15 changes: 10 additions & 5 deletions cmd/describe_stacks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ func TestSetFlagValueInDescribeStacksCliArgs(t *testing.T) {
},
describe: &exec.DescribeStacksArgs{},
expected: &exec.DescribeStacksArgs{
Format: "json",
ProcessTemplates: true,
Skip: []string{"tests"},
Format: "json",
ProcessTemplates: true,
ProcessYamlFunctions: true,
Skip: []string{"tests"},
},
},
{
Expand All @@ -71,7 +72,9 @@ func TestSetFlagValueInDescribeStacksCliArgs(t *testing.T) {
},
describe: &exec.DescribeStacksArgs{},
expected: &exec.DescribeStacksArgs{
Format: "yaml",
Format: "yaml",
ProcessTemplates: true,
ProcessYamlFunctions: true,
},
},
{
Expand All @@ -81,7 +84,9 @@ func TestSetFlagValueInDescribeStacksCliArgs(t *testing.T) {
},
describe: &exec.DescribeStacksArgs{},
expected: &exec.DescribeStacksArgs{
Format: "json",
Format: "json",
ProcessTemplates: true,
ProcessYamlFunctions: true,
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion demo/screengrabs/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
INSTALL_PATH ?= ../../website/src/components/Screengrabs
all: build-all install

# Write to /website/static/screengrab/
# Write to website/src/components/Screengrabs/
install:
@echo "Installing screengrabs to $(INSTALL_PATH)"
@mkdir -p $(INSTALL_PATH)
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-advanced/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG GEODESIC_OS=debian
# https://atmos.tools/
# https://github.com/cloudposse/atmos
# https://github.com/cloudposse/atmos/releases
ARG ATMOS_VERSION=1.189.0
ARG ATMOS_VERSION=1.190.0

# Terraform: https://github.com/hashicorp/terraform/releases
ARG TF_VERSION=1.5.7
Expand Down
56 changes: 28 additions & 28 deletions go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading