Skip to content
Snippets Groups Projects
Commit 8463a93c authored by Magnus Svensson's avatar Magnus Svensson
Browse files

Merge branch 'devel' into 'test'

Devel

See merge request pm-liuit/liu_pulpcore!108
parents 0aa350fb 7c6495a5
No related branches found
No related tags found
No related merge requests found
Pipeline #158816 passed
...@@ -31,9 +31,14 @@ indent_size = 4 ...@@ -31,9 +31,14 @@ indent_size = 4
[Makefile] [Makefile]
indent_style = tab indent_style = tab
; The JSON files contain newlines inconsistently
[*.json]
insert_final_newline = ignore
[*.{ps1,psm1}] [*.{ps1,psm1}]
indent_size = 4 indent_size = 4
# Ignore paths
[{LICENSE,REFERENCE.md}]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
--relative --relative
--no-80chars-check
--no-lookup_in_parameter-check
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp
{ {
"recommendations": [ "recommendations": [
"puppet.puppet-vscode", "puppet.puppet-vscode",
"rebornix.Ruby",
"ms-vscode.powershell", "ms-vscode.powershell",
"EditorConfig.EditorConfig", "EditorConfig.EditorConfig",
"glenbuktenica.unicode-substitutions" "glenbuktenica.unicode-substitutions",
"Shopify.ruby-lsp" "Shopify.ruby-lsp"
] ]
} }
...@@ -22,9 +22,12 @@ group :development do ...@@ -22,9 +22,12 @@ group :development do
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "deep_merge", '~> 1.2.2', require: false gem "deep_merge", '~> 1.2.2', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
gem "facterdb", '~> 2.1', require: false gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "metadata-json-lint", '~> 4.0', require: false gem "metadata-json-lint", '~> 4.0', require: false
gem "rspec-puppet-facts", '~> 4.0', require: false gem "json-schema", '< 5.1.1', require: false
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "dependency_checker", '~> 1.0.0', require: false gem "dependency_checker", '~> 1.0.0', require: false
gem "parallel_tests", '= 3.12.1', require: false gem "parallel_tests", '= 3.12.1', require: false
gem "pry", '~> 0.10', require: false gem "pry", '~> 0.10', require: false
...@@ -34,13 +37,13 @@ group :development do ...@@ -34,13 +37,13 @@ group :development do
gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-performance", '= 1.16.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "rexml", '>= 3.0.0', '< 3.2.7', require: false
gem "puppet-resource_api", require: false gem "puppet-resource_api", require: false
gem "webmock", require: false gem "webmock", require: false
end end
group :development, :release_prep do group :development, :release_prep do
gem "puppet-strings", '~> 4.0', require: false gem "puppet-strings", '~> 4.0', require: false
gem "puppetlabs_spec_helper", '~> 7.0', require: false gem "puppetlabs_spec_helper", '~> 8.0', require: false
gem "puppet-blacksmith", '~> 7.0', require: false
end end
group :system_tests do group :system_tests do
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
......
# liu_pulpcore # liu_pulpcore
Welcome to your new module. A short overview of the generated parts can be found ## Documentation ideas
in the [PDK documentation][1].
The README template below provides a starting point with details about what For ideas about what to document here see the [pdk template
information to include in your README. readme](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot_init/README.md.erb).
## Table of Contents For how to do it:
https://puppet.com/docs/puppet/latest/puppet_strings.html
1. [Description](#description) https://puppet.com/docs/puppet/latest/puppet_strings_style.html
1. [Setup - The basics of getting started with liu_pulpcore](#setup)
* [What liu_pulpcore affects](#what-liu_pulpcore-affects)
* [Setup requirements](#setup-requirements)
* [Beginning with liu_pulpcore](#beginning-with-liu_pulpcore)
1. [Usage - Configuration options and additional functionality](#usage)
1. [Limitations - OS compatibility, etc.](#limitations)
1. [Development - Guide for contributing to the module](#development)
## Description
Briefly tell users why they might want to use your module. Explain what your
module does and what kind of problems users can solve with it.
This should be a fairly short description helps the user decide if your module
is what they want.
## Setup
### What liu_pulpcore affects **OPTIONAL**
If it's obvious what your module touches, you can skip this section. For
example, folks can probably figure out that your mysql_instance module affects
their MySQL instances.
If there's more that they should know about, though, this is the place to
mention:
* Files, packages, services, or operations that the module will alter, impact,
or execute.
* Dependencies that your module automatically installs.
* Warnings or other important notices.
### Setup Requirements **OPTIONAL**
If your module requires anything extra before setting up (pluginsync enabled,
another module, etc.), mention it here.
If your most recent release breaks compatibility or requires particular steps
for upgrading, you might want to include an additional "Upgrading" section here.
### Beginning with liu_pulpcore
The very basic steps needed for a user to get the module up and running. This
can include setup steps, if necessary, or it can be an example of the most basic
use of the module.
## Usage
Include usage examples for common use cases in the **Usage** section. Show your
users how to use your module to solve problems, and be sure to include code
examples. Include three to five examples of the most important or common tasks a
user can accomplish with your module. Show users how to accomplish more complex
tasks that involve different types, classes, and functions working in tandem.
## Reference
This section is deprecated. Instead, add reference information to your code as
Puppet Strings comments, and then use Strings to generate a REFERENCE.md in your
module. For details on how to add code comments and generate documentation with
Strings, see the [Puppet Strings documentation][2] and [style guide][3].
If you aren't ready to use Strings yet, manually create a REFERENCE.md in the
root of your module directory and list out each of your module's classes,
defined types, facts, functions, Puppet tasks, task plans, and resource types
and providers, along with the parameters for each.
For each element (class, defined type, function, and so on), list:
* The data type, if applicable.
* A description of what the element does.
* Valid values, if the data type doesn't make it obvious.
* Default value, if any.
For example:
```
### `pet::cat`
#### Parameters
##### `meow`
Enables vocalization in your cat. Valid options: 'string'.
Default: 'medium-loud'.
```
## Limitations
In the Limitations section, list any incompatibilities, known issues, or other
warnings.
## Development
In the Development section, tell other users the ground rules for contributing
to your project and how they should submit their work.
## Release Notes/Contributors/Etc. **Optional**
If you aren't using changelog, put your release notes here (though you should
consider using changelog). You can also add any additional sections you feel are
necessary or important to include here. Please use the `##` header.
[1]: https://puppet.com/docs/pdk/latest/pdk_generating_modules.html
[2]: https://puppet.com/docs/puppet/latest/puppet_strings.html
[3]: https://puppet.com/docs/puppet/latest/puppet_strings_style.html
...@@ -7,3 +7,8 @@ require 'puppet-syntax/tasks/puppet-syntax' ...@@ -7,3 +7,8 @@ require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings' require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
PuppetLint.configuration.send('disable_relative') PuppetLint.configuration.send('disable_relative')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_lookup_in_parameter')
PuppetLint.configuration.fail_on_warnings = false
PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"]
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"version_requirement": ">= 7.24 < 9.0.0" "version_requirement": ">= 7.24 < 9.0.0"
} }
], ],
"pdk-version": "3.3.0", "pdk-version": "3.4.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu", "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
"template-ref": "heads/liu-0-g5dd7d7f" "template-ref": "heads/liu-0-g967906f"
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment