Skip to content

Commit

Permalink
Merge pull request #1 from Phil-Friderici/pdk
Browse files Browse the repository at this point in the history
Convert to PDK - Add support for Puppet 8
  • Loading branch information
Phil-Friderici authored Oct 27, 2023
2 parents d9c5f74 + d5171a2 commit 48fce29
Show file tree
Hide file tree
Showing 44 changed files with 2,710 additions and 1,351 deletions.
6 changes: 6 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM puppet/pdk:latest

# [Optional] Uncomment this section to install additional packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

38 changes: 38 additions & 0 deletions .devcontainer/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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.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",
}
```



17 changes: 17 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "Puppet Development Kit (Community)",
"dockerFile": "Dockerfile",

"settings": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash"
}
}
},

"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
}
10 changes: 0 additions & 10 deletions .fixtures-puppetv3.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ fixtures:
ref: 'v1.7.0'
stdlib:
repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
ref: '4.6.0'
ref: '5.0.0'
cron:
repo: 'git://github.com/puppetlabs/puppetlabs-cron_core.git'
repo: 'https://github.com/puppetlabs/puppetlabs-cron_core.git'
ref: '1.0.0'
mount:
repo: 'git://github.com/puppetlabs/puppetlabs-mount_core.git'
repo: 'https://github.com/puppetlabs/puppetlabs-mount_core.git'
ref: '1.0.2'
selinux:
repo: 'git://github.com/puppetlabs/puppetlabs-selinux_core.git'
repo: 'https://github.com/puppetlabs/puppetlabs-selinux_core.git'
ref: '1.0.1'
symlinks:
types: "#{source_dir}"
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf
34 changes: 34 additions & 0 deletions .github/workflows/run-pdk-tests-on-puppet-7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Run PDK tests on Puppet 7.x

on:
- push
- pull_request

jobs:
validate-7:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2

- name: Run pdk validate
uses: puppets-epic-show-theatre/action-pdk-validate@v1
with:
puppet-version: "7"
# [optional] A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
# pe-version: ""
# [optional] A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".

test-7:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2

- name: Run unit tests
uses: puppets-epic-show-theatre/action-pdk-test-unit@v1
with:
puppet-version: "7"
# [optional] A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
# pe-version: ""
# [optional] A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".
34 changes: 34 additions & 0 deletions .github/workflows/run-pdk-tests-on-puppet-8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Run PDK tests on Puppet 8.x

on:
- push
- pull_request

jobs:
validate-8:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2

- name: Run pdk validate
uses: puppets-epic-show-theatre/action-pdk-validate@v1
with:
puppet-version: "8"
# [optional] A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
# pe-version: ""
# [optional] A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".

test-8:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2

- name: Run unit tests
uses: puppets-epic-show-theatre/action-pdk-test-unit@v1
with:
puppet-version: "8"
# [optional] A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
# pe-version: ""
# [optional] A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".
58 changes: 26 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
# Default .gitignore for Ruby
*.gem
*.rbc
.bundle
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp

# YARD artifacts
.git/
.*.sw[op]
.metadata
.yardoc
_yardoc
doc/

# Vim
*.swp

# Eclipse
.project

# OS X
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store

# Puppet
coverage/
spec/fixtures/manifests/*
spec/fixtures/modules/*
Gemfile.lock
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
43 changes: 43 additions & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
/.fixtures.yml
/Gemfile
/.gitattributes
/.gitignore
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/..yml
/.yardopts
/spec/
/.vscode/
/.sync.yml
/.devcontainer/
3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--relative
--no-80chars-check
--no-140chars-check
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format documentation
Loading

0 comments on commit 48fce29

Please sign in to comment.