diff options
author | Chef Expeditor <chef-ci@chef.io> | 2021-03-11 17:45:48 +0000 |
---|---|---|
committer | Marc A. Paradise <marc.paradise@gmail.com> | 2021-03-31 13:52:49 -0400 |
commit | 01c6a9e1753bd4b2166efe747151ba8700ebc0f5 (patch) | |
tree | 55f16085d89859139211bf6d2b8fd2dbcf4633b0 /.expeditor | |
parent | 497dd4af19ea7dff9a72d704a1de8e9be36b2996 (diff) | |
download | chef-01c6a9e1753bd4b2166efe747151ba8700ebc0f5.tar.gz |
Move knife to its own gem
This moves knife into /knife, in the same way that chef-utils and
chef-config are separated.
NOTES:
== File History ==
If you see this message as the first message in the history of
an knife file, you can see the complete history by using
'git log --follow', 'git config log.follow true' to make it the default
behavior in this repository, or 'git config --globa log.follow true' to
make it the global default.
== API Changes ==
At the API level, there is one breaking change:
CookbookSiteStreamingUploader has been moved out of chef and into
knife/core.
There were a combination of reasons we chose this path:
- CookbookSiteStreamingUploader (CSSU) is only used within Knife.
- CookbookSiteStreamingUploader (CSSU) references the
command Chef::Knife::CookbookMetadata in order to generate
a metadata file for the cookbook to upload
- Chef::Knife::CookbookMetadata is no longer available to Chef:: because
Knife has been moved to its own gem. Knife gem depends on the Chef gem,
so Chef can't depend on something in Knife.
A search for usage in related projects (berks, chef-cli) and the
Internet at large shows that there are no known external consumers of CSSU.
For now, we'll move this class into Knife::Core, as it's going to be
faster than splitting off the metadata generation and time is a concern. If we
find that we need the metadata generation in chef/ proper, we should evaluate
decoupling that functionality from Knife::CookbookMetadata and exposing
it via something like `Chef::Cookbook::Metadata#from_cookbook_files`
== spec changes ==
The specs are kept in their existing locations, though we have
separated out a `knife_spec_helper` so that we can ensure knife is not
directly accessing chef requires; and chef is relying on knife's at all.
We also now clear gem paths with each test, to force gem state to reset.
This works around a problem where a combination of tests
is corrupting the internal Gem state, causing failures in
rubygems_spec. See branch `mp/broken-gems` for many more details around
findings so far.
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
Diffstat (limited to '.expeditor')
-rw-r--r-- | .expeditor/config.yml | 1 | ||||
-rwxr-xr-x | .expeditor/update_version.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index f87694b89e..c166cd525e 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -16,6 +16,7 @@ rubygems: - chef-config - chef-bin - chef-utils + - knife pipelines: - verify: diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh index 2a75c4b2f9..a6a2c6461d 100755 --- a/.expeditor/update_version.sh +++ b/.expeditor/update_version.sh @@ -16,10 +16,15 @@ VERSION=$(cat VERSION) sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-config/lib/chef-config/version.rb sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-bin/lib/chef-bin/version.rb sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-utils/lib/chef-utils/version.rb +sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" knife/lib/chef/knife/version.rb sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"${VERSION}\")/" lib/chef/version.rb # Update the version inside Gemfile.lock bundle update chef chef-config chef-utils --jobs=7 --conservative +# Same for knife. +cd knife +bundle update chef chef-config chef-utils --jobs=7 --conservative + # Once Expeditor finishes executing this script, it will commit the changes and push # the commit as a new tag corresponding to the value in the VERSION file. |