Skip to content

fix rotate paths roundtripping #504

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

Open
nyobe wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix rotate paths roundtripping #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dab0ff
do not prefix input rotation docpaths with `values.`
nyobe Mar 28, 2025
ba014df
add the values prefix in the rotate CLI
nyobe Mar 28, 2025
e847cef
update test input
nyobe Mar 28, 2025
b70cd4e
words
nyobe Mar 28, 2025
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
7 changes: 5 additions & 2 deletions cmd/esc/cli/env_rotate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package cli
import (
"context"
"fmt"
"slices"
"strings"

"github.com/pulumi/esc/cmd/esc/cli/client"
Expand Down Expand Up @@ -39,11 +40,13 @@ func newEnvRotateCmd(envcmd *envCommand) *cobra.Command {

rotationPaths := []string{}
for _, arg := range args[1:] {
_, err := resource.ParsePropertyPath(arg)
path, err := resource.ParsePropertyPath(arg)
if err != nil {
return fmt.Errorf("'%s' is an invalid property path: %w", arg, err)
}
rotationPaths = append(rotationPaths, arg)
// implicitly prefix the given path with the values top level key
path = slices.Insert(path, 0, "values")
rotationPaths = append(rotationPaths, path.String())
}

resp, diags, err := envcmd.esc.client.RotateEnvironment(ctx, ref.orgName, ref.projectName, ref.envName, rotationPaths)
Expand Down
2 changes: 1 addition & 1 deletion eval/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func RotateEnvironment(
) (*esc.Environment, *RotationResult, syntax.Diagnostics) {
rotateDocPaths := make(map[string]bool, len(paths))
for _, path := range paths {
rotateDocPaths["values."+path.String()] = true
rotateDocPaths[path.String()] = true
}
return evalEnvironment(ctx, false, true, name, env, decrypter, providers, environments, execContext, true, rotateDocPaths)
}
Expand Down
6 changes: 3 additions & 3 deletions eval/testdata/eval/rotate-paths/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"rotate": true,
"rotatePaths": [
"examples[\"subscript-path\"][0]",
"examples.deeply.nested[0][\"quoted \\\"property\\\"\"].path",
"examples.embedded-in-another-fn[\"fn::open::test\"].some-input"
"values.examples[\"subscript-path\"][0]",
"values.examples.deeply.nested[0][\"quoted \\\"property\\\"\"].path",
"values.examples.embedded-in-another-fn[\"fn::open::test\"].some-input"
]
}
Loading