From 4ab17746d11c9edc2178ed56d2ed790b426cb510 Mon Sep 17 00:00:00 2001 From: yuqo2450 <79540477+yuqo2450@users.noreply.github.com> Date: Mon, 24 Jul 2023 09:56:32 +0200 Subject: [PATCH] changed parameter_type to be None instead of empty string when override is set to false --- ...4-smart_class_parameter-override_false.yml | 2 + plugins/modules/smart_class_parameter.py | 2 +- .../fixtures/smart_class_parameter-0.yml | 43 +++-- .../fixtures/smart_class_parameter-1.yml | 28 ++-- .../fixtures/smart_class_parameter-10.yml | 87 ++-------- .../fixtures/smart_class_parameter-11.yml | 42 ++--- .../fixtures/smart_class_parameter-12.yml | 87 ++-------- .../fixtures/smart_class_parameter-13.yml | 87 ++++++++-- .../fixtures/smart_class_parameter-14.yml | 42 ++--- .../fixtures/smart_class_parameter-15.yml | 87 ++++++++-- .../fixtures/smart_class_parameter-16.yml | 87 ++-------- .../fixtures/smart_class_parameter-17.yml | 87 ++++++++-- .../fixtures/smart_class_parameter-18.yml | 94 ++--------- .../fixtures/smart_class_parameter-19.yml | 93 +++++++++-- .../fixtures/smart_class_parameter-2.yml | 38 ++--- .../fixtures/smart_class_parameter-20.yml | 34 ++-- .../fixtures/smart_class_parameter-21.yml | 43 ++--- .../fixtures/smart_class_parameter-22.yml | 28 ++-- .../fixtures/smart_class_parameter-23.yml | 146 ++--------------- .../fixtures/smart_class_parameter-24.yml | 89 ++++++++-- .../fixtures/smart_class_parameter-25.yml | 89 ++-------- .../fixtures/smart_class_parameter-26.yml | 148 +++++++++++++++-- .../fixtures/smart_class_parameter-27.yml | 148 ++--------------- .../fixtures/smart_class_parameter-28.yml | 90 +++++++++-- .../fixtures/smart_class_parameter-29.yml | 96 +++-------- .../fixtures/smart_class_parameter-3.yml | 28 ++-- .../fixtures/smart_class_parameter-30.yml | 152 ++++++++++++++++-- .../fixtures/smart_class_parameter-31.yml | 35 ++-- .../fixtures/smart_class_parameter-32.yml | 43 ++--- .../fixtures/smart_class_parameter-33.yml | 28 ++-- .../fixtures/smart_class_parameter-34.yml | 146 ++--------------- .../fixtures/smart_class_parameter-35.yml | 89 ++++++++-- .../fixtures/smart_class_parameter-36.yml | 87 ++-------- .../fixtures/smart_class_parameter-37.yml | 147 +++++++++++++++-- .../fixtures/smart_class_parameter-38.yml | 96 +++-------- .../fixtures/smart_class_parameter-39.yml | 93 +++++++++-- .../fixtures/smart_class_parameter-4.yml | 28 ++-- .../fixtures/smart_class_parameter-40.yml | 35 ++-- .../fixtures/smart_class_parameter-41.yml | 43 ++--- .../fixtures/smart_class_parameter-42.yml | 28 ++-- .../fixtures/smart_class_parameter-43.yml | 146 ++--------------- .../fixtures/smart_class_parameter-44.yml | 89 ++++++++-- .../fixtures/smart_class_parameter-45.yml | 87 ++-------- .../fixtures/smart_class_parameter-46.yml | 147 +++++++++++++++-- .../fixtures/smart_class_parameter-47.yml | 97 +++-------- .../fixtures/smart_class_parameter-48.yml | 93 +++++++++-- .../fixtures/smart_class_parameter-49.yml | 94 +++-------- .../fixtures/smart_class_parameter-5.yml | 42 ++--- .../fixtures/smart_class_parameter-50.yml | 89 ++++++++-- .../fixtures/smart_class_parameter-51.yml | 28 ++-- .../fixtures/smart_class_parameter-52.yml | 109 +++---------- .../fixtures/smart_class_parameter-53.yml | 30 ++-- .../fixtures/smart_class_parameter-54.yml | 87 ++-------- .../fixtures/smart_class_parameter-55.yml | 147 +++++++++++++++-- .../fixtures/smart_class_parameter-56.yml | 31 ++-- .../fixtures/smart_class_parameter-57.yml | 53 +++--- .../fixtures/smart_class_parameter-58.yml | 30 ++-- .../fixtures/smart_class_parameter-6.yml | 28 ++-- .../fixtures/smart_class_parameter-7.yml | 87 ++++++++-- .../fixtures/smart_class_parameter-8.yml | 40 ++--- .../fixtures/smart_class_parameter-9.yml | 28 ++-- .../test_playbooks/smart_class_parameter.yml | 18 +++ 62 files changed, 2284 insertions(+), 2211 deletions(-) create mode 100644 changelogs/fragments/1644-smart_class_parameter-override_false.yml diff --git a/changelogs/fragments/1644-smart_class_parameter-override_false.yml b/changelogs/fragments/1644-smart_class_parameter-override_false.yml new file mode 100644 index 000000000..07bfcce41 --- /dev/null +++ b/changelogs/fragments/1644-smart_class_parameter-override_false.yml @@ -0,0 +1,2 @@ +bugfixes: + - smart_class_parameter - correctly allow setting ``override`` to ``false`` (https://github.com/theforeman/foreman-ansible-modules/issues/1644) \ No newline at end of file diff --git a/plugins/modules/smart_class_parameter.py b/plugins/modules/smart_class_parameter.py index e8f345821..c71e2c95c 100644 --- a/plugins/modules/smart_class_parameter.py +++ b/plugins/modules/smart_class_parameter.py @@ -252,7 +252,7 @@ def main(): module.set_entity('entity', entity) # When override is set to false, foreman API don't accept parameter_type and all 'override options' have to be set to false if present if not module_params.get('override', False): - module_params['parameter_type'] = '' + module_params['parameter_type'] = None for override_option in ['merge_default', 'merge_overrides', 'avoid_duplicates']: if override_option in entity and entity[override_option]: module_params[override_option] = False diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-0.yml b/tests/test_playbooks/fixtures/smart_class_parameter-0.yml index fc8b044a0..a5e518855 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-0.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-0.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":null,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:51 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:34 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '672' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":null,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:51 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:34 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '595' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,8 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"override": true, "description": "ntp log file", - "omit": false}}' + body: '{"smart_class_parameter": {"override": true, "description": "ntp log file"}}' headers: Accept: - application/json;version=2 @@ -177,7 +176,7 @@ interactions: Connection: - keep-alive Content-Length: - - '91' + - '76' Content-Type: - application/json User-Agent: @@ -186,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:53 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:37 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -206,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-1.yml b/tests/test_playbooks/fixtures/smart_class_parameter-1.yml index 72898c16d..bda8c5730 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-1.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-1.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:53 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:37 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '683' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:53 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:37 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-10.yml b/tests/test_playbooks/fixtures/smart_class_parameter-10.yml index 14055f905..fa52e72f1 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-10.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-10.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:58 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:45 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '683' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:58 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:45 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"default_value": "/var/log/ntp.log"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '64' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 - response: - body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:59 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-11.yml b/tests/test_playbooks/fixtures/smart_class_parameter-11.yml index dd0f4ba0d..8f5b23dc0 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-11.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-11.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:59 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:45 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '683' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:59 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:45 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"default_value": "/var/log/ntp.log"}}' + body: '{"smart_class_parameter": {"hidden_value": true}}' headers: Accept: - application/json;version=2 @@ -176,7 +176,7 @@ interactions: Connection: - keep-alive Content-Length: - - '64' + - '49' Content-Type: - application/json User-Agent: @@ -185,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:59 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:48 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-12.yml b/tests/test_playbooks/fixtures/smart_class_parameter-12.yml index 0f4176384..588146b3f 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-12.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-12.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:59 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:48 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '687' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:59 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:48 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"hidden_value": false}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '50' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 - response: - body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:00 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-13.yml b/tests/test_playbooks/fixtures/smart_class_parameter-13.yml index edb169380..d8417da4a 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-13.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-13.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:00 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:48 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '687' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:00 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:48 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"default_value": "/var/log/ntp.log"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '64' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 + response: + body: + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:50 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '610' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-14.yml b/tests/test_playbooks/fixtures/smart_class_parameter-14.yml index 44b93ada2..29e59f1c4 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-14.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-14.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:00 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:50 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '687' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:00 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:50 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"override_value_order": "fqdn\ndomain\nlocation\nhostgroup"}}' + body: '{"smart_class_parameter": {"default_value": "/var/log/ntp.log"}}' headers: Accept: - application/json;version=2 @@ -176,7 +176,7 @@ interactions: Connection: - keep-alive Content-Length: - - '88' + - '64' Content-Type: - application/json User-Agent: @@ -185,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:01 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:50 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-15.yml b/tests/test_playbooks/fixtures/smart_class_parameter-15.yml index 71c95074a..c6b7af0d8 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-15.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-15.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\ndomain\\nlocation\\nhostgroup\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:01 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:50 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '687' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:01 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:50 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '610' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"hidden_value": false}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '50' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 + response: + body: + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:52 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '622' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-16.yml b/tests/test_playbooks/fixtures/smart_class_parameter-16.yml index be44f350c..c576bdcc6 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-16.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-16.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\ndomain\\nlocation\\nhostgroup\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:01 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:52 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '699' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:01 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:52 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"override_value_order": "fqdn\nhostgroup\nos\ndomain"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '82' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 - response: - body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:02 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '622' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-17.yml b/tests/test_playbooks/fixtures/smart_class_parameter-17.yml index eac874c55..9cee55d5e 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-17.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-17.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:02 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:52 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '699' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:02 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:52 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '622' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"override_value_order": "fqdn\ndomain\nlocation\nhostgroup"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '88' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 + response: + body: + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:54 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '628' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-18.yml b/tests/test_playbooks/fixtures/smart_class_parameter-18.yml index 5df391df9..dabba7662 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-18.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-18.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dlogfile&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":null,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:51 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\ndomain\\nlocation\\nhostgroup\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:54 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '705' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,76 +123,18 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":null,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:51 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:54 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"override": true, "default_value": "/etc/ntpd-foo", - "omit": false, "parameter_type": "string"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '122' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 - response: - body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:04 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '628' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -206,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-19.yml b/tests/test_playbooks/fixtures/smart_class_parameter-19.yml index 3319319a6..0f056ca09 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-19.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-19.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dlogfile&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:04 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\ndomain\\nlocation\\nhostgroup\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:54 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '705' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,18 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:04 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\ndomain\nlocation\nhostgroup","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:54 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '628' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"override_value_order": "fqdn\nhostgroup\nos\ndomain"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '82' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 + response: + body: + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '622' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-2.yml b/tests/test_playbooks/fixtures/smart_class_parameter-2.yml index 1b5616f8d..f434da241 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-2.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-2.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:53 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:37 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '683' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:53 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:37 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -185,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:55 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:39 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '612' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-20.yml b/tests/test_playbooks/fixtures/smart_class_parameter-20.yml index 3319319a6..202ca38e1 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-20.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-20.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dlogfile&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:04 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:56 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/var/log/ntp.log\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '699' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,18 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:04 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"/var/log/ntp.log","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '622' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-21.yml b/tests/test_playbooks/fixtures/smart_class_parameter-21.yml index bbf08fd73..c7261672f 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-21.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-21.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:04 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:08:35 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:04 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:35 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '597' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,8 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"default_value": "/etc/ntpd"}}' + body: '{"smart_class_parameter": {"override": true, "default_value": "/etc/ntpd-foo", + "parameter_type": "string"}}' headers: Accept: - application/json;version=2 @@ -176,7 +177,7 @@ interactions: Connection: - keep-alive Content-Length: - - '57' + - '107' Content-Type: - application/json User-Agent: @@ -185,13 +186,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:58 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '615' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +208,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-22.yml b/tests/test_playbooks/fixtures/smart_class_parameter-22.yml index c9e3d6e7b..60aa4e9c0 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-22.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-22.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:08:58 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '695' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:58 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '615' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-23.yml b/tests/test_playbooks/fixtures/smart_class_parameter-23.yml index 5d7725ce0..60aa4e9c0 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-23.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-23.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:08:58 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '695' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:58 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '615' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -166,122 +166,4 @@ interactions: status: code: 200 message: OK -- request: - body: '{"override_value": {"match": "domain=example.com", "value": "/etc/ntpd/foo"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '77' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 - UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=97 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created -- request: - body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '71' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 - UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=96 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-24.yml b/tests/test_playbooks/fixtures/smart_class_parameter-24.yml index 76248b50c..4ce8c9b18 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-24.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-24.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:08:58 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd-foo\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '695' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,15 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false},{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:58 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd-foo","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '615' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -148,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"default_value": "/etc/ntpd"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '57' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 + response: + body: + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '611' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-25.yml b/tests/test_playbooks/fixtures/smart_class_parameter-25.yml index 9bc534467..7e153360f 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-25.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-25.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,74 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false},{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"override_value": {"value": "/etc/ntpd/foonew"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '49' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/1 - response: - body: - string: '{"created_at":"2022-11-25 11:47:06 UTC","updated_at":"2022-11-25 11:47:08 - UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '611' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -207,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-26.yml b/tests/test_playbooks/fixtures/smart_class_parameter-26.yml index 7ee6c52f3..d63832b47 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-26.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-26.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,15 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:08 UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false},{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":0,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '611' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -148,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -168,4 +166,122 @@ interactions: status: code: 200 message: OK +- request: + body: '{"override_value": {"match": "domain=example.com", "value": "/etc/ntpd/foo"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '77' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 + UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '153' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created +- request: + body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '71' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 + UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=96 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-27.yml b/tests/test_playbooks/fixtures/smart_class_parameter-27.yml index eca17d097..d760d82c6 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-27.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-27.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,74 +126,17 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:08 UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false},{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false},{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"override_value": {"value": "/etc/ntpd/foo"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '46' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/1 - response: - body: - string: '{"created_at":"2022-11-25 11:47:06 UTC","updated_at":"2022-11-25 11:47:09 - UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '912' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -207,70 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: DELETE - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/2 - response: - body: - string: '{"created_at":"2022-11-25 11:47:06 UTC","updated_at":"2022-11-25 11:47:06 - UTC","id":2,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=96 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-28.yml b/tests/test_playbooks/fixtures/smart_class_parameter-28.yml index 1bbf1312b..ece797483 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-28.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-28.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:05 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,17 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:05 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":1,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:06 UTC","updated_at":"2022-11-25 11:47:09 UTC","id":1,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false},{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '912' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +150,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"override_value": {"value": "/etc/ntpd/foonew"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '49' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/17 + response: + body: + string: '{"created_at":"2023-07-26 08:09:03 UTC","updated_at":"2023-07-26 08:09:05 + UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '156' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-29.yml b/tests/test_playbooks/fixtures/smart_class_parameter-29.yml index 824290cc3..f840194fc 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-29.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-29.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":null,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:52 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,76 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":null,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:52 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:05 UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false},{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"override": true, "default_value": true, "omit": - false, "parameter_type": "boolean"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '112' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 - response: - body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:10 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '915' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -206,13 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-3.yml b/tests/test_playbooks/fixtures/smart_class_parameter-3.yml index e73be2226..535fbd171 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-3.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-3.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:55 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:39 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '689' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:55 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:39 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '612' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-30.yml b/tests/test_playbooks/fixtures/smart_class_parameter-30.yml index f2abd2797..f7399705c 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-30.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-30.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:10 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:10 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":2,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:05 UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foonew","omit":false},{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '915' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +150,127 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"override_value": {"value": "/etc/ntpd/foo"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '46' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/17 + response: + body: + string: '{"created_at":"2023-07-26 08:09:03 UTC","updated_at":"2023-07-26 08:09:07 + UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '153' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: DELETE + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4/override_values/18 + response: + body: + string: '{"created_at":"2023-07-26 08:09:03 UTC","updated_at":"2023-07-26 08:09:03 + UTC","id":18,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=96 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-31.yml b/tests/test_playbooks/fixtures/smart_class_parameter-31.yml index f2abd2797..fc5be0917 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-31.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-31.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dconfig_dir&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=config_dir\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:10 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:01 UTC\",\"parameter\":\"config_dir\",\"id\":4,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":\"/etc/ntpd\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '691' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,19 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/4 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:10 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:01 UTC","parameter":"config_dir","id":4,"puppetclass_id":2,"override_values_count":1,"default_value":"/etc/ntpd","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:03 UTC","updated_at":"2023-07-26 08:09:07 UTC","id":17,"match":"domain=example.com","value":"/etc/ntpd/foo","omit":false}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '764' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +149,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-32.yml b/tests/test_playbooks/fixtures/smart_class_parameter-32.yml index 1178c089f..c230b4821 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-32.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-32.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:10 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:08:36 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '667' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:10 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:08:36 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '592' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,8 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"default_value": false}}' + body: '{"smart_class_parameter": {"override": true, "default_value": true, "parameter_type": + "boolean"}}' headers: Accept: - application/json;version=2 @@ -176,7 +177,7 @@ interactions: Connection: - keep-alive Content-Length: - - '51' + - '97' Content-Type: - application/json User-Agent: @@ -185,13 +186,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:08 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +208,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-33.yml b/tests/test_playbooks/fixtures/smart_class_parameter-33.yml index 1e62f7a2b..788b4fb9c 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-33.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-33.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:08 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '675' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:08 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-34.yml b/tests/test_playbooks/fixtures/smart_class_parameter-34.yml index 45ba97296..788b4fb9c 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-34.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-34.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:08 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '675' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:08 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -166,122 +166,4 @@ interactions: status: code: 200 message: OK -- request: - body: '{"override_value": {"match": "domain=example.com", "value": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '66' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 - UTC","id":3,"match":"domain=example.com","value":true,"omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=97 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created -- request: - body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '71' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 - UTC","id":4,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=96 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-35.yml b/tests/test_playbooks/fixtures/smart_class_parameter-35.yml index 03dd20c5c..97f43edd0 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-35.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-35.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:08 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":true,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '675' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,15 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":2,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 UTC","id":3,"match":"domain=example.com","value":true,"omit":false},{"created_at":"2022-11-25 - 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 UTC","id":4,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:08 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":true,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -148,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"default_value": false}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '51' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 + response: + body: + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '601' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-36.yml b/tests/test_playbooks/fixtures/smart_class_parameter-36.yml index 40588e57c..c64eaf2f1 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-36.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-36.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '676' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":2,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 UTC","id":3,"match":"domain=example.com","value":true,"omit":false},{"created_at":"2022-11-25 - 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 UTC","id":4,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '0' - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: DELETE - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values/4 - response: - body: - string: '{"created_at":"2022-11-25 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 - UTC","id":4,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '601' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-37.yml b/tests/test_playbooks/fixtures/smart_class_parameter-37.yml index 3defd628d..669678934 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-37.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-37.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '676' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":1,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:13 UTC","updated_at":"2022-11-25 11:47:13 UTC","id":3,"match":"domain=example.com","value":true,"omit":false}]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":0,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '601' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,4 +166,122 @@ interactions: status: code: 200 message: OK +- request: + body: '{"override_value": {"match": "domain=example.com", "value": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '66' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 + UTC","id":19,"match":"domain=example.com","value":true,"omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '142' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created +- request: + body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '71' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 + UTC","id":20,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=96 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-38.yml b/tests/test_playbooks/fixtures/smart_class_parameter-38.yml index c4b7277d0..d4d18b5d3 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-38.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-38.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":null,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:53 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '676' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,76 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":null,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:53 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":2,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 UTC","id":19,"match":"domain=example.com","value":true,"omit":false},{"created_at":"2023-07-26 + 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 UTC","id":20,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"override": true, "default_value": "3", "omit": - false, "parameter_type": "integer"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '111' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 - response: - body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:15 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '891' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -206,13 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-39.yml b/tests/test_playbooks/fixtures/smart_class_parameter-39.yml index bba370eeb..253a232bb 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-39.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-39.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:15 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '676' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:15 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":2,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 UTC","id":19,"match":"domain=example.com","value":true,"omit":false},{"created_at":"2023-07-26 + 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 UTC","id":20,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '891' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +150,68 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: DELETE + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2/override_values/20 + response: + body: + string: '{"created_at":"2023-07-26 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 + UTC","id":20,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-4.yml b/tests/test_playbooks/fixtures/smart_class_parameter-4.yml index e73be2226..535fbd171 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-4.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-4.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:55 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:39 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '689' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:55 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:39 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '612' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-40.yml b/tests/test_playbooks/fixtures/smart_class_parameter-40.yml index bba370eeb..afd5a3742 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-40.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-40.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dburst&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=burst\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:15 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"boolean\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:30 UTC\",\"updated_at\":\"2023-07-26 08:09:11 UTC\",\"parameter\":\"burst\",\"id\":2,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":false,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '676' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,19 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/2 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:15 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"boolean","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:30 UTC","updated_at":"2023-07-26 08:09:11 UTC","parameter":"burst","id":2,"puppetclass_id":2,"override_values_count":1,"default_value":false,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:13 UTC","updated_at":"2023-07-26 08:09:13 UTC","id":19,"match":"domain=example.com","value":true,"omit":false}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '743' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +149,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-41.yml b/tests/test_playbooks/fixtures/smart_class_parameter-41.yml index a190165ea..1e714dfc2 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-41.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-41.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:15 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:36 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '672' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:15 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:36 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '595' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,8 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"default_value": "5"}}' + body: '{"smart_class_parameter": {"override": true, "default_value": "3", "parameter_type": + "integer"}}' headers: Accept: - application/json;version=2 @@ -176,7 +177,7 @@ interactions: Connection: - keep-alive Content-Length: - - '49' + - '96' Content-Type: - application/json User-Agent: @@ -185,13 +186,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +208,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-42.yml b/tests/test_playbooks/fixtures/smart_class_parameter-42.yml index 6b2b54fd4..646c5b373 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-42.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-42.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-43.yml b/tests/test_playbooks/fixtures/smart_class_parameter-43.yml index e7910d792..646c5b373 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-43.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-43.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -166,122 +166,4 @@ interactions: status: code: 200 message: OK -- request: - body: '{"override_value": {"match": "domain=example.com", "value": "42"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '66' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 - UTC","id":5,"match":"domain=example.com","value":42,"omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=97 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created -- request: - body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '71' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 - UTC","id":6,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=96 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-44.yml b/tests/test_playbooks/fixtures/smart_class_parameter-44.yml index 77e51546d..2171f8cbf 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-44.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-44.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":3,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,15 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":2,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 UTC","id":5,"match":"domain=example.com","value":42,"omit":false},{"created_at":"2022-11-25 - 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 UTC","id":6,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":3,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -148,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"default_value": "5"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '49' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 + response: + body: + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '600' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-45.yml b/tests/test_playbooks/fixtures/smart_class_parameter-45.yml index ac052fa6d..31d05c928 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-45.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-45.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:19 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":2,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 UTC","id":5,"match":"domain=example.com","value":42,"omit":false},{"created_at":"2022-11-25 - 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 UTC","id":6,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '0' - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: DELETE - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values/6 - response: - body: - string: '{"created_at":"2022-11-25 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 - UTC","id":6,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-46.yml b/tests/test_playbooks/fixtures/smart_class_parameter-46.yml index 70fa6c343..c5cd341f6 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-46.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-46.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:17 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:19 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:17 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":1,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:18 UTC","updated_at":"2022-11-25 11:47:18 UTC","id":5,"match":"domain=example.com","value":42,"omit":false}]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":0,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '600' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,4 +166,122 @@ interactions: status: code: 200 message: OK +- request: + body: '{"override_value": {"match": "domain=example.com", "value": "42"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '66' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 + UTC","id":21,"match":"domain=example.com","value":42,"omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '140' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created +- request: + body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '71' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 + UTC","id":22,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=96 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-47.yml b/tests/test_playbooks/fixtures/smart_class_parameter-47.yml index b3d370e1d..664d372dd 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-47.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-47.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dservers&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":null,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:52 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:19 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,77 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":null,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:52 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":2,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 UTC","id":21,"match":"domain=example.com","value":42,"omit":false},{"created_at":"2023-07-26 + 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 UTC","id":22,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"override": true, "default_value": "[\"foo.ntp.org\", - \"bar.ntp.org\", \"bar.ntp.org\"]", "omit": false, "parameter_type": "array", - "merge_overrides": true, "merge_default": true, "avoid_duplicates": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '233' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 - response: - body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:20 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '888' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -207,13 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-48.yml b/tests/test_playbooks/fixtures/smart_class_parameter-48.yml index 583ee4448..5fa525841 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-48.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-48.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dservers&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:20 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:19 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,16 +123,20 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:20 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":2,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 UTC","id":21,"match":"domain=example.com","value":42,"omit":false},{"created_at":"2023-07-26 + 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 UTC","id":22,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '888' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +150,68 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: DELETE + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52/override_values/22 + response: + body: + string: '{"created_at":"2023-07-26 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 + UTC","id":22,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-49.yml b/tests/test_playbooks/fixtures/smart_class_parameter-49.yml index 139f80972..6899e696e 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-49.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-49.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -65,19 +65,21 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dservers&per_page=4294967296 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters?search=puppetclass_name%3Dntp+and+parameter%3Dstepout&per_page=4294967296 response: body: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": - 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n + 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=stepout\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:20 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"integer\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:19 UTC\",\"parameter\":\"stepout\",\"id\":52,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":5,\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '677' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -123,75 +123,19 @@ interactions: User-Agent: - apypie (https://github.com/Apipie/apypie) method: GET - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/52 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:20 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"integer","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:19 UTC","parameter":"stepout","id":52,"puppetclass_id":2,"override_values_count":1,"default_value":5,"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:21 UTC","updated_at":"2023-07-26 08:09:21 UTC","id":21,"match":"domain=example.com","value":42,"omit":false}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: '{"smart_class_parameter": {"default_value": "[\"foo.ntp.org\", \"bar.ntp.org\"]"}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '82' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 - response: - body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '740' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +149,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-5.yml b/tests/test_playbooks/fixtures/smart_class_parameter-5.yml index 42e41a7f7..1d00bc1a3 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-5.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-5.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:55 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:39 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '689' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:55 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:39 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '612' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"parameter_type": ""}}' + body: '{"smart_class_parameter": {"override": false}}' headers: Accept: - application/json;version=2 @@ -176,7 +176,7 @@ interactions: Connection: - keep-alive Content-Length: - - '49' + - '46' Content-Type: - application/json User-Agent: @@ -185,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":false,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:42 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '613' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-50.yml b/tests/test_playbooks/fixtures/smart_class_parameter-50.yml index a818704c8..75d30c553 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-50.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-50.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":false,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:35 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '672' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":false,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:35 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '595' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,72 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"override": true, "default_value": "[\"foo.ntp.org\", + \"bar.ntp.org\", \"bar.ntp.org\"]", "parameter_type": "array", "merge_overrides": + true, "merge_default": true, "avoid_duplicates": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '218' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 + response: + body: + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:25 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '637' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-51.yml b/tests/test_playbooks/fixtures/smart_class_parameter-51.yml index a818704c8..8b22148b1 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-51.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-51.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:25 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '714' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:25 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '637' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-52.yml b/tests/test_playbooks/fixtures/smart_class_parameter-52.yml index 344cd50ac..bb189d249 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-52.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-52.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:25 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '714' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:25 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '637' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"override_value": {"match": "domain=example.com", "value": "[\"baz.ntp.org\"]"}}' + body: '{"smart_class_parameter": {"default_value": "[\"foo.ntp.org\", \"bar.ntp.org\"]"}}' headers: Accept: - application/json;version=2 @@ -176,81 +176,24 @@ interactions: Connection: - keep-alive Content-Length: - - '81' + - '82' Content-Type: - application/json User-Agent: - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"created_at":"2022-11-25 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 - UTC","id":7,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=97 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 201 - message: Created -- request: - body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '71' - Content-Type: - - application/json - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: POST - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values - response: - body: - string: '{"created_at":"2022-11-25 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 - UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '623' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -264,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=96 + - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -282,6 +223,6 @@ interactions: X-XSS-Protection: - 1; mode=block status: - code: 201 - message: Created + code: 200 + message: OK version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-53.yml b/tests/test_playbooks/fixtures/smart_class_parameter-53.yml index e676c6336..e026d2842 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-53.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-53.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,15 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":2,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":7,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false},{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '623' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -148,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-54.yml b/tests/test_playbooks/fixtures/smart_class_parameter-54.yml index 418d19f76..e026d2842 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-54.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-54.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,72 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":2,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":7,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false},{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive - Content-Security-Policy: - - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; - img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; - style-src ''unsafe-inline'' ''self''' - Content-Type: - - application/json; charset=utf-8 - Foreman_api_version: - - '2' - Foreman_current_location: - - ; ANY - Foreman_current_organization: - - ; ANY - Foreman_version: - - 3.5.0-rc1 - Keep-Alive: - - timeout=15, max=98 - Strict-Transport-Security: - - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked - X-Content-Type-Options: - - nosniff - X-Download-Options: - - noopen - X-Frame-Options: - - sameorigin - X-Permitted-Cross-Domain-Policies: - - none - X-XSS-Protection: - - 1; mode=block - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json;version=2 - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive Content-Length: - - '0' - User-Agent: - - apypie (https://github.com/Apipie/apypie) - method: DELETE - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values/7 - response: - body: - string: '{"created_at":"2022-11-25 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 - UTC","id":7,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false}' - headers: - Cache-Control: - - max-age=0, private, must-revalidate - Connection: - - Keep-Alive + - '623' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - - timeout=15, max=97 + - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-55.yml b/tests/test_playbooks/fixtures/smart_class_parameter-55.yml index 9a10757ca..dce131c13 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-55.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-55.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":0,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '623' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,4 +166,122 @@ interactions: status: code: 200 message: OK +- request: + body: '{"override_value": {"match": "domain=example.com", "value": "[\"baz.ntp.org\"]"}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '81' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 + UTC","id":23,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '153' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created +- request: + body: '{"override_value": {"match": "hostgroup=test_hostgroup", "omit": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '71' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: POST + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values + response: + body: + string: '{"created_at":"2023-07-26 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 + UTC","id":24,"match":"hostgroup=test_hostgroup","value":null,"omit":true}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '147' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=96 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 201 + message: Created version: 1 diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-56.yml b/tests/test_playbooks/fixtures/smart_class_parameter-56.yml index 9a10757ca..8733351e8 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-56.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-56.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,17 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":2,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 UTC","id":23,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false},{"created_at":"2023-07-26 + 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 UTC","id":24,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '924' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-57.yml b/tests/test_playbooks/fixtures/smart_class_parameter-57.yml index 12912cd3c..ae6ad4d9f 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-57.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-57.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:21 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":2,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,17 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:21 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":2,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 UTC","id":23,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false},{"created_at":"2023-07-26 + 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 UTC","id":24,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '924' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +150,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -168,8 +169,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"merge_overrides": false, "merge_default": false, - "avoid_duplicates": false}}' + body: null headers: Accept: - application/json;version=2 @@ -178,23 +178,22 @@ interactions: Connection: - keep-alive Content-Length: - - '104' - Content-Type: - - application/json + - '0' User-Agent: - apypie (https://github.com/Apipie/apypie) - method: PUT - uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 + method: DELETE + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41/override_values/23 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"created_at":"2023-07-26 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 + UTC","id":23,"match":"domain=example.com","value":["baz.ntp.org"],"omit":false}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '153' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -208,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-58.yml b/tests/test_playbooks/fixtures/smart_class_parameter-58.yml index 690f6da54..2c2416b42 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-58.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-58.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=servers\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:47:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"\",\"override\":true,\"parameter_type\":\"array\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":true,\"merge_default\":true,\"avoid_duplicates\":true,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:09:26 UTC\",\"parameter\":\"servers\",\"id\":41,\"puppetclass_id\":2,\"override_values_count\":1,\"default_value\":[\"foo.ntp.org\",\"bar.ntp.org\"],\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '700' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,14 +126,16 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/41 response: body: - string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:47:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2022-11-25 - 11:47:23 UTC","updated_at":"2022-11-25 11:47:23 UTC","id":8,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' + string: '{"description":"","override":true,"parameter_type":"array","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":true,"merge_default":true,"avoid_duplicates":true,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:09:26 UTC","parameter":"servers","id":41,"puppetclass_id":2,"override_values_count":1,"default_value":["foo.ntp.org","bar.ntp.org"],"puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[{"created_at":"2023-07-26 + 08:09:29 UTC","updated_at":"2023-07-26 08:09:29 UTC","id":24,"match":"hostgroup=test_hostgroup","value":null,"omit":true}]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '770' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -147,13 +149,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-6.yml b/tests/test_playbooks/fixtures/smart_class_parameter-6.yml index 8a8f39e48..7810b20e6 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-6.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-6.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:56 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":false,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:42 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '690' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":false,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:42 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '613' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-7.yml b/tests/test_playbooks/fixtures/smart_class_parameter-7.yml index 8a8f39e48..46264a334 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-7.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-7.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:56 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":false,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:42 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '690' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":false,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:42 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '613' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,70 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked + X-Content-Type-Options: + - nosniff + X-Download-Options: + - noopen + X-Frame-Options: + - sameorigin + X-Permitted-Cross-Domain-Policies: + - none + X-XSS-Protection: + - 1; mode=block + status: + code: 200 + message: OK +- request: + body: '{"smart_class_parameter": {"override": true}}' + headers: + Accept: + - application/json;version=2 + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '45' + Content-Type: + - application/json + User-Agent: + - apypie (https://github.com/Apipie/apypie) + method: PUT + uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 + response: + body: + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:44 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + headers: + Cache-Control: + - max-age=0, private, must-revalidate + Connection: + - Keep-Alive + Content-Length: + - '612' + Content-Security-Policy: + - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; + img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; + style-src ''unsafe-inline'' ''self''' + Content-Type: + - application/json; charset=utf-8 + Foreman_api_version: + - '2' + Foreman_current_location: + - ; ANY + Foreman_current_organization: + - ; ANY + Foreman_version: + - 3.7.0 + Keep-Alive: + - timeout=15, max=97 + Strict-Transport-Security: + - max-age=631139040; includeSubdomains X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-8.yml b/tests/test_playbooks/fixtures/smart_class_parameter-8.yml index 33a07cea0..d0eb2d650 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-8.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-8.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:56 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"string\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:44 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '689' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:56 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"string","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:44 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '612' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -167,7 +167,7 @@ interactions: code: 200 message: OK - request: - body: '{"smart_class_parameter": {"hidden_value": true}}' + body: '{"smart_class_parameter": {"parameter_type": ""}}' headers: Accept: - application/json;version=2 @@ -185,13 +185,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:58 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:45 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -205,13 +207,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=97 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/fixtures/smart_class_parameter-9.yml b/tests/test_playbooks/fixtures/smart_class_parameter-9.yml index d3738b9d0..fa52e72f1 100644 --- a/tests/test_playbooks/fixtures/smart_class_parameter-9.yml +++ b/tests/test_playbooks/fixtures/smart_class_parameter-9.yml @@ -14,12 +14,14 @@ interactions: uri: https://foreman.example.org/api/status response: body: - string: '{"result":"ok","status":200,"version":"3.5.0-rc1","api_version":2}' + string: '{"result":"ok","status":200,"version":"3.7.0","api_version":2}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '62' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -33,13 +35,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=100 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -71,13 +71,15 @@ interactions: string: "{\n \"total\": 71,\n \"subtotal\": 1,\n \"page\": 1,\n \"per_page\": 4294967296,\n \"search\": \"puppetclass_name=ntp and parameter=logfile\",\n \ \"sort\": {\n \"by\": null,\n \"order\": null\n },\n \"results\": - [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":true,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2022-11-25 - 11:45:14 UTC\",\"updated_at\":\"2022-11-25 11:46:58 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"*****\",\"puppetclass_name\":\"ntp\"}]\n}\n" + [{\"description\":\"ntp log file\",\"override\":true,\"parameter_type\":\"\",\"hidden_value?\":false,\"omit\":false,\"required\":false,\"validator_type\":null,\"validator_rule\":null,\"merge_overrides\":false,\"merge_default\":false,\"avoid_duplicates\":false,\"override_value_order\":\"fqdn\\nhostgroup\\nos\\ndomain\",\"created_at\":\"2023-07-26 + 07:53:31 UTC\",\"updated_at\":\"2023-07-26 08:08:45 UTC\",\"parameter\":\"logfile\",\"id\":16,\"puppetclass_id\":2,\"override_values_count\":0,\"default_value\":\"\",\"puppetclass_name\":\"ntp\"}]\n}\n" headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '683' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -91,13 +93,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=99 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: @@ -126,13 +126,15 @@ interactions: uri: https://foreman.example.org/foreman_puppet/api/smart_class_parameters/16 response: body: - string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":true,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2022-11-25 - 11:45:14 UTC","updated_at":"2022-11-25 11:46:58 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"*****","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' + string: '{"description":"ntp log file","override":true,"parameter_type":"","hidden_value?":false,"omit":false,"required":false,"validator_type":null,"validator_rule":null,"merge_overrides":false,"merge_default":false,"avoid_duplicates":false,"override_value_order":"fqdn\nhostgroup\nos\ndomain","created_at":"2023-07-26 + 07:53:31 UTC","updated_at":"2023-07-26 08:08:45 UTC","parameter":"logfile","id":16,"puppetclass_id":2,"override_values_count":0,"default_value":"","puppetclass_name":"ntp","environments":[{"name":"production","id":1}],"puppetclass":{"id":2,"name":"ntp","module_name":"ntp"},"override_values":[]}' headers: Cache-Control: - max-age=0, private, must-revalidate Connection: - Keep-Alive + Content-Length: + - '606' Content-Security-Policy: - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:; img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self''; @@ -146,13 +148,11 @@ interactions: Foreman_current_organization: - ; ANY Foreman_version: - - 3.5.0-rc1 + - 3.7.0 Keep-Alive: - timeout=15, max=98 Strict-Transport-Security: - max-age=631139040; includeSubdomains - Transfer-Encoding: - - chunked X-Content-Type-Options: - nosniff X-Download-Options: diff --git a/tests/test_playbooks/smart_class_parameter.yml b/tests/test_playbooks/smart_class_parameter.yml index 47e5f0c8e..45a0fa2f0 100644 --- a/tests/test_playbooks/smart_class_parameter.yml +++ b/tests/test_playbooks/smart_class_parameter.yml @@ -94,6 +94,24 @@ vars: smart_class_parameter_state: present expected_change: false + + - include_tasks: tasks/smart_class_parameter.yml + vars: + smart_class_parameter_parameter_type: string + smart_class_parameter_override: false + smart_class_parameter_state: present + expected_change: true + - include_tasks: tasks/smart_class_parameter.yml + vars: + smart_class_parameter_parameter_type: string + smart_class_parameter_override: false + smart_class_parameter_state: present + expected_change: false + - include_tasks: tasks/smart_class_parameter.yml + vars: + smart_class_parameter_state: present + expected_change: true + - include_tasks: tasks/smart_class_parameter.yml vars: smart_class_parameter_parameter_type: none