CHEF-23547 use official distribution in hab plan #7507
Merged
Conversation
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
✅ Deploy Preview for chef-inspec ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
sathish-progress
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
from
21d49a5 to
19ef3e7
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the Habitat packaging configuration to use the official chef-official-distribution gem instead of relying on default dependency resolution, while also integrating a custom chef-licensing branch.
- Comments out the chef-licensing dependency in the gemspec
- Adds manual installation of a custom chef-licensing branch from GitHub
- Installs chef-official-distribution gem from internal artifactory in both shell and PowerShell plans
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| inspec-core.gemspec | Comments out chef-licensing dependency |
| habitat/plan.sh | Adds manual installation of custom chef-licensing and chef-official-distribution gems |
| habitat/plan.ps1 | Adds PowerShell equivalent with verification steps for gem installations |
| Gemfile | Adds chef-licensing dependency from GitHub branch |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
habitat/plan.sh
Outdated
| popd | ||
| rm -rf /tmp/chef-licensing | ||
|
|
||
| # internal artificatory is not compatible to resolve gem deps and fails with gem install <URL> |
There was a problem hiding this comment.
There's a typo in the comment: 'artificatory' should be 'artifactory'.
Suggested change
| # internal artificatory is not compatible to resolve gem deps and fails with gem install <URL> | |
| # internal artifactory is not compatible to resolve gem deps and fails with gem install <URL> |
habitat/plan.ps1
Outdated
| gem list chef-licensing | ||
| If ($lastexitcode -ne 0) { Exit $lastexitcode } | ||
|
|
||
| # internal artificatory is not compatible to resolve gem deps and fails with gem install <URL> |
There was a problem hiding this comment.
There's a typo in the comment: 'artificatory' should be 'artifactory'.
Suggested change
| # internal artificatory is not compatible to resolve gem deps and fails with gem install <URL> | |
| # internal artifactory is not compatible to resolve gem deps and fails with gem install <URL> |
habitat/plan.sh
Outdated
| } | ||
|
|
||
| do_install() { | ||
| # Work around to load custom chef-licensing branch |
There was a problem hiding this comment.
The comment should use 'workaround' (one word) instead of 'Work around' for consistency with technical terminology.
Suggested change
| # Work around to load custom chef-licensing branch | |
| # Workaround to load custom chef-licensing branch |
habitat/plan.ps1
Outdated
| } | ||
|
|
||
| function Invoke-Install { | ||
| # Work around to load custom chef-licensing branch |
There was a problem hiding this comment.
The comment should use 'workaround' (one word) instead of 'Work around' for consistency with technical terminology.
Suggested change
| # Work around to load custom chef-licensing branch | |
| # Workaround to load custom chef-licensing branch |
sathish-progress
requested review from
Nik08,
Vasu1105 and
balasubramanian-s
sathish-progress
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
from
1558c6e to
258f060
Compare
Vasu1105
approved these changes
Sep 10, 2025
Nik08
approved these changes
Sep 10, 2025
Vasu1105
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
from
b2e56a1 to
e96f3a5
Compare
sathish-progress
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
from
e96f3a5 to
d4a388d
Compare
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Vasu1105 <vjagdale@progress.com>
Signed-off-by: Vasu1105 <vjagdale@progress.com>
Signed-off-by: Vasu1105 <vjagdale@progress.com>
… code clean up Signed-off-by: Vasu1105 <vjagdale@progress.com>
sathish-progress
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
from
d4a388d to
dee96dc
Compare
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
Signed-off-by: Sathish <sbabu@progress.com>
sathish-progress
force-pushed
the
CHEF-23547-use-offc-distrib-in-hab-plan
branch
2 times, most recently
from
9d38c50 to
f3db4c9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request updates how the
chef-licensinggem is integrated and installed, switching to a custom branch and working around dependency resolution issues with internal artifactory. The changes affect the Gemfile, build/install scripts, and gemspec dependencies to ensure the correct version ofchef-licensingis used during development and packaging.Description
Dependency management and installation changes:
chef-licensinggem to theGemfile, sourcing it from a custom branch (nm/introducing-optional-mode) on GitHub instead of the default version. This will go away when the custom branch is released as gem.chef-licensingininspec-core.gemspec, relying on the Gemfile and build scripts to provide the correct version.Build and packaging script updates:
habitat/plan.sh(do_install) to clone the customchef-licensingbranch from GitHub, build, and install the gem directly, and added a workaround to manually download and install thechef-official-distributiongem from internal artifactory due to incompatibility with standard gem dependency resolution.habitat/plan.ps1(Invoke-Install) to perform similar steps on Windows: clone and install the customchef-licensingbranch, manually download and install thechef-official-distributiongem, and verify both installations.Related Issue
Types of changes
Checklist: