proposed implementation of distro constants #112
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,8 @@ | |
| .vagrant | ||
| *.log | ||
| coverage/ | ||
| pkg/ | ||
| *.swap | ||
|
|
||
| # Chef Workstation is the source of truth for all locked gems | ||
| Gemfile.lock | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,25 +69,25 @@ errors: | |
| # Installer action errors | ||
| CHEFINS002: | ||
| text: | | ||
| The target does not have %1 installed. | ||
|
|
||
| This command is powered by the %2 client. In order to make use of it | ||
| on this node, the %2 client must be installed first. | ||
|
|
||
| Re-running this command without the '--no-install' flag will | ||
| automatically perform the installation. | ||
|
|
||
| CHEFINS003: | | ||
| The target's installed version of %1 Client is too old. | ||
|
|
||
| Version %2 is installed, but this command requires a | ||
| minimum version of %3 (%1 13) or %4 (%1 14). | ||
|
|
||
| CHEFINS004: | | ||
| The target's installed version of %1 Client is too old. | ||
|
|
||
| Version %2 is installed, but this command requires a | ||
| minimum version of %3. | ||
|
|
||
| CHEFINS003: | ||
| text: | | ||
|
|
@@ -161,7 +161,7 @@ errors: | |
|
|
||
| CHEFCCR005: | ||
| text: | | ||
| '%1' is not a valid resource. | ||
|
|
||
| Please consult the documentation for a list of valid resources: | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,8 @@ | |
| # FLAG: require "chef/util/path_helper" | ||
| require "chef/util/path_helper" | ||
|
|
||
| require_relative "../dist" | ||
|
|
||
| module ChefApply::Action | ||
| class ConvergeTarget < Base | ||
|
|
||
|
|
@@ -105,7 +107,7 @@ def create_remote_config(dir) | |
| data_collector.server_url "#{dc.url}" | ||
| data_collector.token "#{dc.token}" | ||
| data_collector.mode :solo | ||
| data_collector.organization "#{ChefApply::Dist::WORKSTATION}" | ||
| EOM | ||
| end | ||
|
|
||
|
|
@@ -172,7 +174,7 @@ def handle_ccr_error | |
| # stale stacktrace. | ||
| target_host.del_file(chef_report_path) | ||
| report = JSON.parse(content) | ||
| ChefApply::Log.error("Remote #{ChefApply::Dist::CLIENT} error follows:") | ||
| ChefApply::Log.error(report["exception"]) | ||
| end | ||
| mapper = ConvergeTarget::CCRFailureMapper.new(report["exception"], mapper_opts) | ||
|
|
@@ -191,14 +193,14 @@ def run_chef_cmd(working_dir, config_file, policy) | |
| when :windows | ||
| "Set-Location -Path #{working_dir}; " + | ||
| # We must 'wait' for chef-client to finish before changing directories and Out-Null does that | ||
| "#{ChefApply::Dist::CLIENT} -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)} | Out-Null; " + | ||
| # We have to leave working dir so we don't hold a lock on it, which allows us to delete this tempdir later | ||
| "Set-Location C:/; " + | ||
| "exit $LASTEXITCODE" | ||
| else | ||
| # cd is shell a builtin, so we'll invoke bash. This also means all commands are executed | ||
| # with sudo (as long as we are hardcoding our sudo use) | ||
| "bash -c 'cd #{working_dir}; #{ChefApply::Dist::CLIENT} -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)}'" | ||
| end | ||
| end | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,12 +17,14 @@ | |
|
|
||
| require_relative "../../error" | ||
| require_relative "minimum_chef_version" | ||
| require_relative "../../dist" | ||
|
|
||
| module ChefApply | ||
| module Action | ||
| class InstallChef < Base | ||
| class MinimumChefVersion | ||
|
|
||
| D = ChefApply::Dist | ||
|
There was a problem hiding this comment. I feel this is a bit obscure but, I also don't like typing that much so, it is fine I guess. 😄 There was a problem hiding this comment. Also, other parts of the codebase do it, so 👍
Author
There was a problem hiding this comment. all the |
||
| CONSTRAINTS = { | ||
| windows: { | ||
| 13 => Gem::Version.new("13.10.4"), | ||
|
|
@@ -65,18 +67,18 @@ def self.check!(target, check_only) | |
| end | ||
|
|
||
| class ClientNotInstalled < ChefApply::ErrorNoLogs | ||
| def initialize(); super("CHEFINS002", D::CLIENT, D::SHORT); end | ||
| end | ||
|
|
||
| class Client13Outdated < ChefApply::ErrorNoLogs | ||
| def initialize(current_version, min_13_version, min_14_version) | ||
| super("CHEFINS003", D::SHORT, current_version, min_13_version, min_14_version) | ||
| end | ||
| end | ||
|
|
||
| class Client14Outdated < ChefApply::ErrorNoLogs | ||
| def initialize(current_version, target_version) | ||
| super("CHEFINS004", D::SHORT, current_version, target_version) | ||
| end | ||
| end | ||
| end | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,8 @@ | |
| require_relative "action/generate_local_policy" | ||
| require_relative "action/converge_target" | ||
|
|
||
| require_relative "dist" | ||
|
|
||
| module ChefApply | ||
| class CLI | ||
| attr_reader :temp_cookbook, :archive_file_location, :target_hosts | ||
|
|
@@ -56,6 +58,7 @@ class CLI | |
| RC_COMMAND_FAILED = 1 | ||
| RC_UNHANDLED_ERROR = 32 | ||
| RC_ERROR_HANDLING_FAILED = 64 | ||
| D = ChefApply::Dist | ||
|
|
||
| def initialize(argv) | ||
| @argv = argv.clone | ||
|
|
@@ -181,28 +184,28 @@ def connect_target(target_host, reporter) | |
| def install(target_host, reporter) | ||
| require_relative "action/install_chef" | ||
| context = TS.install_chef | ||
| reporter.update(context.verifying(D::SHORT)) | ||
| installer = Action::InstallChef.new(target_host: target_host, check_only: !parsed_options[:install]) | ||
| installer.run do |event, data| | ||
| case event | ||
| when :installing | ||
| if installer.upgrading? | ||
| message = context.upgrading(D::SHORT, target_host.installed_chef_version, installer.version_to_install) | ||
| else | ||
| message = context.installing(D::SHORT, installer.version_to_install) | ||
| end | ||
| reporter.update(message) | ||
| when :uploading | ||
| reporter.update(context.uploading(D::SHORT)) | ||
| when :downloading | ||
| reporter.update(context.downloading(D::SHORT)) | ||
| when :already_installed | ||
| reporter.update(context.already_present(D::SHORT, target_host.installed_chef_version)) | ||
| when :install_complete | ||
| if installer.upgrading? | ||
| message = context.upgrade_success(D::SHORT, target_host.installed_chef_version, installer.version_to_install) | ||
| else | ||
| message = context.install_success(D::SHORT, installer.version_to_install) | ||
| end | ||
| reporter.update(message) | ||
| else | ||
|
|
@@ -340,6 +343,6 @@ def do_connect(target_host, reporter) | |
| end | ||
|
|
||
| class LicenseCheckFailed < ChefApply::Error | ||
| def initialize(); super("CHEFLIC001", ChefApply::Dist::CLIENT, ChefApply::Dist::SHORT); end | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,12 +57,12 @@ def format_flags | |
| end | ||
|
|
||
| def usage | ||
| T.usage(ChefApply::Dist::RUNEXEC) | ||
| end | ||
|
|
||
| def show_version | ||
| require_relative "../version" | ||
| UI::Terminal.output T.version.show(ChefApply::Dist::RUNEXEC, ChefApply::VERSION) | ||
| end | ||
| end | ||
| end | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.