Skip to content

Commit aad10b6

Browse files
authored
Merge pull request #197 from OpenVoxProject/drop_puppet_connect
Drop puppet_connect plugin & module
2 parents 892bb18 + 00a68aa commit aad10b6

12 files changed

Lines changed: 3 additions & 541 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ acceptance/hosts.yaml
5555
modules/*
5656
!modules/aggregate
5757
!modules/canary
58-
!modules/puppet_connect
5958
!modules/puppetdb_fact
6059

6160
.sass-cache/

.rubocop_todo.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,6 @@ RSpec/NamedSubject:
527527
- 'spec/unit/plan_creator_spec.rb'
528528
- 'spec/unit/plugin/env_var_spec.rb'
529529
- 'spec/unit/plugin/prompt_spec.rb'
530-
- 'spec/unit/plugin/puppet_connect_data_spec.rb'
531530
- 'spec/unit/transport/local_spec.rb'
532531
- 'spec/unit/transport/ssh/connection_spec.rb'
533532
- 'spec/unit/transport/ssh/exec_connection_spec.rb'
@@ -648,7 +647,6 @@ RSpec/StubbedMock:
648647
# Offense count: 3
649648
RSpec/SubjectDeclaration:
650649
Exclude:
651-
- 'spec/unit/plugin/puppet_connect_data_spec.rb'
652650
- 'spec/unit/transport/ssh/connection_spec.rb'
653651
- 'spec/unit/transport/ssh/exec_connection_spec.rb'
654652

Puppetfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,3 @@ mod 'puppetlabs-yaml', '0.2.0'
5555
mod 'canary', local: true
5656
mod 'aggregate', local: true
5757
mod 'puppetdb_fact', local: true
58-
mod 'puppet_connect', local: true

lib/bolt/cli.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ def execute(options)
750750
# built-in modules are installed.
751751
#
752752
private def incomplete_install?
753-
builtin_module_list = %w[aggregate canary puppetdb_fact secure_env_vars puppet_connect]
753+
builtin_module_list = %w[aggregate canary puppetdb_fact secure_env_vars]
754754
(Dir.children(Bolt::Config::Modulepath::MODULES_PATH) - builtin_module_list).empty?
755755
end
756756

lib/bolt/plugin.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def boltdir
127127
end
128128
end
129129

130-
RUBY_PLUGINS = %w[task prompt env_var puppetdb puppet_connect_data].freeze
130+
RUBY_PLUGINS = %w[task prompt env_var puppetdb].freeze
131131
BUILTIN_PLUGINS = %w[task terraform pkcs7 prompt vault aws_inventory puppetdb azure_inventory
132132
yaml env_var gcloud_inventory].freeze
133133
DEFAULT_PLUGIN_HOOKS = { 'puppet_library' => { 'plugin' => 'openvox_bootstrap', 'stop_service' => true } }.freeze
@@ -255,9 +255,6 @@ def list_plugins
255255
hooks = KNOWN_HOOKS.map { |hook| [hook, {}] }.to_h
256256

257257
@plugins.sort.each do |name, plugin|
258-
# Don't show the Puppet Connect plugin for now.
259-
next if name == 'puppet_connect_data'
260-
261258
case plugin
262259
when Bolt::Plugin::Module
263260
plugin.hook_map.each do |hook, spec|

lib/bolt/plugin/puppet_connect_data.rb

Lines changed: 0 additions & 85 deletions
This file was deleted.

modules/puppet_connect/README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

modules/puppet_connect/plans/test_input_data.pp

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)