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

feat(argocd_application_set): Add support for pathParamPrefix #336

Merged
merged 11 commits into from
Sep 14, 2023
Merged

feat(argocd_application_set): Add support for pathParamPrefix #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb22f51
feat(argocd_application_set): Add support for pathParamPrefix
ahublersos Sep 12, 2023
e6ace70
Update docs
ahublersos Sep 12, 2023
ab4b700
fix test
ahublersos Sep 12, 2023
4966f63
add path_param_prefix to flatten function
ahublersos Sep 12, 2023
ca13252
fix attribute name in test
ahublersos Sep 12, 2023
79d4d8c
fix: no need to check for existence of string
onematchfox Sep 12, 2023
188a3d7
tests: use matrix generator when testing new parameter
onematchfox Sep 12, 2023
1500e30
build(deps): align test versions with latest releases of ArgoCD
onematchfox Sep 12, 2023
f859377
docs: add note regarding use of attribute with matrix generator
onematchfox Sep 12, 2023
5362c3d
Merge remote-tracking branch 'upstream/master' into 329_add_pathParam…
onematchfox Sep 12, 2023
74b7d8b
revert: docs: add note regarding use of attribute with matrix generator
onematchfox Sep 12, 2023
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
10 changes: 5 additions & 5 deletions argocd/schema_application_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@ func applicationSetGitGeneratorSchemaV0() *schema.Schema {
},
},
},
"path_param_prefix": {
Type: schema.TypeString,
Description: "Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix",
ahublersos marked this conversation as resolved.
Show resolved Hide resolved
Optional: true,
},
"repo_url": {
Type: schema.TypeString,
Description: "URL to the repository to use.",
Expand All @@ -286,11 +291,6 @@ func applicationSetGitGeneratorSchemaV0() *schema.Schema {
Description: "Revision of the source repository to use.",
Optional: true,
},
"path_param_prefix": {
Type: schema.TypeString,
Description: "Prefix for all path-related parameter names.",
Optional: true,
},
"template": {
Type: schema.TypeList,
Description: "Generator template. Used to override the values of the spec-level template.",
Expand Down
14 changes: 7 additions & 7 deletions docs/resources/application_set.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--git--template))

Expand Down Expand Up @@ -2259,7 +2259,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--git--template))

Expand Down Expand Up @@ -3348,7 +3348,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--matrix--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--matrix--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--matrix--generator--git--template))

Expand Down Expand Up @@ -5480,7 +5480,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--merge--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--merge--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--matrix--generator--merge--generator--git--template))

Expand Down Expand Up @@ -8656,7 +8656,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--git--template))

Expand Down Expand Up @@ -9745,7 +9745,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--matrix--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--matrix--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--matrix--generator--git--template))

Expand Down Expand Up @@ -11877,7 +11877,7 @@ Optional:

- `directory` (Block List) List of directories in the source repository to use when template the Application.. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--merge--generator--git--directory))
- `file` (Block List) List of files in the source repository to use when template the Application. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--merge--generator--git--file))
- `path_param_prefix` (String) Prefix for all path-related parameter names.
- `path_param_prefix` (String) Prefix for all path-related parameter names. Only applicable when using the `matrix` generator. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix/#example-two-git-generators-using-pathparamprefix
- `revision` (String) Revision of the source repository to use.
- `template` (Block List, Max: 1) Generator template. Used to override the values of the spec-level template. (see [below for nested schema](#nestedblock--spec--generator--merge--generator--merge--generator--git--template))

Expand Down