chef-dk 0.9.0 → 0.10.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 (306) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +190 -190
  3. data/Gemfile +26 -26
  4. data/LICENSE +201 -201
  5. data/README.md +292 -276
  6. data/Rakefile +18 -18
  7. data/bin/chef +25 -25
  8. data/chef-dk.gemspec +62 -0
  9. data/lib/chef-dk.rb +19 -19
  10. data/lib/chef-dk/authenticated_http.rb +40 -40
  11. data/lib/chef-dk/builtin_commands.rb +60 -60
  12. data/lib/chef-dk/chef_runner.rb +98 -98
  13. data/lib/chef-dk/cli.rb +200 -200
  14. data/lib/chef-dk/command/base.rb +79 -79
  15. data/lib/chef-dk/command/clean_policy_cookbooks.rb +116 -116
  16. data/lib/chef-dk/command/clean_policy_revisions.rb +113 -113
  17. data/lib/chef-dk/command/delete_policy.rb +122 -122
  18. data/lib/chef-dk/command/delete_policy_group.rb +122 -122
  19. data/lib/chef-dk/command/diff.rb +316 -316
  20. data/lib/chef-dk/command/env.rb +90 -90
  21. data/lib/chef-dk/command/exec.rb +45 -45
  22. data/lib/chef-dk/command/export.rb +151 -151
  23. data/lib/chef-dk/command/gem.rb +47 -47
  24. data/lib/chef-dk/command/generate.rb +120 -120
  25. data/lib/chef-dk/command/generator_commands.rb +80 -80
  26. data/lib/chef-dk/command/generator_commands/app.rb +107 -107
  27. data/lib/chef-dk/command/generator_commands/attribute.rb +37 -37
  28. data/lib/chef-dk/command/generator_commands/base.rb +121 -121
  29. data/lib/chef-dk/command/generator_commands/cookbook.rb +153 -119
  30. data/lib/chef-dk/command/generator_commands/cookbook_code_file.rb +100 -100
  31. data/lib/chef-dk/command/generator_commands/cookbook_file.rb +45 -45
  32. data/lib/chef-dk/command/generator_commands/generator_generator.rb +177 -177
  33. data/lib/chef-dk/command/generator_commands/lwrp.rb +36 -36
  34. data/lib/chef-dk/command/generator_commands/policyfile.rb +127 -86
  35. data/lib/chef-dk/command/generator_commands/recipe.rb +36 -36
  36. data/lib/chef-dk/command/generator_commands/repo.rb +125 -96
  37. data/lib/chef-dk/command/generator_commands/template.rb +46 -46
  38. data/lib/chef-dk/command/install.rb +121 -121
  39. data/lib/chef-dk/command/provision.rb +438 -438
  40. data/lib/chef-dk/command/push.rb +118 -118
  41. data/lib/chef-dk/command/push_archive.rb +126 -126
  42. data/lib/chef-dk/command/shell_init.rb +180 -180
  43. data/lib/chef-dk/command/show_policy.rb +165 -165
  44. data/lib/chef-dk/command/undelete.rb +155 -155
  45. data/lib/chef-dk/command/update.rb +129 -129
  46. data/lib/chef-dk/command/verify.rb +534 -490
  47. data/lib/chef-dk/commands_map.rb +115 -115
  48. data/lib/chef-dk/completions/bash.sh.erb +5 -5
  49. data/lib/chef-dk/completions/chef.fish.erb +10 -10
  50. data/lib/chef-dk/completions/zsh.zsh.erb +21 -21
  51. data/lib/chef-dk/component_test.rb +173 -171
  52. data/lib/chef-dk/configurable.rb +57 -57
  53. data/lib/chef-dk/cookbook_metadata.rb +45 -45
  54. data/lib/chef-dk/cookbook_omnifetch.rb +32 -32
  55. data/lib/chef-dk/cookbook_profiler/git.rb +151 -151
  56. data/lib/chef-dk/cookbook_profiler/identifiers.rb +72 -72
  57. data/lib/chef-dk/cookbook_profiler/null_scm.rb +32 -32
  58. data/lib/chef-dk/exceptions.rb +126 -113
  59. data/lib/chef-dk/generator.rb +163 -163
  60. data/lib/chef-dk/helpers.rb +159 -159
  61. data/lib/chef-dk/pager.rb +106 -106
  62. data/lib/chef-dk/policyfile/chef_repo_cookbook_source.rb +138 -122
  63. data/lib/chef-dk/policyfile/chef_server_cookbook_source.rb +54 -54
  64. data/lib/chef-dk/policyfile/community_cookbook_source.rb +97 -82
  65. data/lib/chef-dk/policyfile/comparison_base.rb +124 -124
  66. data/lib/chef-dk/policyfile/cookbook_location_specification.rb +141 -133
  67. data/lib/chef-dk/policyfile/cookbook_locks.rb +466 -466
  68. data/lib/chef-dk/policyfile/cookbook_sources.rb +22 -21
  69. data/lib/chef-dk/policyfile/delivery_supermarket_source.rb +90 -0
  70. data/lib/chef-dk/policyfile/differ.rb +266 -266
  71. data/lib/chef-dk/policyfile/dsl.rb +223 -197
  72. data/lib/chef-dk/policyfile/lister.rb +232 -232
  73. data/lib/chef-dk/policyfile/null_cookbook_source.rb +45 -45
  74. data/lib/chef-dk/policyfile/read_cookbook_for_compat_mode_upload.rb +124 -124
  75. data/lib/chef-dk/policyfile/reports/install.rb +70 -70
  76. data/lib/chef-dk/policyfile/reports/table_printer.rb +58 -58
  77. data/lib/chef-dk/policyfile/reports/upload.rb +70 -70
  78. data/lib/chef-dk/policyfile/solution_dependencies.rb +298 -298
  79. data/lib/chef-dk/policyfile/storage_config.rb +100 -100
  80. data/lib/chef-dk/policyfile/undo_record.rb +142 -142
  81. data/lib/chef-dk/policyfile/undo_stack.rb +130 -130
  82. data/lib/chef-dk/policyfile/uploader.rb +213 -213
  83. data/lib/chef-dk/policyfile_compiler.rb +380 -322
  84. data/lib/chef-dk/policyfile_lock.rb +552 -552
  85. data/lib/chef-dk/policyfile_services/clean_policies.rb +95 -95
  86. data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb +125 -125
  87. data/lib/chef-dk/policyfile_services/export_repo.rb +309 -309
  88. data/lib/chef-dk/policyfile_services/install.rb +125 -125
  89. data/lib/chef-dk/policyfile_services/push.rb +114 -114
  90. data/lib/chef-dk/policyfile_services/push_archive.rb +173 -173
  91. data/lib/chef-dk/policyfile_services/rm_policy.rb +142 -142
  92. data/lib/chef-dk/policyfile_services/rm_policy_group.rb +86 -86
  93. data/lib/chef-dk/policyfile_services/show_policy.rb +237 -237
  94. data/lib/chef-dk/policyfile_services/undelete.rb +108 -108
  95. data/lib/chef-dk/policyfile_services/update_attributes.rb +104 -104
  96. data/lib/chef-dk/service_exception_inspectors.rb +25 -25
  97. data/lib/chef-dk/service_exception_inspectors/base.rb +40 -40
  98. data/lib/chef-dk/service_exception_inspectors/http.rb +121 -121
  99. data/lib/chef-dk/service_exceptions.rb +143 -143
  100. data/lib/chef-dk/shell_out.rb +36 -36
  101. data/lib/chef-dk/skeletons/code_generator/files/default/Berksfile +3 -3
  102. data/lib/chef-dk/skeletons/code_generator/files/default/chefignore +100 -100
  103. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md +9 -9
  104. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md +54 -54
  105. data/lib/chef-dk/skeletons/code_generator/files/default/gitignore +16 -16
  106. data/lib/chef-dk/skeletons/code_generator/files/default/repo/README.md +28 -28
  107. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md +27 -27
  108. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb +7 -7
  109. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb +3 -3
  110. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb +8 -8
  111. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md +58 -58
  112. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json +3 -3
  113. data/lib/chef-dk/skeletons/code_generator/files/default/repo/dot-chef-repo.txt +6 -0
  114. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md +9 -9
  115. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json +12 -12
  116. data/lib/chef-dk/skeletons/code_generator/files/default/repo/policies/README.md +24 -0
  117. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md +9 -9
  118. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json +12 -12
  119. data/lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb +8 -8
  120. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb +2 -2
  121. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb +2 -0
  122. data/lib/chef-dk/skeletons/code_generator/metadata.rb +8 -8
  123. data/lib/chef-dk/skeletons/code_generator/recipes/app.rb +97 -97
  124. data/lib/chef-dk/skeletons/code_generator/recipes/attribute.rb +12 -12
  125. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb +117 -104
  126. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb +24 -24
  127. data/lib/chef-dk/skeletons/code_generator/recipes/lwrp.rb +23 -23
  128. data/lib/chef-dk/skeletons/code_generator/recipes/policyfile.rb +8 -8
  129. data/lib/chef-dk/skeletons/code_generator/recipes/recipe.rb +27 -27
  130. data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb +67 -48
  131. data/lib/chef-dk/skeletons/code_generator/recipes/template.rb +32 -32
  132. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.all_rights.erb +3 -3
  133. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.apache2.erb +201 -201
  134. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv2.erb +339 -339
  135. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv3.erb +674 -674
  136. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.mit.erb +21 -21
  137. data/lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb +25 -20
  138. data/lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb +4 -4
  139. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb +21 -16
  140. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb +32 -27
  141. data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb +7 -7
  142. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb +5 -5
  143. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb +20 -20
  144. data/lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb +11 -11
  145. data/lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb +9 -9
  146. data/lib/chef-dk/ui.rb +58 -58
  147. data/lib/chef-dk/version.rb +20 -20
  148. data/lib/kitchen/provisioner/policyfile_zero.rb +189 -193
  149. data/spec/shared/a_file_generator.rb +125 -125
  150. data/spec/shared/a_generated_file.rb +12 -12
  151. data/spec/shared/command_with_ui_object.rb +11 -11
  152. data/spec/shared/custom_generator_cookbook.rb +117 -117
  153. data/spec/shared/fixture_cookbook_checksums.rb +47 -47
  154. data/spec/shared/setup_git_cookbooks.rb +53 -53
  155. data/spec/spec_helper.rb +50 -49
  156. data/spec/test_helpers.rb +84 -84
  157. data/spec/unit/chef_runner_spec.rb +111 -111
  158. data/spec/unit/cli_spec.rb +357 -357
  159. data/spec/unit/command/base_spec.rb +169 -169
  160. data/spec/unit/command/clean_policy_cookbooks_spec.rb +181 -181
  161. data/spec/unit/command/clean_policy_revisions_spec.rb +181 -181
  162. data/spec/unit/command/delete_policy_group_spec.rb +207 -207
  163. data/spec/unit/command/delete_policy_spec.rb +207 -207
  164. data/spec/unit/command/diff_spec.rb +312 -312
  165. data/spec/unit/command/env_spec.rb +52 -52
  166. data/spec/unit/command/exec_spec.rb +179 -179
  167. data/spec/unit/command/export_spec.rb +189 -189
  168. data/spec/unit/command/generate_spec.rb +142 -142
  169. data/spec/unit/command/generator_commands/app_spec.rb +169 -169
  170. data/spec/unit/command/generator_commands/attribute_spec.rb +32 -32
  171. data/spec/unit/command/generator_commands/cookbook_file_spec.rb +32 -32
  172. data/spec/unit/command/generator_commands/cookbook_spec.rb +450 -320
  173. data/spec/unit/command/generator_commands/generator_generator_spec.rb +229 -229
  174. data/spec/unit/command/generator_commands/lwrp_spec.rb +32 -32
  175. data/spec/unit/command/generator_commands/policyfile_spec.rb +225 -125
  176. data/spec/unit/command/generator_commands/recipe_spec.rb +34 -34
  177. data/spec/unit/command/generator_commands/repo_spec.rb +367 -283
  178. data/spec/unit/command/generator_commands/template_spec.rb +32 -32
  179. data/spec/unit/command/install_spec.rb +179 -179
  180. data/spec/unit/command/provision_spec.rb +592 -592
  181. data/spec/unit/command/push_archive_spec.rb +153 -153
  182. data/spec/unit/command/push_spec.rb +199 -199
  183. data/spec/unit/command/shell_init_spec.rb +329 -329
  184. data/spec/unit/command/show_policy_spec.rb +235 -235
  185. data/spec/unit/command/undelete_spec.rb +246 -246
  186. data/spec/unit/command/update_spec.rb +251 -251
  187. data/spec/unit/command/verify_spec.rb +325 -323
  188. data/spec/unit/commands_map_spec.rb +57 -57
  189. data/spec/unit/component_test_spec.rb +126 -126
  190. data/spec/unit/cookbook_metadata_spec.rb +98 -98
  191. data/spec/unit/cookbook_profiler/git_spec.rb +176 -176
  192. data/spec/unit/cookbook_profiler/identifiers_spec.rb +83 -83
  193. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_one.rb +9 -9
  194. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_two.rb +9 -9
  195. data/spec/unit/fixtures/command/cli_test_command.rb +26 -26
  196. data/spec/unit/fixtures/command/explicit_path_example.rb +7 -7
  197. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  198. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/Berksfile +3 -3
  199. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  200. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/chefignore +96 -96
  201. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  202. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  203. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/.kitchen.yml +16 -16
  204. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/Berksfile +3 -3
  205. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/README.md +4 -4
  206. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/chefignore +96 -96
  207. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/metadata.rb +8 -8
  208. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/recipes/default.rb +8 -8
  209. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/.kitchen.yml +16 -16
  210. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile +3 -3
  211. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/README.md +4 -4
  212. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore +96 -96
  213. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb +8 -8
  214. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb +8 -8
  215. data/spec/unit/fixtures/cookbooks_api/pruned_small_universe.json +1321 -1321
  216. data/spec/unit/fixtures/cookbooks_api/small_universe.json +2987 -2987
  217. data/spec/unit/fixtures/cookbooks_api/universe.json +1 -1
  218. data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb +36 -36
  219. data/spec/unit/fixtures/dev_cookbooks/README.md +16 -16
  220. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/integration_test +2 -2
  221. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/verify_me +5 -5
  222. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/chef/verify_me +3 -3
  223. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me +2 -2
  224. data/spec/unit/fixtures/example_cookbook/.gitignore +17 -17
  225. data/spec/unit/fixtures/example_cookbook/.kitchen.yml +16 -16
  226. data/spec/unit/fixtures/example_cookbook/Berksfile +3 -3
  227. data/spec/unit/fixtures/example_cookbook/README.md +4 -4
  228. data/spec/unit/fixtures/example_cookbook/chefignore +96 -96
  229. data/spec/unit/fixtures/example_cookbook/metadata.rb +8 -8
  230. data/spec/unit/fixtures/example_cookbook/recipes/default.rb +8 -8
  231. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore +17 -17
  232. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml +16 -16
  233. data/spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile +3 -3
  234. data/spec/unit/fixtures/example_cookbook_metadata_json_only/README.md +4 -4
  235. data/spec/unit/fixtures/example_cookbook_metadata_json_only/chefignore +96 -96
  236. data/spec/unit/fixtures/example_cookbook_metadata_json_only/metadata.json +5 -5
  237. data/spec/unit/fixtures/example_cookbook_metadata_json_only/recipes/default.rb +8 -8
  238. data/spec/unit/fixtures/example_cookbook_no_metadata/.gitignore +17 -17
  239. data/spec/unit/fixtures/example_cookbook_no_metadata/.kitchen.yml +16 -16
  240. data/spec/unit/fixtures/example_cookbook_no_metadata/Berksfile +3 -3
  241. data/spec/unit/fixtures/example_cookbook_no_metadata/README.md +4 -4
  242. data/spec/unit/fixtures/example_cookbook_no_metadata/chefignore +96 -96
  243. data/spec/unit/fixtures/example_cookbook_no_metadata/recipes/default.rb +8 -8
  244. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md +4 -4
  245. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore +96 -96
  246. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb +8 -8
  247. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb +8 -8
  248. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/Berksfile +3 -3
  249. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/README.md +4 -4
  250. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/chefignore +96 -96
  251. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/metadata.rb +9 -9
  252. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/recipes/default.rb +8 -8
  253. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/.kitchen.yml +16 -16
  254. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile +3 -3
  255. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/README.md +4 -4
  256. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/chefignore +96 -96
  257. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/metadata.rb +8 -8
  258. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/recipes/default.rb +8 -8
  259. data/spec/unit/fixtures/local_path_cookbooks/metadata-missing/README.md +2 -2
  260. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  261. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  262. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  263. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  264. data/spec/unit/generator_spec.rb +120 -120
  265. data/spec/unit/helpers_spec.rb +92 -92
  266. data/spec/unit/pager_spec.rb +119 -119
  267. data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb +93 -66
  268. data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb +34 -34
  269. data/spec/unit/policyfile/community_cookbook_source_spec.rb +84 -51
  270. data/spec/unit/policyfile/comparison_base_spec.rb +343 -343
  271. data/spec/unit/policyfile/cookbook_location_specification_spec.rb +257 -252
  272. data/spec/unit/policyfile/cookbook_locks_spec.rb +529 -529
  273. data/spec/unit/policyfile/delivery_supermarket_source_spec.rb +130 -0
  274. data/spec/unit/policyfile/differ_spec.rb +687 -687
  275. data/spec/unit/policyfile/lister_spec.rb +272 -272
  276. data/spec/unit/policyfile/null_cookbook_source_spec.rb +35 -35
  277. data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb +92 -92
  278. data/spec/unit/policyfile/reports/install_spec.rb +115 -115
  279. data/spec/unit/policyfile/reports/upload_spec.rb +96 -96
  280. data/spec/unit/policyfile/solution_dependencies_spec.rb +145 -145
  281. data/spec/unit/policyfile/storage_config_spec.rb +172 -172
  282. data/spec/unit/policyfile/undo_record_spec.rb +260 -260
  283. data/spec/unit/policyfile/undo_stack_spec.rb +266 -266
  284. data/spec/unit/policyfile/uploader_spec.rb +410 -410
  285. data/spec/unit/policyfile_demands_spec.rb +997 -876
  286. data/spec/unit/policyfile_evaluation_spec.rb +557 -441
  287. data/spec/unit/policyfile_lock_build_spec.rb +1056 -1056
  288. data/spec/unit/policyfile_lock_install_spec.rb +138 -138
  289. data/spec/unit/policyfile_lock_serialization_spec.rb +425 -425
  290. data/spec/unit/policyfile_lock_validation_spec.rb +611 -611
  291. data/spec/unit/policyfile_services/clean_policies_spec.rb +236 -236
  292. data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb +275 -275
  293. data/spec/unit/policyfile_services/export_repo_spec.rb +439 -439
  294. data/spec/unit/policyfile_services/install_spec.rb +191 -191
  295. data/spec/unit/policyfile_services/push_archive_spec.rb +345 -345
  296. data/spec/unit/policyfile_services/push_spec.rb +233 -233
  297. data/spec/unit/policyfile_services/rm_policy_group_spec.rb +241 -241
  298. data/spec/unit/policyfile_services/rm_policy_spec.rb +266 -266
  299. data/spec/unit/policyfile_services/show_policy_spec.rb +889 -889
  300. data/spec/unit/policyfile_services/undelete_spec.rb +304 -304
  301. data/spec/unit/policyfile_services/update_attributes_spec.rb +217 -217
  302. data/spec/unit/service_exception_inspectors/base_spec.rb +43 -43
  303. data/spec/unit/service_exception_inspectors/http_spec.rb +140 -140
  304. data/spec/unit/shell_out_spec.rb +34 -34
  305. data/warning.txt +9 -0
  306. metadata +18 -5
@@ -1,323 +1,325 @@
1
- #
2
- # Copyright:: Copyright (c) 2014 Chef Software Inc.
3
- # License:: Apache License, Version 2.0
4
- #
5
- # Licensed under the Apache License, Version 2.0 (the "License");
6
- # you may not use this file except in compliance with the License.
7
- # You may obtain a copy of the License at
8
- #
9
- # http://www.apache.org/licenses/LICENSE-2.0
10
- #
11
- # Unless required by applicable law or agreed to in writing, software
12
- # distributed under the License is distributed on an "AS IS" BASIS,
13
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
- # See the License for the specific language governing permissions and
15
- # limitations under the License.
16
- #
17
-
18
- require 'spec_helper'
19
- require 'chef-dk/command/verify'
20
-
21
- module Gem
22
-
23
- # We stub Gem.ruby because `verify` uses it to locate the omnibus directory,
24
- # but we also use it in some of the "test commands" in these tests.
25
- class << self
26
- alias :real_ruby :ruby
27
- end
28
- end
29
-
30
- describe ChefDK::Command::Verify do
31
- let(:command_instance) { ChefDK::Command::Verify.new() }
32
-
33
- let(:command_options) { [] }
34
-
35
- let(:components) { {} }
36
-
37
- let(:default_components) do
38
- [
39
- "berkshelf",
40
- "test-kitchen",
41
- "tk-policyfile-provisioner",
42
- "chef-client",
43
- "chef-dk",
44
- "chef-provisioning",
45
- "chefspec",
46
- "rubocop",
47
- "fauxhai",
48
- "knife-spork",
49
- "kitchen-vagrant",
50
- "package installation",
51
- "openssl"
52
- ]
53
- end
54
-
55
- def run_command(expected_exit_code)
56
- expect(command_instance.run(command_options)).to eq(expected_exit_code)
57
- end
58
-
59
- it "defines berks, tk, chef and chef-dk components by default" do
60
- expect(command_instance.components).not_to be_empty
61
- expect(command_instance.components.map(&:name)).to match_array(default_components)
62
- end
63
-
64
- it "has a usage banner" do
65
- expect(command_instance.banner).to eq("Usage: chef verify [component, ...] [options]")
66
- end
67
-
68
- describe "when locating omnibus directory" do
69
- it "should find omnibus app directory from ruby path" do
70
- allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby"))
71
- expect(command_instance.omnibus_apps_dir).to include("eg_omnibus_dir/valid/embedded")
72
- end
73
-
74
- it "should raise OmnibusInstallNotFound if directory is not looking like omnibus" do
75
- allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,".rbenv/versions/2.1.1/bin/ruby"))
76
- expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
77
- end
78
-
79
- it "raises OmnibusInstallNotFound if omnibus directory doesn't exist" do
80
- allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_apps/embedded/bin/ruby"))
81
- expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
82
- end
83
-
84
- it "raises MissingComponentError when a component doesn't exist" do
85
- allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_component/embedded/bin/ruby"))
86
- expect{command_instance.validate_components!}.to raise_error(ChefDK::MissingComponentError)
87
- end
88
- end
89
-
90
- describe "when running verify command" do
91
- let(:stdout_io) { StringIO.new }
92
- let(:ruby_path) { File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby") }
93
-
94
- def run_unit_test
95
- # Set rubyopt to empty to prevent bundler from infecting the ruby
96
- # subcommands (and loading a bunch of extra gems).
97
- lambda { |_self| sh("#{Gem.real_ruby} verify_me", env: { "RUBYOPT" => ""}) }
98
- end
99
-
100
- def run_integration_test
101
- lambda { |_self| sh("#{Gem.real_ruby} integration_test", env: { "RUBYOPT" => ""}) }
102
- end
103
-
104
- let(:all_tests_ok) do
105
- ChefDK::ComponentTest.new("successful_comp").tap do |c|
106
- c.base_dir = "berkshelf"
107
- c.unit_test(&run_unit_test)
108
- c.integration_test(&run_integration_test)
109
- c.smoke_test { sh("exit 0") }
110
- end
111
- end
112
-
113
- let(:all_tests_ok_2) do
114
- ChefDK::ComponentTest.new("successful_comp_2").tap do |c|
115
- c.base_dir = "test-kitchen"
116
- c.unit_test(&run_unit_test)
117
- c.smoke_test { sh("exit 0") }
118
- end
119
- end
120
-
121
- let(:failing_unit_test) do
122
- ChefDK::ComponentTest.new("failing_comp").tap do |c|
123
- c.base_dir = "chef"
124
- c.unit_test(&run_unit_test)
125
- c.smoke_test { sh("exit 0") }
126
- end
127
- end
128
-
129
- let(:passing_smoke_test_only) do
130
- component = failing_unit_test.dup
131
- component.smoke_test { sh("exit 0") }
132
- component
133
- end
134
-
135
- let(:failing_smoke_test_only) do
136
- component = all_tests_ok.dup
137
- component.smoke_test { sh("exit 1") }
138
- component
139
- end
140
-
141
- let(:component_without_integration_tests) do
142
- ChefDK::ComponentTest.new("successful_comp").tap do |c|
143
- c.base_dir = "berkshelf"
144
- c.unit_test { sh("./verify_me") }
145
- c.smoke_test { sh("exit 0") }
146
- end
147
- end
148
-
149
- def stdout
150
- stdout_io.string
151
- end
152
-
153
- before do
154
- allow(Gem).to receive(:ruby).and_return(ruby_path)
155
- allow(command_instance).to receive(:stdout).and_return(stdout_io)
156
- allow(command_instance).to receive(:components).and_return(components)
157
- end
158
-
159
- context "when running smoke tests only" do
160
- describe "with single command with success" do
161
- let(:components) do
162
- [ passing_smoke_test_only ]
163
- end
164
-
165
- before do
166
- run_command(0)
167
- end
168
-
169
- it "should report the success of the command" do
170
- expect(stdout).to include("Verification of component 'failing_comp' succeeded.")
171
- end
172
-
173
- end
174
-
175
- describe "with single command with failure" do
176
- let(:components) do
177
- [ failing_smoke_test_only ]
178
- end
179
-
180
- before do
181
- run_command(1)
182
- end
183
-
184
- it "should report the failure of the command" do
185
- expect(stdout).to include("Verification of component 'successful_comp' failed.")
186
- end
187
-
188
- end
189
- end
190
-
191
- context "when running unit tests" do
192
-
193
- let(:command_options) { %w{--unit --verbose} }
194
-
195
- let(:components) do
196
- [ all_tests_ok ]
197
- end
198
-
199
- describe "with single command with success" do
200
- before do
201
- run_command(0)
202
- end
203
-
204
- it "should have embedded/bin on the PATH" do
205
- expect(stdout).to include(File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin"))
206
- end
207
-
208
- it "should report the success of the command" do
209
- expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
210
- end
211
-
212
- it "reports the component test output" do
213
- expect(stdout).to include("you are good to go...")
214
- end
215
-
216
- context "and --verbose is not enabled" do
217
-
218
- let(:command_options) { %w{--unit} }
219
-
220
- it "omits the component test output" do
221
- expect(stdout).to_not include("you are good to go...")
222
- end
223
- end
224
-
225
- context "and --integration flag is given" do
226
-
227
- let(:command_options) { %w{--integration --verbose} }
228
-
229
- it "should run the integration command also" do
230
- expect(stdout).to include("integration tests OK")
231
- end
232
-
233
- context "and no integration test command is specifed for the component" do
234
-
235
- let(:components) do
236
- [ component_without_integration_tests ]
237
- end
238
-
239
- it "skips the integration test and succeeds" do
240
- expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
241
- end
242
-
243
- end
244
-
245
- end
246
-
247
- end
248
-
249
- describe "with single command with failure" do
250
- let(:components) do
251
- [ failing_unit_test ]
252
- end
253
-
254
- before do
255
- run_command(1)
256
- end
257
-
258
- it "should report the failure of the command" do
259
- expect(stdout).to include("Verification of component 'failing_comp' failed.")
260
- end
261
-
262
- it "reports the component test output" do
263
- expect(stdout).to include("i'm not feeling good today...")
264
- end
265
- end
266
-
267
- describe "with multiple commands with success" do
268
- let(:components) do
269
- [ all_tests_ok, all_tests_ok_2 ]
270
- end
271
-
272
- before do
273
- run_command(0)
274
- end
275
-
276
- it "should report the success of the command" do
277
- expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
278
- expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
279
- end
280
-
281
- it "reports the component test outputs" do
282
- expect(stdout).to include("you are good to go...")
283
- expect(stdout).to include("my friend everything is good...")
284
- end
285
-
286
- context "and components are filtered by CLI args" do
287
-
288
- let(:command_options) { [ "successful_comp_2" ] }
289
-
290
- it "verifies only the desired component" do
291
- expect(stdout).to_not include("Verification of component 'successful_comp_1' succeeded.")
292
- expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
293
- end
294
-
295
- end
296
- end
297
-
298
- describe "with multiple commands with failures" do
299
- let(:components) do
300
- [ all_tests_ok, all_tests_ok_2, failing_unit_test ]
301
- end
302
-
303
- before do
304
- run_command(1)
305
- end
306
-
307
- it "should report the success and failure of the commands" do
308
- expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
309
- expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
310
- expect(stdout).to include("Verification of component 'failing_comp' failed.")
311
- end
312
-
313
- it "reports the component test outputs" do
314
- expect(stdout).to include("you are good to go...")
315
- expect(stdout).to include("my friend everything is good...")
316
- expect(stdout).to include("i'm not feeling good today...")
317
- end
318
- end
319
-
320
- end
321
- end
322
-
323
- end
1
+ #
2
+ # Copyright:: Copyright (c) 2014 Chef Software Inc.
3
+ # License:: Apache License, Version 2.0
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 (the "License");
6
+ # you may not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing, software
12
+ # distributed under the License is distributed on an "AS IS" BASIS,
13
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ # See the License for the specific language governing permissions and
15
+ # limitations under the License.
16
+ #
17
+
18
+ require 'spec_helper'
19
+ require 'chef-dk/command/verify'
20
+
21
+ module Gem
22
+
23
+ # We stub Gem.ruby because `verify` uses it to locate the omnibus directory,
24
+ # but we also use it in some of the "test commands" in these tests.
25
+ class << self
26
+ alias :real_ruby :ruby
27
+ end
28
+ end
29
+
30
+ describe ChefDK::Command::Verify do
31
+ let(:command_instance) { ChefDK::Command::Verify.new() }
32
+
33
+ let(:command_options) { [] }
34
+
35
+ let(:components) { {} }
36
+
37
+ let(:default_components) do
38
+ [
39
+ "berkshelf",
40
+ "test-kitchen",
41
+ "tk-policyfile-provisioner",
42
+ "chef-client",
43
+ "chef-dk",
44
+ "chef-provisioning",
45
+ "chefspec",
46
+ "generated-cookbooks-pass-chefspec",
47
+ "rubocop",
48
+ "fauxhai",
49
+ "knife-spork",
50
+ "kitchen-vagrant",
51
+ "package installation",
52
+ "openssl",
53
+ "inspec"
54
+ ]
55
+ end
56
+
57
+ def run_command(expected_exit_code)
58
+ expect(command_instance.run(command_options)).to eq(expected_exit_code)
59
+ end
60
+
61
+ it "defines berks, tk, chef and chef-dk components by default" do
62
+ expect(command_instance.components).not_to be_empty
63
+ expect(command_instance.components.map(&:name)).to match_array(default_components)
64
+ end
65
+
66
+ it "has a usage banner" do
67
+ expect(command_instance.banner).to eq("Usage: chef verify [component, ...] [options]")
68
+ end
69
+
70
+ describe "when locating omnibus directory" do
71
+ it "should find omnibus app directory from ruby path" do
72
+ allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby"))
73
+ expect(command_instance.omnibus_apps_dir).to include("eg_omnibus_dir/valid/embedded")
74
+ end
75
+
76
+ it "should raise OmnibusInstallNotFound if directory is not looking like omnibus" do
77
+ allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,".rbenv/versions/2.1.1/bin/ruby"))
78
+ expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
79
+ end
80
+
81
+ it "raises OmnibusInstallNotFound if omnibus directory doesn't exist" do
82
+ allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_apps/embedded/bin/ruby"))
83
+ expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
84
+ end
85
+
86
+ it "raises MissingComponentError when a component doesn't exist" do
87
+ allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_component/embedded/bin/ruby"))
88
+ expect{command_instance.validate_components!}.to raise_error(ChefDK::MissingComponentError)
89
+ end
90
+ end
91
+
92
+ describe "when running verify command" do
93
+ let(:stdout_io) { StringIO.new }
94
+ let(:ruby_path) { File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby") }
95
+
96
+ def run_unit_test
97
+ # Set rubyopt to empty to prevent bundler from infecting the ruby
98
+ # subcommands (and loading a bunch of extra gems).
99
+ lambda { |_self| sh("#{Gem.real_ruby} verify_me", env: { "RUBYOPT" => ""}) }
100
+ end
101
+
102
+ def run_integration_test
103
+ lambda { |_self| sh("#{Gem.real_ruby} integration_test", env: { "RUBYOPT" => ""}) }
104
+ end
105
+
106
+ let(:all_tests_ok) do
107
+ ChefDK::ComponentTest.new("successful_comp").tap do |c|
108
+ c.base_dir = "berkshelf"
109
+ c.unit_test(&run_unit_test)
110
+ c.integration_test(&run_integration_test)
111
+ c.smoke_test { sh("exit 0") }
112
+ end
113
+ end
114
+
115
+ let(:all_tests_ok_2) do
116
+ ChefDK::ComponentTest.new("successful_comp_2").tap do |c|
117
+ c.base_dir = "test-kitchen"
118
+ c.unit_test(&run_unit_test)
119
+ c.smoke_test { sh("exit 0") }
120
+ end
121
+ end
122
+
123
+ let(:failing_unit_test) do
124
+ ChefDK::ComponentTest.new("failing_comp").tap do |c|
125
+ c.base_dir = "chef"
126
+ c.unit_test(&run_unit_test)
127
+ c.smoke_test { sh("exit 0") }
128
+ end
129
+ end
130
+
131
+ let(:passing_smoke_test_only) do
132
+ component = failing_unit_test.dup
133
+ component.smoke_test { sh("exit 0") }
134
+ component
135
+ end
136
+
137
+ let(:failing_smoke_test_only) do
138
+ component = all_tests_ok.dup
139
+ component.smoke_test { sh("exit 1") }
140
+ component
141
+ end
142
+
143
+ let(:component_without_integration_tests) do
144
+ ChefDK::ComponentTest.new("successful_comp").tap do |c|
145
+ c.base_dir = "berkshelf"
146
+ c.unit_test { sh("./verify_me") }
147
+ c.smoke_test { sh("exit 0") }
148
+ end
149
+ end
150
+
151
+ def stdout
152
+ stdout_io.string
153
+ end
154
+
155
+ before do
156
+ allow(Gem).to receive(:ruby).and_return(ruby_path)
157
+ allow(command_instance).to receive(:stdout).and_return(stdout_io)
158
+ allow(command_instance).to receive(:components).and_return(components)
159
+ end
160
+
161
+ context "when running smoke tests only" do
162
+ describe "with single command with success" do
163
+ let(:components) do
164
+ [ passing_smoke_test_only ]
165
+ end
166
+
167
+ before do
168
+ run_command(0)
169
+ end
170
+
171
+ it "should report the success of the command" do
172
+ expect(stdout).to include("Verification of component 'failing_comp' succeeded.")
173
+ end
174
+
175
+ end
176
+
177
+ describe "with single command with failure" do
178
+ let(:components) do
179
+ [ failing_smoke_test_only ]
180
+ end
181
+
182
+ before do
183
+ run_command(1)
184
+ end
185
+
186
+ it "should report the failure of the command" do
187
+ expect(stdout).to include("Verification of component 'successful_comp' failed.")
188
+ end
189
+
190
+ end
191
+ end
192
+
193
+ context "when running unit tests" do
194
+
195
+ let(:command_options) { %w{--unit --verbose} }
196
+
197
+ let(:components) do
198
+ [ all_tests_ok ]
199
+ end
200
+
201
+ describe "with single command with success" do
202
+ before do
203
+ run_command(0)
204
+ end
205
+
206
+ it "should have embedded/bin on the PATH" do
207
+ expect(stdout).to include(File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin"))
208
+ end
209
+
210
+ it "should report the success of the command" do
211
+ expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
212
+ end
213
+
214
+ it "reports the component test output" do
215
+ expect(stdout).to include("you are good to go...")
216
+ end
217
+
218
+ context "and --verbose is not enabled" do
219
+
220
+ let(:command_options) { %w{--unit} }
221
+
222
+ it "omits the component test output" do
223
+ expect(stdout).to_not include("you are good to go...")
224
+ end
225
+ end
226
+
227
+ context "and --integration flag is given" do
228
+
229
+ let(:command_options) { %w{--integration --verbose} }
230
+
231
+ it "should run the integration command also" do
232
+ expect(stdout).to include("integration tests OK")
233
+ end
234
+
235
+ context "and no integration test command is specifed for the component" do
236
+
237
+ let(:components) do
238
+ [ component_without_integration_tests ]
239
+ end
240
+
241
+ it "skips the integration test and succeeds" do
242
+ expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
243
+ end
244
+
245
+ end
246
+
247
+ end
248
+
249
+ end
250
+
251
+ describe "with single command with failure" do
252
+ let(:components) do
253
+ [ failing_unit_test ]
254
+ end
255
+
256
+ before do
257
+ run_command(1)
258
+ end
259
+
260
+ it "should report the failure of the command" do
261
+ expect(stdout).to include("Verification of component 'failing_comp' failed.")
262
+ end
263
+
264
+ it "reports the component test output" do
265
+ expect(stdout).to include("i'm not feeling good today...")
266
+ end
267
+ end
268
+
269
+ describe "with multiple commands with success" do
270
+ let(:components) do
271
+ [ all_tests_ok, all_tests_ok_2 ]
272
+ end
273
+
274
+ before do
275
+ run_command(0)
276
+ end
277
+
278
+ it "should report the success of the command" do
279
+ expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
280
+ expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
281
+ end
282
+
283
+ it "reports the component test outputs" do
284
+ expect(stdout).to include("you are good to go...")
285
+ expect(stdout).to include("my friend everything is good...")
286
+ end
287
+
288
+ context "and components are filtered by CLI args" do
289
+
290
+ let(:command_options) { [ "successful_comp_2" ] }
291
+
292
+ it "verifies only the desired component" do
293
+ expect(stdout).to_not include("Verification of component 'successful_comp_1' succeeded.")
294
+ expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
295
+ end
296
+
297
+ end
298
+ end
299
+
300
+ describe "with multiple commands with failures" do
301
+ let(:components) do
302
+ [ all_tests_ok, all_tests_ok_2, failing_unit_test ]
303
+ end
304
+
305
+ before do
306
+ run_command(1)
307
+ end
308
+
309
+ it "should report the success and failure of the commands" do
310
+ expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
311
+ expect(stdout).to include("Verification of component 'successful_comp_2' succeeded.")
312
+ expect(stdout).to include("Verification of component 'failing_comp' failed.")
313
+ end
314
+
315
+ it "reports the component test outputs" do
316
+ expect(stdout).to include("you are good to go...")
317
+ expect(stdout).to include("my friend everything is good...")
318
+ expect(stdout).to include("i'm not feeling good today...")
319
+ end
320
+ end
321
+
322
+ end
323
+ end
324
+
325
+ end