Skip to content

Expand permitted custom_attribute and extension_request values #175

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
zaben903 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Expand permitted custom_attribute and extension_request values #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ The DNS alt names with which the agent certificate should be generated

##### `custom_attribute`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml

##### `extension_request`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml

Expand Down Expand Up @@ -120,13 +120,13 @@ The DNS alt names with which the agent certificate should be generated

##### `custom_attribute`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml

##### `extension_request`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml

Expand Down Expand Up @@ -182,13 +182,13 @@ The DNS alt names with which the agent certificate should be generated

##### `custom_attribute`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/[\w\.]+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml

##### `extension_request`

Data type: `Optional[Array[Pattern[/\w+=\w+/]]]`
Data type: `Optional[Array[Pattern[/\w+=[\w\.]+/]]]`

This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml

Expand Down
4 changes: 2 additions & 2 deletions tasks/init.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
},
"custom_attribute": {
"description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
},
"extension_request": {
"description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
},
"puppet_conf_settings": {
"description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
Expand Down
4 changes: 2 additions & 2 deletions tasks/linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
},
"custom_attribute": {
"description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
},
"extension_request": {
"description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
},
"puppet_conf_settings": {
"description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
Expand Down
4 changes: 2 additions & 2 deletions tasks/windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
},
"custom_attribute": {
"description": "This setting is added to puppet.conf and included in the custom_attributes section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/[\\w\\.]+=[\\w\\.]+/]]]"
},
"extension_request": {
"description": "This setting is added to puppet.conf and included in the extension_requests section of csr_attributes.yaml",
"type": "Optional[Array[Pattern[/\\w+=\\w+/]]]"
"type": "Optional[Array[Pattern[/\\w+=[\\w\\.]+/]]]"
},
"puppet_conf_settings": {
"description": "Puppet conf settings. See https://www.puppet.com/docs/pe/2021.7/installing_nix_and_windows_agents_using_an_install_script.html#customize-install-script for usage instructions",
Expand Down
4 changes: 2 additions & 2 deletions tasks/windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ Param(
$Set_Noop,

[Parameter(Mandatory = $False)]
[ValidateScript({ $_ -match '\w+=\w+' })]
[ValidateScript({ $_ -match '[\w\.]+=[\w\.]+' })]
[String[]]
$Custom_Attribute,

[Parameter(Mandatory = $False)]
[ValidateScript({ $_ -match '\w+=\w+' })]
[ValidateScript({ $_ -match '\w+=[\w\.]+' })]
[String[]]
$Extension_Request,

Expand Down
Loading