foreman_salt 14.0.0 → 14.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (102) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -2
  3. data/Rakefile +2 -2
  4. data/app/controllers/foreman_salt/api/v2/jobs_controller.rb +9 -9
  5. data/app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb +15 -14
  6. data/app/controllers/foreman_salt/api/v2/salt_environments_controller.rb +6 -6
  7. data/app/controllers/foreman_salt/api/v2/salt_hostgroups_controller.rb +42 -0
  8. data/app/controllers/foreman_salt/api/v2/salt_keys_controller.rb +14 -14
  9. data/app/controllers/foreman_salt/api/v2/salt_minions_controller.rb +8 -8
  10. data/app/controllers/foreman_salt/api/v2/salt_states_controller.rb +24 -26
  11. data/app/controllers/foreman_salt/api/v2/salt_variables_controller.rb +22 -21
  12. data/app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb +3 -3
  13. data/app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb +4 -4
  14. data/app/controllers/foreman_salt/concerns/salt_environment_parameters.rb +1 -1
  15. data/app/controllers/foreman_salt/concerns/salt_hostgroup_parameters.rb +25 -0
  16. data/app/controllers/foreman_salt/concerns/salt_module_parameters.rb +1 -1
  17. data/app/controllers/foreman_salt/concerns/salt_override_value.rb +4 -4
  18. data/app/controllers/foreman_salt/concerns/salt_variable_parameters.rb +5 -5
  19. data/app/controllers/foreman_salt/minions_controller.rb +9 -9
  20. data/app/controllers/foreman_salt/salt_autosign_controller.rb +8 -8
  21. data/app/controllers/foreman_salt/salt_environments_controller.rb +4 -4
  22. data/app/controllers/foreman_salt/salt_keys_controller.rb +11 -11
  23. data/app/controllers/foreman_salt/salt_modules_controller.rb +10 -11
  24. data/app/controllers/foreman_salt/salt_variables_controller.rb +5 -4
  25. data/app/controllers/foreman_salt/state_importer.rb +12 -13
  26. data/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb +16 -10
  27. data/app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb +2 -2
  28. data/app/helpers/foreman_salt/salt_keys_helper.rb +2 -1
  29. data/app/helpers/foreman_salt/salt_modules_helper.rb +11 -11
  30. data/app/helpers/foreman_salt/salt_reports_helper.rb +0 -1
  31. data/app/lib/actions/foreman_salt/report_import.rb +2 -2
  32. data/app/lib/proxy_api/salt.rb +17 -17
  33. data/app/models/foreman_salt/concerns/host_managed_extensions.rb +47 -46
  34. data/app/models/foreman_salt/concerns/hostgroup_extensions.rb +14 -11
  35. data/app/models/foreman_salt/host_salt_module.rb +1 -1
  36. data/app/models/foreman_salt/salt_environment.rb +8 -8
  37. data/app/models/foreman_salt/salt_module.rb +15 -13
  38. data/app/models/foreman_salt/salt_module_environment.rb +1 -1
  39. data/app/models/foreman_salt/salt_provider.rb +7 -4
  40. data/app/models/foreman_salt/salt_variable.rb +8 -8
  41. data/app/models/setting/salt.rb +12 -10
  42. data/app/overrides/salt_environment_host_selector.rb +4 -4
  43. data/app/overrides/salt_environment_hostgroup_selector.rb +4 -4
  44. data/app/overrides/salt_modules_selector.rb +16 -16
  45. data/app/overrides/salt_proxy_selector.rb +11 -9
  46. data/app/services/foreman_salt/report_importer.rb +26 -26
  47. data/app/services/foreman_salt/smart_proxies/salt_keys.rb +47 -45
  48. data/app/views/foreman_salt/api/v2/salt_autosign/create.json.rabl +1 -1
  49. data/app/views/foreman_salt/api/v2/salt_environments/create.json.rabl +1 -1
  50. data/app/views/foreman_salt/api/v2/salt_environments/show.json.rabl +1 -1
  51. data/app/views/foreman_salt/api/v2/salt_hostgroups/base.json.rabl +7 -0
  52. data/app/views/foreman_salt/api/v2/salt_hostgroups/show.json.rabl +3 -0
  53. data/app/views/foreman_salt/api/v2/salt_hostgroups/update.json.rabl +3 -0
  54. data/app/views/foreman_salt/api/v2/salt_keys/update.json.rabl +1 -1
  55. data/app/views/foreman_salt/api/v2/salt_minions/show.json.rabl +3 -4
  56. data/app/views/foreman_salt/api/v2/salt_states/create.json.rabl +1 -1
  57. data/app/views/foreman_salt/api/v2/salt_states/show.json.rabl +0 -1
  58. data/app/views/foreman_salt/api/v2/salt_variables/create.json.rabl +1 -1
  59. data/app/views/foreman_salt/api/v2/salt_variables/destroy.json.rabl +1 -1
  60. data/app/views/foreman_salt/api/v2/salt_variables/show.json.rabl +8 -8
  61. data/config/api_routes.rb +31 -0
  62. data/config/routes.rb +16 -44
  63. data/db/migrate/20140817210214_create_salt_modules.rb +4 -4
  64. data/db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb +1 -1
  65. data/db/migrate/20140920232200_create_salt_environments.rb +3 -3
  66. data/db/migrate/20150220122707_fix_incorrect_report_metrics.rb +6 -2
  67. data/db/migrate/20211108211312_add_missing_permissions.rb +9 -0
  68. data/db/seeds.d/75-salt_seeds.rb +1 -1
  69. data/db/seeds.d/76-job_templates.rb +3 -3
  70. data/lib/foreman_salt/engine.rb +24 -16
  71. data/lib/foreman_salt/extensions.rb +8 -8
  72. data/lib/foreman_salt/plugin.rb +120 -114
  73. data/lib/foreman_salt/version.rb +1 -1
  74. data/lib/foreman_salt.rb +1 -1
  75. data/lib/tasks/foreman_salt_tasks.rake +3 -5
  76. data/locale/action_names.rb +4 -4
  77. data/test/factories/foreman_salt_factories.rb +5 -5
  78. data/test/functional/api/v2/salt_autosign_controller_test.rb +26 -20
  79. data/test/functional/api/v2/salt_environments_controller_test.rb +29 -23
  80. data/test/functional/api/v2/salt_hostgroups_controller_test.rb +76 -0
  81. data/test/functional/api/v2/salt_keys_controller_test.rb +25 -19
  82. data/test/functional/api/v2/salt_states_controller_test.rb +72 -66
  83. data/test/functional/api/v2/salt_variables_controller_test.rb +4 -4
  84. data/test/functional/hosts_controller_test.rb +26 -26
  85. data/test/functional/minions_controller_test.rb +22 -22
  86. data/test/functional/salt_modules_controller_test.rb +3 -3
  87. data/test/functional/salt_variables_controller_test.rb +5 -5
  88. data/test/integration/hosts_js_test.rb +11 -11
  89. data/test/integration/salt_autosign_test.rb +5 -5
  90. data/test/integration/salt_environment_test.rb +2 -2
  91. data/test/integration/salt_keys_test.rb +7 -7
  92. data/test/integration/salt_module_test.rb +9 -9
  93. data/test/integration/salt_variable_test.rb +2 -2
  94. data/test/test_plugin_helper.rb +1 -1
  95. data/test/unit/grains_importer_test.rb +12 -12
  96. data/test/unit/host_extensions_test.rb +19 -19
  97. data/test/unit/hostgroup_extensions_test.rb +13 -13
  98. data/test/unit/report_importer_test.rb +9 -9
  99. data/test/unit/salt_keys_test.rb +2 -2
  100. data/test/unit/salt_modules_test.rb +2 -2
  101. data/test/unit/salt_variables_test.rb +10 -10
  102. metadata +22 -13
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_salt
3
3
  version: !ruby/object:Gem::Version
4
- version: 14.0.0
4
+ version: 14.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen Benjamin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-08-02 00:00:00.000000000 Z
11
+ date: 2021-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deface
@@ -25,47 +25,47 @@ dependencies:
25
25
  - !ruby/object:Gem::Version
26
26
  version: '2.0'
27
27
  - !ruby/object:Gem::Dependency
28
- name: foreman-tasks
28
+ name: foreman_remote_execution
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '0.8'
33
+ version: 2.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '0.8'
40
+ version: 2.0.0
41
41
  - !ruby/object:Gem::Dependency
42
- name: foreman_remote_execution
42
+ name: foreman-tasks
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 2.0.0
47
+ version: '0.8'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 2.0.0
54
+ version: '0.8'
55
55
  - !ruby/object:Gem::Dependency
56
- name: rubocop
56
+ name: theforeman-rubocop
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.71.0
61
+ version: 0.0.6
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.71.0
68
+ version: 0.0.6
69
69
  description: Foreman Plug-in for Salt
70
70
  email:
71
71
  - stephen@redhat.com
@@ -82,6 +82,7 @@ files:
82
82
  - app/controllers/foreman_salt/api/v2/jobs_controller.rb
83
83
  - app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb
84
84
  - app/controllers/foreman_salt/api/v2/salt_environments_controller.rb
85
+ - app/controllers/foreman_salt/api/v2/salt_hostgroups_controller.rb
85
86
  - app/controllers/foreman_salt/api/v2/salt_keys_controller.rb
86
87
  - app/controllers/foreman_salt/api/v2/salt_minions_controller.rb
87
88
  - app/controllers/foreman_salt/api/v2/salt_states_controller.rb
@@ -90,6 +91,7 @@ files:
90
91
  - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
91
92
  - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
92
93
  - app/controllers/foreman_salt/concerns/salt_environment_parameters.rb
94
+ - app/controllers/foreman_salt/concerns/salt_hostgroup_parameters.rb
93
95
  - app/controllers/foreman_salt/concerns/salt_module_parameters.rb
94
96
  - app/controllers/foreman_salt/concerns/salt_override_value.rb
95
97
  - app/controllers/foreman_salt/concerns/salt_variable_parameters.rb
@@ -134,6 +136,9 @@ files:
134
136
  - app/views/foreman_salt/api/v2/salt_environments/index.json.rabl
135
137
  - app/views/foreman_salt/api/v2/salt_environments/main.json.rabl
136
138
  - app/views/foreman_salt/api/v2/salt_environments/show.json.rabl
139
+ - app/views/foreman_salt/api/v2/salt_hostgroups/base.json.rabl
140
+ - app/views/foreman_salt/api/v2/salt_hostgroups/show.json.rabl
141
+ - app/views/foreman_salt/api/v2/salt_hostgroups/update.json.rabl
137
142
  - app/views/foreman_salt/api/v2/salt_keys/base.json.rabl
138
143
  - app/views/foreman_salt/api/v2/salt_keys/index.json.rabl
139
144
  - app/views/foreman_salt/api/v2/salt_keys/main.json.rabl
@@ -177,6 +182,7 @@ files:
177
182
  - app/views/foreman_salt/salt_variables/new.html.erb
178
183
  - app/views/hosts/select_multiple_salt_environment.html.erb
179
184
  - app/views/hosts/select_multiple_salt_master.html.erb
185
+ - config/api_routes.rb
180
186
  - config/routes.rb
181
187
  - db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
182
188
  - db/migrate/20140817210214_create_salt_modules.rb
@@ -189,6 +195,7 @@ files:
189
195
  - db/migrate/20161103104146_add_index_to_join_tables.rb
190
196
  - db/migrate/20190515112233_add_salt_module_id_to_lookup_keys.rb
191
197
  - db/migrate/20210312150333_add_salt_autosign_to_host.rb
198
+ - db/migrate/20211108211312_add_missing_permissions.rb
192
199
  - db/seeds.d/75-salt_seeds.rb
193
200
  - db/seeds.d/76-job_templates.rb
194
201
  - lib/foreman_salt.rb
@@ -243,6 +250,7 @@ files:
243
250
  - test/factories/foreman_salt_factories.rb
244
251
  - test/functional/api/v2/salt_autosign_controller_test.rb
245
252
  - test/functional/api/v2/salt_environments_controller_test.rb
253
+ - test/functional/api/v2/salt_hostgroups_controller_test.rb
246
254
  - test/functional/api/v2/salt_keys_controller_test.rb
247
255
  - test/functional/api/v2/salt_states_controller_test.rb
248
256
  - test/functional/api/v2/salt_variables_controller_test.rb
@@ -314,6 +322,7 @@ test_files:
314
322
  - test/functional/api/v2/salt_variables_controller_test.rb
315
323
  - test/functional/api/v2/salt_states_controller_test.rb
316
324
  - test/functional/api/v2/salt_environments_controller_test.rb
325
+ - test/functional/api/v2/salt_hostgroups_controller_test.rb
317
326
  - test/functional/api/v2/salt_keys_controller_test.rb
318
327
  - test/functional/salt_modules_controller_test.rb
319
328
  - test/functional/hosts_controller_test.rb