diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-23 14:11:10 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-23 14:11:10 -0700 |
| commit | 165685fdcbd4fbe8138d37d1285b633e3958cf09 (patch) | |
| tree | c95140471c1c8f816896d71957f5ac362b6d59f3 /lib/chef/resources.rb | |
| parent | 16b6db24f54f4fa015b4939880a04abb9a8c256b (diff) | |
| download | chef-165685fdcbd4fbe8138d37d1285b633e3958cf09.tar.gz | |
Chef-16 git provider fixes
The git provider now no longer checks out to a "deploy" branch by
default and now checks out to the branch (with a remote upstream) or
else checks out to a detatched head.
The prior behavior can be restored by using "checkout branch 'deploy'".
This also removes the SCM resource base class and replaces it with a
resource partial and does some internal reorganization.
It also introduces the RecipeDSLHelper for better functional tests and
cleans up the functional tests of the git provider.
Properties that were only ever implemented on the git provider were
removed from the subversion provider where they had been inherited from
the base class incorrectly.
Some additional env var handling was added to the subversion handler in
the process of sorting out the common properties, including HOME
handling for alternative users.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resources.rb')
| -rw-r--r-- | lib/chef/resources.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb index f997d43a39..6a87960972 100644 --- a/lib/chef/resources.rb +++ b/lib/chef/resources.rb @@ -53,7 +53,7 @@ require_relative "resource/file" require_relative "resource/freebsd_package" require_relative "resource/ips_package" require_relative "resource/gem_package" -require_relative "resource/git" +require_relative "resource/scm/git" require_relative "resource/group" require_relative "resource/http_request" require_relative "resource/hostname" @@ -108,7 +108,6 @@ require_relative "resource/solaris_package" require_relative "resource/route" require_relative "resource/ruby" require_relative "resource/ruby_block" -require_relative "resource/scm" require_relative "resource/script" require_relative "resource/service" require_relative "resource/sudo" @@ -117,7 +116,7 @@ require_relative "resource/swap_file" require_relative "resource/systemd_unit" require_relative "resource/ssh_known_hosts_entry" require_relative "resource/windows_service" -require_relative "resource/subversion" +require_relative "resource/scm/subversion" require_relative "resource/smartos_package" require_relative "resource/template" require_relative "resource/user" |