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.

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

Stop use of templated-policy and templated-policy-file simultaneously #19389

Merged
merged 1 commit into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all 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: 3 additions & 0 deletions .changelog/19389.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
cli: stop simultaneous usage of -templated-policy and -templated-policy-file when creating a role or token.
```
7 changes: 7 additions & 0 deletions command/acl/role/create/role_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ func (c *cmd) Run(args []string) int {
return 1
}

if len(c.templatedPolicyFile) != 0 && len(c.templatedPolicy) != 0 {
c.UI.Error("Cannot combine the use of templated-policy flag with templated-policy-file. " +
"To create a role with a single templated policy and simple use case, use -templated-policy. " +
"For multiple templated policies and more complicated use cases, use -templated-policy-file")
return 1
}

client, err := c.http.APIClient()
if err != nil {
c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
Expand Down
16 changes: 16 additions & 0 deletions command/acl/role/create/role_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ func TestRoleCreateCommand_Pretty(t *testing.T) {

require.Len(t, role.NodeIdentities, 1)
})

t.Run("prevent templated-policy and templated-policy-file simultaneous use", func(t *testing.T) {
ui := cli.NewMockUi()
cmd := New(ui)

code := cmd.Run([]string{
"-http-addr=" + a.HTTPAddr(),
"-token=root",
"-name=role-with-node-identity",
"-templated-policy=builtin/node",
"-var=name:" + a.Config.NodeName,
"-templated-policy-file=test.hcl",
})
require.Equal(t, 1, code)
require.Contains(t, ui.ErrorWriter.String(), "Cannot combine the use of templated-policy flag with templated-policy-file.")
})
}

func TestRoleCreateCommand_JSON(t *testing.T) {
Expand Down
7 changes: 7 additions & 0 deletions command/acl/token/create/token_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ func (c *cmd) Run(args []string) int {
return 1
}

if len(c.templatedPolicyFile) != 0 && len(c.templatedPolicy) != 0 {
c.UI.Error("Cannot combine the use of templated-policy flag with templated-policy-file. " +
"To create a token with a single templated policy and simple use case, use -templated-policy. " +
"For multiple templated policies and more complicated use cases, use -templated-policy-file")
return 1
}

client, err := c.http.APIClient()
if err != nil {
c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
Expand Down
15 changes: 15 additions & 0 deletions command/acl/token/create/token_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,21 @@ func TestTokenCreateCommand_Pretty(t *testing.T) {
require.Equal(t, a.Config.NodeName, nodes[0].Node)
})

t.Run("prevent templated-policy and templated-policy-file simultaneous use", func(t *testing.T) {
ui := cli.NewMockUi()
cmd := New(ui)

code := cmd.Run(append([]string{
"-http-addr=" + a.HTTPAddr(),
"-token=root",
"-templated-policy=builtin/node",
"-var=name:" + a.Config.NodeName,
"-templated-policy-file=test.hcl",
}, "-format=json"))
require.Equal(t, 1, code)
require.Contains(t, ui.ErrorWriter.String(), "Cannot combine the use of templated-policy flag with templated-policy-file.")
})

// create with accessor and secret
t.Run("predefined-ids", func(t *testing.T) {
token := run(t, []string{
Expand Down