pdk 3.0.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39902d0ebbac37358fd3fccf5de760b47f77860054b08864ccdae63150b7597
-  data.tar.gz: 6a4d8beb3013edf1ed946b9cf94cd90b055ad63500102e131734600c81c3a5a5
+  metadata.gz: 7ea7fd13c13423022b2ef3e28275d98860b34b9afe9d4b5ccac56c06a0a29346
+  data.tar.gz: 5025806f00ad6d9b36bb0957d8da65765cc46cd335c11ef75cf3b82f88a61e79
 SHA512:
-  metadata.gz: 7af78ce8b0c4bb9122081a2c6449d862da04c9fec85d428b2e8ace3e88a74930fcf809462062b07994307c54c3ee5a827a83ae26e5c67b95f659c3f5c0cb89b5
-  data.tar.gz: c5af71c375d94c9e22f4c7ae284213a39aaa87b8bc21980580ce4e79743979d4cbb967f330c775dcd2ebc4d3046c4c9c5080480172e07dec33afd9546b94da7e
+  metadata.gz: a3b2866a2a221d87d7c87ecc15231b0a97b00bce150cdd97fd6a6a1ee99f36d9ead2fcee2aef644360aaef84e499f1adff1cdb8de9a10ec084ac302743255a6a
+  data.tar.gz: e4fbd9517b238b85d55c59df0a838f831ac1033e84ec2daa96487470f91e1c5954bf96208b223311ab8c8e4c00bc3150570094017576d7e1ffb105c57f2f2eff

data/CHANGELOG.md

@@ -5,7 +5,43 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v3.0.1](https://github.com/puppetlabs/pdk/tree/v3.0.1) - 2023-12-07
+## [v3.3.0](https://github.com/puppetlabs/pdk/tree/v3.3.0) - 2024-09-10
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.2.0...v3.3.0)
+
+## Added
+
+- Skip 'name' validation when in a controlrepo context [#1352](https://github.com/puppetlabs/pdk/pull/1352) ([garrettrowell](https://github.com/garrettrowell))
+- (CAT-1896) - Use puppet-modulebuilder for PDK build [#1374](https://github.com/puppetlabs/pdk/pull/1374) ([jordanbreen28](https://github.com/jordanbreen28))
+
+### Fixed
+
+- (CAT-1643) Update childprocess and remove patch [#1356](https://github.com/puppetlabs/pdk/pull/1356) ([david22swan](https://github.com/david22swan))
+- (CAT-2026) Update how pdk test unit --list detects an error [#1388](https://github.com/puppetlabs/pdk/pull/1388) ([david22swan](https://github.com/david22swan))
+
+## [v3.2.0](https://github.com/puppetlabs/pdk/tree/v3.2.0) - 2024-05-02
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.1.0...v3.2.0)
+
+### Fixed
+
+- (CAT-1807)  Remove analytics from the PDK [#1339](https://github.com/puppetlabs/pdk/pull/1339) ([david22swan](https://github.com/david22swan))
+
+## [v3.1.0](https://github.com/puppetlabs/pdk/tree/v3.1.0) - 2024-04-11
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.0.1...v3.1.0)
+
+### Added
+
+- Allow `pdk convert` and `pdk update` to work in a ControlRepo context [#1310](https://github.com/puppetlabs/pdk/pull/1310) ([garrettrowell](https://github.com/garrettrowell))
+- Support executable templates [#1289](https://github.com/puppetlabs/pdk/pull/1289) ([nabertrand](https://github.com/nabertrand))
+
+### Fixed
+
+- (CAT-1796) Fix missing locale gem [#1337](https://github.com/puppetlabs/pdk/pull/1337) ([LukasAud](https://github.com/LukasAud))
+- (CAT-1703) Convert concurrent-ruby from a pin to a pessimistic constraint [#1312](https://github.com/puppetlabs/pdk/pull/1312) ([david22swan](https://github.com/david22swan))
+
+## [v3.0.1](https://github.com/puppetlabs/pdk/tree/v3.0.1) - 2023-12-13
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.0.0...v3.0.1)
 

data/lib/pdk/cli/build.rb

@@ -12,7 +12,6 @@ module PDK
       option nil, 'force', 'Skips the prompts and builds the module package.'
 
       run do |opts, _args, _cmd|
-        require 'pdk/module/build'
         require 'pdk/module/metadata'
         require 'pdk/cli/util'
 
@@ -22,8 +21,6 @@ module PDK
           log_level: :info
         )
 
-        PDK::CLI::Util.analytics_screen_view('build', opts)
-
         module_metadata = PDK::Module::Metadata.from_file('metadata.json')
 
         # TODO: Ensure forge metadata has been set, or call out to interview
@@ -39,7 +36,11 @@ module PDK
           end
         end
 
-        builder = PDK::Module::Build.new(opts)
+        # build module
+        require 'puppet/modulebuilder'
+        module_dir = PDK::Util::Filesystem.expand_path(Dir.pwd)
+        target_dir = PDK::Util::Filesystem.expand_path(opts[:'target-dir'])
+        builder = Puppet::Modulebuilder::Builder.new(module_dir, target_dir, PDK.logger)
 
         unless opts[:force]
           if builder.package_already_exists?
@@ -51,7 +52,7 @@ module PDK
             end
           end
 
-          unless builder.module_pdk_compatible?
+          unless PDK::Util.module_pdk_compatible?(module_dir)
             PDK.logger.info 'This module is not compatible with PDK, so PDK can not validate or test this build. ' \
                             'Unvalidated modules may have errors when uploading to the Forge. ' \
                             'To make this module PDK compatible and use validate features, cancel the build and run `pdk convert`.'

data/lib/pdk/cli/bundle.rb

@@ -23,8 +23,6 @@ module PDK
         screen_view_name << args[0] if args.size >= 1
         screen_view_name << args[1] if args.size >= 2 && args[0] == 'exec'
 
-        PDK::CLI::Util.analytics_screen_view(screen_view_name.join('_'))
-
         # Ensure that the correct Ruby is activated before running command.
         puppet_env = PDK::CLI::Util.puppet_from_opts_or_env({})
         PDK::Util::RubyVersion.use(puppet_env[:ruby_version])

data/lib/pdk/cli/console.rb

@@ -34,8 +34,6 @@ module PDK
 
         PDK::CLI::Util.validate_puppet_version_opts(processed_options)
 
-        PDK::CLI::Util.analytics_screen_view('console', args)
-
         # TODO: figure out if we need to remove default configs set by puppet
         # so it is scoped for the module only
         # "--environmentpath"...

data/lib/pdk/cli/convert.rb

@@ -18,7 +18,9 @@ module PDK
         # Write the context information to the debug log
         PDK.context.to_debug_log
 
-        raise PDK::CLI::ExitWithError, '`pdk convert` can only be run from inside a valid module directory.' unless PDK.context.is_a?(PDK::Context::Module)
+        unless PDK.context.is_a?(PDK::Context::Module) || PDK.context.is_a?(PDK::Context::ControlRepo)
+          raise PDK::CLI::ExitWithError, '`pdk convert` can only be run from inside a valid module directory.'
+        end
 
         raise PDK::CLI::ExitWithError, 'You can not specify --noop and --force when converting a module' if opts[:noop] && opts[:force]
 
@@ -31,8 +33,6 @@ module PDK
 
         PDK::CLI::Util.validate_template_opts(opts)
 
-        PDK::CLI::Util.analytics_screen_view('convert', opts)
-
         if opts[:'skip-interview'] && opts[:'full-interview']
           PDK.logger.info 'Ignoring --full-interview and continuing with --skip-interview.'
           opts[:'full-interview'] = false

data/lib/pdk/cli/env.rb

@@ -17,8 +17,6 @@ module PDK
 
         PDK::CLI::Util.validate_puppet_version_opts(opts)
 
-        PDK::CLI::Util.analytics_screen_view('env')
-
         # Ensure that the correct Ruby is activated before running command.
         puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
         PDK::Util::RubyVersion.use(puppet_env[:ruby_version])

data/lib/pdk/cli/exec/command.rb

@@ -20,8 +20,6 @@ module PDK
 
         def initialize(*argv)
           require 'childprocess'
-
-          require 'pdk/monkey_patches'
           require 'tempfile'
 
           @argv = argv

data/lib/pdk/cli/new/class.rb

@@ -22,8 +22,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid class name", name: class_name) unless Util::OptionValidator.valid_class_name?(class_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_class', opts)
-
         updates = PDK::Generate::PuppetClass.new(PDK.context, class_name, opts).run
         PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
       end

data/lib/pdk/cli/new/defined_type.rb

@@ -20,8 +20,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid defined type name", name: defined_type_name) unless Util::OptionValidator.valid_defined_type_name?(defined_type_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_defined_type', opts)
-
         require 'pdk/generate/defined_type'
 
         updates = PDK::Generate::DefinedType.new(PDK.context, defined_type_name, opts).run

data/lib/pdk/cli/new/fact.rb

@@ -17,8 +17,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid fact name", name: fact_name) unless Util::OptionValidator.valid_fact_name?(fact_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_fact', opts)
-
         require 'pdk/generate/fact'
 
         updates = PDK::Generate::Fact.new(PDK.context, fact_name, opts).run

data/lib/pdk/cli/new/function.rb

@@ -18,8 +18,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid function name", name: function_name) unless Util::OptionValidator.valid_function_name?(function_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_function', opts)
-
         require 'pdk/generate/function'
         updates = PDK::Generate::Function.new(PDK.context, function_name, opts).run
         PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)

data/lib/pdk/cli/new/module.rb

@@ -22,8 +22,6 @@ module PDK
 
         PDK::CLI::Util.validate_template_opts(opts)
 
-        PDK::CLI::Util.analytics_screen_view('new_module', opts)
-
         if opts[:'skip-interview'] && opts[:'full-interview']
           PDK.logger.info 'Ignoring --full-interview and continuing with --skip-interview.'
           opts[:'full-interview'] = false

data/lib/pdk/cli/new/provider.rb

@@ -17,8 +17,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid provider name", name: provider_name) unless Util::OptionValidator.valid_provider_name?(provider_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_provider', opts)
-
         require 'pdk/generate/provider'
 
         updates = PDK::Generate::Provider.new(PDK.context, provider_name, opts).run

data/lib/pdk/cli/new/task.rb

@@ -24,8 +24,6 @@ module PDK
 
         raise PDK::CLI::ExitWithError, format("'%{name}' is not a valid task name", name: task_name) unless Util::OptionValidator.valid_task_name?(task_name)
 
-        PDK::CLI::Util.analytics_screen_view('new_task', opts)
-
         updates = PDK::Generate::Task.new(PDK.context, task_name, opts).run
         PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
       end

data/lib/pdk/cli/new/test.rb

@@ -39,8 +39,6 @@ module PDK
         begin
           generator, obj = PDK::Util::PuppetStrings.find_object(object_name)
 
-          PDK::CLI::Util.analytics_screen_view('new_test', opts)
-
           updates = generator.new(PDK.context, obj['name'], opts.merge(spec_only: true)).run
           PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
         rescue PDK::Util::PuppetStrings::NoObjectError

data/lib/pdk/cli/release/prep.rb

@@ -28,8 +28,6 @@ module PDK
 
         Release.prepare_interview(opts) unless opts[:force]
 
-        Release.send_analytics("release #{cmd.name}", opts)
-
         release = PDK::Module::Release.new(nil, opts)
 
         Release.module_compatibility_checks!(release, opts)

data/lib/pdk/cli/release/publish.rb

@@ -37,8 +37,6 @@ module PDK
 
         Release.prepare_publish_interview(TTY::Prompt.new(help_color: :cyan), opts) unless opts[:force]
 
-        Release.send_analytics("release #{cmd.name}", opts)
-
         release = PDK::Module::Release.new(nil, opts)
 
         release.run

data/lib/pdk/cli/release.rb

@@ -3,7 +3,6 @@ require 'pdk/validate'
 require 'pdk/util/bundler'
 require 'pdk/cli/util/interview'
 require 'pdk/util/changelog_generator'
-require 'pdk/module/build'
 
 module PDK
   module CLI
@@ -41,8 +40,6 @@ module PDK
 
         Release.prepare_interview(opts) unless opts[:force]
 
-        Release.send_analytics('release', opts)
-
         release = PDK::Module::Release.new(nil, opts)
 
         Release.module_compatibility_checks!(release, opts)
@@ -81,12 +78,6 @@ module PDK
         end
       end
 
-      # Send_analytics for the given command and Cri options
-      def self.send_analytics(command, opts)
-        # Don't pass tokens to analytics
-        PDK::CLI::Util.analytics_screen_view(command, opts.reject { |k, _| k == :'forge-token' })
-      end
-
       def self.prepare_interview(opts)
         questions = []
 

data/lib/pdk/cli/test/unit.rb

@@ -34,8 +34,6 @@ module PDK
 
         PDK::CLI::Util.module_version_check
 
-        PDK::CLI::Util.analytics_screen_view('test_unit', opts)
-
         # Ensure that the bundled gems are up to date and correct Ruby is activated before running or listing tests.
         puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
         PDK::Util::RubyVersion.use(puppet_env[:ruby_version])

data/lib/pdk/cli/update.rb

@@ -14,7 +14,9 @@ module PDK
         # Write the context information to the debug log
         PDK.context.to_debug_log
 
-        raise PDK::CLI::ExitWithError, '`pdk update` can only be run from inside a valid module directory.' unless PDK.context.is_a?(PDK::Context::Module)
+        unless PDK.context.is_a?(PDK::Context::Module) || PDK.context.is_a?(PDK::Context::ControlRepo)
+          raise PDK::CLI::ExitWithError, '`pdk update` can only be run from inside a valid module directory.'
+        end
 
         raise PDK::CLI::ExitWithError, 'This module does not appear to be PDK compatible. To make the module compatible with PDK, run `pdk convert`.' unless PDK::Util.module_pdk_compatible?
 
@@ -31,8 +33,6 @@ module PDK
           end
         end
 
-        PDK::CLI::Util.analytics_screen_view('update', opts)
-
         updater = PDK::Module::Update.new(PDK.context.root_path, opts)
 
         if updater.pinned_to_puppetlabs_template_tag?

data/lib/pdk/cli/util.rb

@@ -245,44 +245,6 @@ module PDK
         raise PDK::CLI::ExitWithError, '--template-url may not be used to specify paths containing #\'s.'
       end
       module_function :validate_template_opts
-
-      def analytics_screen_view(screen_name, opts = {})
-        require 'pdk/analytics'
-
-        dimensions = {
-          ruby_version: RUBY_VERSION
-        }
-
-        cmd_opts = opts.dup.reject do |_, v|
-          v.nil? || (v.respond_to?(:empty?) && v.empty?)
-        end
-
-        if (format_args = cmd_opts.delete(:format))
-          formats = PDK::CLI::Util::OptionNormalizer.report_formats(format_args)
-          dimensions[:output_format] = formats.map { |r| r[:method].to_s.delete_prefix('write_') }.sort.uniq.join(',')
-        else
-          dimensions[:output_format] = 'default'
-        end
-
-        safe_opts = [:'puppet-version', :'pe-version']
-        safe_bools = [true, false]
-        redacted_opts = cmd_opts.map do |k, v|
-          value = if safe_bools.include?(v) || safe_opts.include?(k)
-                    v
-                  else
-                    'redacted'
-                  end
-          "#{k}=#{value}"
-        end
-        dimensions[:cli_options] = redacted_opts.join(',') unless redacted_opts.empty?
-
-        ignored_env_vars = ['PDK_ANALYTICS_CONFIG', 'PDK_DISABLE_ANALYTICS']
-        env_vars = PDK::Util::Env.select { |k, _| k.start_with?('PDK_') && !ignored_env_vars.include?(k) }.map { |k, v| "#{k}=#{v}" }
-        dimensions[:env_vars] = env_vars.join(',') unless env_vars.empty?
-
-        PDK.analytics.screen_view(screen_name, **dimensions)
-      end
-      module_function :analytics_screen_view
     end
   end
 end

data/lib/pdk/cli/validate.rb

@@ -29,7 +29,6 @@ module PDK
         require 'pdk/validate'
 
         if opts[:list]
-          PDK::CLI::Util.analytics_screen_view('validate', opts)
           PDK.logger.info(format('Available validators: %{validator_names}', validator_names: PDK::Validate.validator_names.join(', ')))
           exit 0
         end
@@ -75,12 +74,6 @@ module PDK
         end
         validators_to_run = PDK::Validate.validator_names if validators_to_run.nil?
 
-        if validators_to_run.sort == PDK::Validate.validator_names.sort
-          PDK::CLI::Util.analytics_screen_view('validate', opts)
-        else
-          PDK::CLI::Util.analytics_screen_view(['validate', validators_to_run.sort].flatten.join('_'), opts)
-        end
-
         # Subsequent arguments are targets.
         targets.concat(args.to_a[1..]) if args.length > 1
 

data/lib/pdk/cli.rb

@@ -16,7 +16,6 @@ module Cri
     class CriExitException
       def initialize(is_error:)
         @is_error = is_error
-        PDK.analytics.event('CLI', 'invalid command', label: PDK::CLI.anonymised_args.join(' ')) if error?
       end
     end
   end
@@ -56,7 +55,6 @@ module PDK
 
     def self.run(args)
       @args = args
-      PDK::Config.analytics_config_interview! unless PDK::Util::Env['PDK_DISABLE_ANALYTICS'] || PDK::Config.analytics_config_exist?
       @base_cmd.run(args)
     rescue PDK::CLI::ExitWithError => e
       PDK.logger.send(e.log_level, e.message)

data/lib/pdk/config/namespace.rb

@@ -24,7 +24,7 @@ module PDK
       #   a child of (defaults to nil).
       # @option params [self] :persistent_defaults whether default values should be persisted
       #   to disk when evaluated. By default they are not persisted to disk. This is typically
-      #   used for settings which a randomly generated, instead of being deterministic, e.g. analytics user-id
+      #   used for settings which a randomly generated, instead of being deterministic, e.g. module_defaults author
       # @param block [Proc] a block that is evaluated within the new instance.
       def initialize(name = nil, file: nil, parent: nil, persistent_defaults: false, &block)
         @file = PDK::Util::Filesystem.expand_path(file) unless file.nil?
@@ -162,7 +162,7 @@ module PDK
         new_hash = {}
         settings.each_pair { |k, v| new_hash[k] = v.value }
         @mounts.each_pair { |k, mount_point| new_hash[k] = mount_point.to_h if mount_point.include_in_parent? }
-        new_hash.delete_if { |_k, v| v.nil? } # rubocop :disable Style/CollectionCompact
+        new_hash.delete_if { |_k, v| v.nil? }
         new_hash
       end
 
@@ -238,7 +238,7 @@ module PDK
       #  Returns true when filter is nil.
       #  Returns true if the filter is exactly the same name as the setting.
       #  Returns true if the name is a sub-key of the filter e.g.
-      #    Given a filter of user.module_defaults, `user.module_defaults.author` will return true, but `user.analytics.disabled` will return false.
+      #    Given a filter of user.module_defaults, `user.module_defaults.author` will return true, but `user.pdk_feature_flags.requested` will return false.
       #
       # @param name [String] The setting name to test.
       # @param filter [String] The filter used to test on the name.

data/lib/pdk/config/setting.rb

@@ -9,9 +9,9 @@ module PDK
     #
     # @example
     #
-    # PDK::Config::Namespace.new('analytics') do
-    #   setting :disabled do
-    #     validate PDK::Config::Validator.boolean
+    # PDK::Config::Namespace.new('module_defaults') do
+    #   setting :author do
+    #     validate PDK::Config::Validator.string
     #     default_to { false }
     #   end
     # end

data/lib/pdk/config.rb

@@ -19,7 +19,6 @@ module PDK
     # @option options [String]                        'system.module_defaults.path' Path to the system module answers PDK configuration file
     # @option options [String]                        'user.path'                   Path to the user PDK configuration file
     # @option options [String]                        'user.module_defaults.path'   Path to the user module answers PDK configuration file
-    # @option options [String]                        'user.analytics.path'         Path to the user analytics PDK configuration file
     # @option options [PDK::Context::AbstractContext] 'context'                     The context that the configuration should be created in
     def initialize(options = nil)
       options = {} if options.nil?
@@ -28,7 +27,6 @@ module PDK
         'system.module_defaults.path' => PDK::Config.system_answers_path,
         'user.path' => PDK::Config.user_config_path,
         'user.module_defaults.path' => PDK::AnswerFile.default_answer_file_path,
-        'user.analytics.path' => PDK::Config.analytics_config_path,
         'context' => PDK.context
       }.merge(options)
     end
@@ -51,27 +49,6 @@ module PDK
       @user_config ||= PDK::Config::JSON.new('user', file: local_options['user.path']) do
         mount :module_defaults, PDK::Config::JSON.new(file: local_options['user.module_defaults.path'])
 
-        # Due to the json-schema gem having issues with Windows based paths, and only supporting Draft 05 (or less) do
-        # not use JSON validation yet.  Once PDK drops support for EOL rubies, we will be able to use the json_schemer gem
-        # Which has much more modern support
-        # Reference - https://github.com/puppetlabs/pdk/pull/777
-        # Reference - https://tickets.puppetlabs.com/browse/PDK-1526
-        mount :analytics, PDK::Config::YAML.new(file: local_options['user.analytics.path'], persistent_defaults: true) do
-          setting :disabled do
-            validate PDK::Config::Validator.boolean
-            default_to { PDK::Config.bolt_analytics_config.fetch('disabled', true) }
-          end
-
-          setting 'user-id' do
-            validate PDK::Config::Validator.uuid
-            default_to do
-              require 'securerandom'
-
-              PDK::Config.bolt_analytics_config.fetch('user-id', SecureRandom.uuid)
-            end
-          end
-        end
-
         # Display the feature flags
         mount :pdk_feature_flags, PDK::Config::Namespace.new('pdk_feature_flags') do
           setting 'available' do
@@ -191,18 +168,6 @@ module PDK
       deep_set_object(value, options[:force], send(all_scopes[scope_name]), *names[1..])
     end
 
-    def self.bolt_analytics_config
-      file = PDK::Util::Filesystem.expand_path('~/.puppetlabs/bolt/analytics.yaml')
-      PDK::Config::YAML.new(file: file)
-    rescue PDK::Config::LoadError => e
-      PDK.logger.debug format('Unable to load %{file}: %{message}', file: file, message: e.message)
-      PDK::Config::YAML.new
-    end
-
-    def self.analytics_config_path
-      PDK::Util::Env['PDK_ANALYTICS_CONFIG'] || File.join(File.dirname(PDK::Util.configdir), 'puppet', 'analytics.yml')
-    end
-
     def self.user_config_path
       File.join(PDK::Util.configdir, 'user_config.json')
     end
@@ -224,51 +189,6 @@ module PDK
       File.join(json_schemas_path, "#{name}_schema.json")
     end
 
-    def self.analytics_config_exist?
-      PDK::Util::Filesystem.file?(analytics_config_path)
-    end
-
-    def self.analytics_config_interview!
-      require 'pdk/cli/util'
-
-      return unless PDK::CLI::Util.interactive?
-
-      pre_message =
-        format('PDK collects anonymous usage information to help us understand how ' \
-               'it is being used and make decisions on how to improve it. You can ' \
-               'find out more about what data we collect and how it is used in the ' \
-               "PDK documentation at %{url}.\n", url: 'https://puppet.com/docs/pdk/latest/pdk_install.html')
-      post_message =
-        format('You can opt in or out of the usage data collection at any time by ' \
-               'editing the analytics configuration file at %{path} and changing ' \
-               "the '%{key}' value.", path: PDK::Config.analytics_config_path, key: 'disabled')
-
-      questions = [
-        {
-          name: 'enabled',
-          question: 'Do you consent to the collection of anonymous PDK usage information?',
-          type: :yes
-        }
-      ]
-
-      require 'pdk/cli/util/interview'
-
-      PDK.logger.info(text: pre_message, wrap: true)
-      prompt = TTY::Prompt.new(help_color: :cyan)
-      interview = PDK::CLI::Util::Interview.new(prompt)
-      interview.add_questions(questions)
-      answers = interview.run
-
-      if answers.nil?
-        PDK.logger.info 'No answer given, opting out of analytics collection.'
-        PDK.config.set(['user', 'analytics', 'disabled'], true)
-      else
-        PDK.config.set(['user', 'analytics', 'disabled'], !answers['enabled'])
-      end
-
-      PDK.logger.info(text: post_message, wrap: true)
-    end
-
     private
 
     # :nocov: This is a private method and is tested elsewhere

data/lib/pdk/module/convert.rb

@@ -148,7 +148,7 @@ module PDK
           module_name = new_metadata.nil? ? 'new-module' : new_metadata.data['name']
           metadata_for_render = new_metadata.nil? ? {} : new_metadata.data
 
-          template_dir.render_new_module(module_name, metadata_for_render) do |relative_file_path, file_content, file_status|
+          template_dir.render_new_module(module_name, metadata_for_render) do |relative_file_path, file_content, file_status, file_executable|
             absolute_file_path = File.join(module_dir, relative_file_path)
             case file_status
             when :unmanage
@@ -156,12 +156,17 @@ module PDK
             when :delete
               update_manager.remove_file(absolute_file_path)
             when :init
-              update_manager.add_file(absolute_file_path, file_content) if convert? && !PDK::Util::Filesystem.exist?(absolute_file_path)
+              if convert? && !PDK::Util::Filesystem.exist?(absolute_file_path)
+                update_manager.add_file(absolute_file_path, file_content)
+                update_manager.make_file_executable(absolute_file_path) if file_executable
+              end
             when :manage
               if PDK::Util::Filesystem.exist?(absolute_file_path)
                 update_manager.modify_file(absolute_file_path, file_content)
+                update_manager.make_file_executable(absolute_file_path) if file_executable && !PDK::Util::Filesystem.stat(absolute_file_path).executable?
               else
                 update_manager.add_file(absolute_file_path, file_content)
+                update_manager.make_file_executable(absolute_file_path) if file_executable
               end
             end
           end
@@ -206,7 +211,7 @@ module PDK
           return if options[:noop]
 
           project_dir = File.basename(Dir.pwd)
-          options[:module_name] = project_dir.split('-', 2).compact[-1]
+          options[:module_name] = PDK.context.is_a?(PDK::Context::ControlRepo) ? project_dir : project_dir.split('-', 2).compact[-1]
           options[:prompt] = false
           options[:'skip-interview'] = true if options[:force]