diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml
index ea06ac0..ed4a232 100644
--- a/.github/workflows/static_code_analysis.yaml
+++ b/.github/workflows/static_code_analysis.yaml
@@ -1,41 +1,41 @@
---
name: Static Code Analysis
on:
push:
- branches: [ $default-branch ]
+ branches: [ main ]
pull_request:
- branches: [ $default-branch ]
+ branches: [ main ]
jobs:
static_code_analysis:
name: Run checks
env:
ruby_version: 2.5
extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file
runs-on: 'ubuntu-18.04'
steps:
- name: Checkout current PR code
uses: actions/checkout@v2
- name: Install ruby version ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
- name: Prepare testing environment with bundler
run: bundle update --jobs 4 --retry 3
- name: Run rubocop check
run: bundle exec rake ${{ env.extra_checks }} rubocop
- name: Run syntax check
run: bundle exec rake ${{ env.extra_checks }} syntax syntax:hiera syntax:manifests syntax:templates
- name: Run lint check
run: bundle exec rake ${{ env.extra_checks }} lint
- name: Run metadata_lint check
run: bundle exec rake ${{ env.extra_checks }} metadata_lint
diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
index 12b7230..8c5d909 100644
--- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
@@ -1,60 +1,60 @@
---
name: Unit Tests with nightly Puppet gem
on:
push:
- branches: [ $default-branch ]
+ branches: [ main ]
pull_request:
- branches: [ $default-branch ]
+ branches: [ main ]
jobs:
unit_tests_with_nightly_puppet_gem:
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
strategy:
matrix:
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ]
puppet_version: [ 5, 6, 7 ]
include:
- puppet_version: 5
ruby: 2.4
- puppet_version: 6
ruby: 2.5
- puppet_version: 7
ruby: 2.7
- os: 'ubuntu-18.04'
os_type: 'Linux'
env_set_cmd: 'export '
gem_file: 'puppet-latest.gem'
- os: 'macos-10.15'
os_type: 'macOS'
env_set_cmd: 'export '
gem_file: 'puppet-latest-universal-darwin.gem'
- os: 'windows-2019'
os_type: 'Windows'
env_set_cmd: '$env:'
gem_file: 'puppet-latest-x64-mingw32.gem'
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current PR code
uses: actions/checkout@v2
- name: Install ruby version ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
run: |
curl http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
gem install puppet.gem -N
- name: Prepare testing environment with bundler
run: |
bundle config set system 'true'
${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
bundle update --jobs 4 --retry 3
- name: Run unit tests
run: bundle exec rake parallel_spec
diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
index 66d64ac..065e2b9 100644
--- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml
@@ -1,48 +1,48 @@
---
name: Unit Tests with released Puppet gem
on:
push:
- branches: [ $default-branch ]
+ branches: [ main ]
pull_request:
- branches: [ $default-branch ]
+ branches: [ main ]
jobs:
unit_tests_with_released_puppet_gem:
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
strategy:
matrix:
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ]
puppet_version: [ 5, 6 ]
include:
- puppet_version: 5
ruby: 2.4
- puppet_version: 6
ruby: 2.5
- os: 'ubuntu-18.04'
os_type: 'Linux'
- os: 'macos-10.15'
os_type: 'macOS'
- os: 'windows-2019'
os_type: 'Windows'
runs-on: ${{ matrix.os }}
env:
PUPPET_GEM_VERSION: ~> ${{ matrix.puppet_version }}.0
steps:
- name: Checkout current PR code
uses: actions/checkout@v2
- name: Install ruby version ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Prepare testing environment with bundler
run: |
bundle config set system 'true'
bundle update --jobs 4 --retry 3
- name: Run unit tests
run: bundle exec rake parallel_spec
diff --git a/README.md b/README.md
index b14198e..d954913 100644
--- a/README.md
+++ b/README.md
@@ -1,70 +1,70 @@
# zfs_core
-[](https://github.com/puppetlabs/puppetlabs-zfs_core/actions)
+[](https://github.com/puppetlabs/puppetlabs-zfs_core/actions)
[](https://github.com/puppetlabs/puppetlabs-zfs_core/actions)
[](https://github.com/puppetlabs/puppetlabs-zfs_core/actions)
[](https://github.com/puppetlabs/puppetlabs-zfs_core/actions)
#### Table of Contents
1. [Description](#description)
2. [Usage - Configuration options and additional functionality](#usage)
3. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
4. [Limitations - OS compatibility, etc.](#limitations)
5. [Development - Guide for contributing to the module](#development)
## Description
The zfs_core module is used to manage both zfs and zpool resources. Though This
module is only tested on Solaris machines, it should also work on any machine
that has zfs or zpool resources.
## Usage
To create a zpool resource with the name `tstpool` that uses the disk `/ztstpool/dsk`, use the following code:
```
zpool { 'tstpool':
ensure => present,
disk => '/ztstpool/dsk',
}
```
To create a zfs resource based on the pool created above, use the following code:
```
zfs { 'tstpool/tstfs':
ensure => present,
}
```
## Reference
Please see the REFERENCE.md documentation for the `zfs_core` and `zpool_core` modules.
This module is documented using Puppet Strings.
For a quick primer on how Strings works, please see [this blog post](https://puppet.com/blog/using-puppet-strings-generate-great-documentation-puppet-modules) or the [README.md](https://github.com/puppetlabs/puppet-strings/blob/master/README.md) for Puppet Strings.
To generate documentation locally, run the following command:
```
bundle install
bundle exec puppet strings generate ./lib/**/*.rb
```
This command will create a browsable `\_index.html` file in the `doc` directory. The references available here are all generated from YARD-style comments embedded in the code base. When any development happens on this module, the impacted documentation should also be updated.
## Limitations
This module is only available on platforms that have both zfs and zpool available.
## Development
Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
For more information, see our [module contribution guide.](https://puppet.com/docs/puppet/latest/contributing.html)