Merge pull request #159 from MartyEwings/main

pdk template  update

Author: elainemccloskey

.devcontainer/README.md

@@ -0,0 +1,34 @@
+# devcontainer
+
+
+For format details, see https://aka.ms/devcontainer.json. 
+
+For config options, see the README at:
+https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+ 
+``` json
+{
+	"name": "Puppet Development Kit (Community)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"puppet.puppet-vscode",
+		"rebornix.Ruby"
+	]
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "pdk --version",
+}
+```
+
+
+

.devcontainer/devcontainer.json

@@ -1,23 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
 {
 	"name": "Puppet Development Kit (Community)",
 	"dockerFile": "Dockerfile",
 
-	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
-	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
 	]
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pdk --version",
 }

.rubocop.yml

@@ -74,8 +74,6 @@ Style/SymbolArray:
   EnforcedStyle: brackets
 RSpec/NamedSubject:
   Enabled: false
-Style/CollectionMethods:
-  Enabled: false
 Style/LineEndConcatenation:
   Enabled: false
 Lint/AssignmentInCondition:
@@ -94,6 +92,8 @@ Style/GuardClause:
   Enabled: false
 RSpec/EmptyExampleGroup:
   Enabled: false
+Style/CollectionMethods:
+  Enabled: false
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/WordArray:

.sync.yml

@@ -39,8 +39,6 @@ spec/default_facts.yml:
        Enabled: False
     "Style/ClassAndModuleChildren":
        Enabled: False
-    "Style/CollectionMethods":
-       Enabled: False
     "Style/LineEndConcatenation":
        Enabled: False
     "Lint/AssignmentInCondition":
@@ -59,7 +57,8 @@ spec/default_facts.yml:
        Enabled: False
     "RSpec/EmptyExampleGroup":
        Enabled: False
-
+    "Style/CollectionMethods":
+       Enabled: False
 Gemfile:
   optional:
     ":development":

1

@@ -0,0 +1,65 @@
+---
+common:
+
+".gitlab-ci.yml":
+  delete: true
+appveyor.yml:
+  delete: true
+.gitpod.Dockerfile:
+  unmanaged: true
+.gitpod.yml:
+  unmanaged: true
+.github/workflows/nightly.yml:
+  unmanaged: true
+.github/workflows/pr_test.yml:
+  unmanaged: true
+.github/workflows/auto_release.yml:
+  unmanaged: true
+.github/workflows/spec.yml:
+  checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+  unmanaged: true
+.github/workflows/release.yml:
+  unmanaged: true
+.travis.yml:
+  delete: true
+spec/spec_helper.rb:
+  mock_with: ":rspec"
+  coverage_report: true
+Rakefile:
+  changelog_user: "puppetlabs"
+
+spec/default_facts.yml:
+  extra_facts:
+    pe_server_version: '2019.8.6'
+    puppet_metrics_collector:
+      have_systemd: true
+.rubocop.yml:
+  default_configs:
+    "RSpec/NamedSubject":
+       Enabled: False
+    "Style/ClassAndModuleChildren":
+       Enabled: False
+    "Style/LineEndConcatenation":
+       Enabled: False
+    "Lint/AssignmentInCondition":
+       Enabled: False
+    "Lint/RescueException":
+       Enabled: False
+    "Lint/UnderscorePrefixedVariableName":
+       Enabled: False
+    "Lint/UselessAssignment":
+       Enabled: False
+    "Style/Documentation":
+       Enabled: False
+    "Style/GlobalVars":
+       Enabled: False
+    "Style/GuardClause":
+       Enabled: False
+    "RSpec/EmptyExampleGroup":
+       Enabled: False
+    "Style/CollectionMethods":
+       Enabled: False
+Gemfile:
+  optional:
+    ":development":
+    - gem: github_changelog_generator

Rakefile

@@ -43,6 +43,7 @@ end
 
 PuppetLint.configuration.send('disable_relative')
 
+
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?

metadata.json

@@ -56,7 +56,7 @@
       "version_requirement": ">= 6.16.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.1.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#2.1.1",
-  "template-ref": "tags/2.1.1-0-g03daa92"
+  "pdk-version": "2.4.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#2.4.0",
+  "template-ref": "tags/2.4.0-0-gfa6b6d2"
 }