Merge pull request #34 from rehanone/develop/pdk-update

- Updated os support matrix.
rehanone · Dec 23, 2021 · 4ba084e · 4ba084e
2 parents 1faa841 + 89c88f3
commit 4ba084e
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 57 deletions.
diff --git a/.devcontainer/README.md b/.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",
+}
+```
+
+
+
diff --git a/.devcontainer/devcontainer.json b/.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",
 }
diff --git a/.travis.yml b/.travis.yml
@@ -119,7 +119,7 @@ jobs:
       stage: acceptance
       sudo: required
     -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      env: CHECK="validate lint check rubocop"
       stage: static
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec

diff --git a/README.md b/README.md
@@ -32,9 +32,7 @@ $ puppet module install rehan-wget
 The module can be used with `hiera` to provide all configuration options. See [Usage](#usage) for examples on how to configure it.
 
 #### Requirements
-This module is designed to be as clean and compliant with latest puppet code guidelines. It works with:
-
-  - `puppet >=5.5.10`
+This module is designed to be as clean and compliant with latest puppet code guidelines.
 
 ## Usage
 

diff --git a/Rakefile b/Rakefile
@@ -44,6 +44,7 @@ end
 PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.fail_on_warnings = true
 
+
 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?

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 5.0.0 < 9.0.0"
+      "version_requirement": ">= 6.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -22,12 +22,6 @@
         "8"
       ]
     },
-    {
-      "operatingsystem": "Rocky",
-      "operatingsystemrelease": [
-        "8"
-      ]
-    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
@@ -37,28 +31,19 @@
       ]
     },
     {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "6",
-        "7",
-        "8"
-      ]
+      "operatingsystem": "OracleLinux"
     },
     {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "6",
-        "7",
-        "8"
-      ]
+      "operatingsystem": "Scientific"
     },
     {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "32",
-        "33",
-        "34"
-      ]
+      "operatingsystem": "Fedora"
+    },
+    {
+      "operatingsystem": "Rocky"
+    },
+    {
+      "operatingsystem": "AlmaLinux"
     },
     {
       "operatingsystem": "SLES",
@@ -94,19 +79,7 @@
       ]
     },
     {
-      "operatingsystem": "DragonFly",
-      "operatingsystemrelease": [
-        "4.0",
-        "4.2",
-        "4.4",
-        "4.6",
-        "4.8",
-        "5.0",
-        "5.2",
-        "5.4",
-        "5.6",
-        "5.8"
-      ]
+      "operatingsystem": "DragonFly"
     },
     {
       "operatingsystem": "ArchLinux"
@@ -115,7 +88,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.10 < 8.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "tags": [
@@ -124,7 +97,7 @@
     "download",
     "archive"
   ],
-  "pdk-version": "2.1.1",
-  "template-url": "pdk-default#2.1.1",
-  "template-ref": "tags/2.1.1-0-g03daa92"
+  "pdk-version": "2.3.0",
+  "template-url": "pdk-default#2.3.0",
+  "template-ref": "tags/2.3.0-0-g8aaceff"
 }