Skip to content

Commit 2570563

Browse files
noelmcloughlinnoelmcloughlin
committed
feat(template): align to template formula
1 parent 17f4d76 commit 2570563

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2671
-314
lines changed

‎.gitignore‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
28+
# PyInstaller
29+
# Usually these files are written by a python script from a packager
30+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
*.manifest
32+
*.spec
33+
34+
# Installer logs
35+
pip-log.txt
36+
pip-delete-this-directory.txt
37+
38+
# Unit test / coverage reports
39+
htmlcov/
40+
.tox/
41+
.coverage
42+
.coverage.*
43+
.cache
44+
nosetests.xml
45+
coverage.xml
46+
*.cover
47+
.hypothesis/
48+
.kitchen
49+
.kitchen.local.yml
50+
kitchen.local.yml
51+
junit-*.xml
52+
53+
# Translations
54+
*.mo
55+
*.pot
56+
57+
# Django stuff:
58+
*.log
59+
local_settings.py
60+
61+
# Flask stuff:
62+
instance/
63+
.webassets-cache
64+
65+
# Scrapy stuff:
66+
.scrapy
67+
68+
# Sphinx documentation
69+
docs/_build/
70+
71+
# PyBuilder
72+
target/
73+
74+
# Jupyter Notebook
75+
.ipynb_checkpoints
76+
77+
# pyenv
78+
.python-version
79+
80+
# celery beat schedule file
81+
celerybeat-schedule
82+
83+
# SageMath parsed files
84+
*.sage.py
85+
86+
# dotenv
87+
.env
88+
89+
# virtualenv
90+
.venv
91+
venv/
92+
ENV/
93+
94+
# Spyder project settings
95+
.spyderproject
96+
.spyproject
97+
98+
# Rope project settings
99+
.ropeproject
100+
101+
# mkdocs documentation
102+
/site
103+
104+
# mypy
105+
.mypy_cache/
106+
107+
# Bundler
108+
.bundle/
109+
Gemfile.lock
110+
111+
# copied `.md` files used for conversion to `.rst` using `m2r`
112+
docs/*.md
113+
114+
# Vim
115+
*.sw?
116+
117+
## Collected when centralising formulas (check and sort)
118+
# `collectd-formula`
119+
.pytest_cache/
120+
/.idea/
121+
Dockerfile.*_*
122+
ignore/
123+
tmp/

‎.rubocop.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
# General overrides used across formulas in the org
5+
Layout/LineLength:
6+
# Increase from default of `80`
7+
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
8+
Max: 88
9+
10+
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
11+
# <REMOVEME
12+
Metrics/BlockLength:
13+
Max: 36
14+
# REMOVEME>

‎.salt-lint‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
exclude_paths: []
5+
rules: {}
6+
skip_list:
7+
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
8+
- 205 # Use ".sls" as a Salt State file extension
9+
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
10+
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
11+
- 207 # File modes should always be encapsulated in quotation marks
12+
- 208 # File modes should always contain a leading zero
13+
tags: []
14+
verbosity: 1

‎.travis.yml‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
## Machine config
5+
os: 'linux'
6+
arch: 'amd64'
7+
dist: 'bionic'
8+
version: '~> 1.0'
9+
10+
## Language and cache config
11+
language: 'ruby'
12+
cache: 'bundler'
13+
14+
## Services config
15+
services:
16+
- docker
17+
18+
## Script to run for the test stage
19+
script:
20+
- bin/kitchen verify "${INSTANCE}"
21+
22+
## Stages and jobs matrix
23+
stages:
24+
- test
25+
- name: 'release'
26+
if: 'branch = master AND type != pull_request'
27+
jobs:
28+
include:
29+
## Define the test stage that runs the linters (and testing matrix, if applicable)
30+
31+
# Run all of the linters in a single job
32+
- language: 'node_js'
33+
node_js: 'lts/*'
34+
env: 'Lint'
35+
name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
36+
before_install: 'skip'
37+
script:
38+
# Install and run `salt-lint`
39+
- pip install --user salt-lint
40+
- git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
41+
| xargs salt-lint
42+
# Install and run `yamllint`
43+
# Need at least `v1.17.0` for the `yaml-files` setting
44+
- pip install --user yamllint>=1.17.0
45+
- yamllint -s .
46+
# Install and run `rubocop`
47+
- gem install rubocop
48+
- rubocop -d
49+
# Run `shellcheck` (already pre-installed in Travis)
50+
- shellcheck --version
51+
- git ls-files -- '*.sh' '*.bash' '*.ksh'
52+
| xargs shellcheck
53+
# Install and run `commitlint`
54+
- npm i -D @commitlint/config-conventional
55+
@commitlint/travis-cli
56+
- commitlint-travis
57+
58+
## Define the rest of the matrix based on Kitchen testing
59+
# Make sure the instances listed below match up with
60+
# the `platforms` defined in `kitchen.yml`
61+
# NOTE: Please try to select up to six instances that add some meaningful
62+
# testing of the formula's behaviour. If possible, try to refrain from
63+
# the classical "chosing all the instances because I want to test on
64+
# another/all distro/s" trap: it will just add time to the testing (see
65+
# the discussion on #121). As an example, the set chosen below covers
66+
# the most used distros families, systemd and non-systemd and the latest
67+
# three supported Saltstack versions with python2 and 3.
68+
# As for `kitchen.yml`, that should still contain all of the platforms,
69+
# to allow for comprehensive local testing
70+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
71+
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
72+
- env: INSTANCE=default-ubuntu-1804-master-py3
73+
- env: INSTANCE=source-ubuntu-1804-master-py3
74+
- env: INSTANCE=repo-ubuntu-1804-master-py3
75+
- env: INSTANCE=default-debian-10-master-py3
76+
- env: INSTANCE=default-centos-8-master-py3
77+
- env: INSTANCE=default-fedora-31-master-py3
78+
- env: INSTANCE=binary-opensuse-leap-151-master-py3
79+
- env: INSTANCE=binary-amazonlinux-2-master-py3
80+
- env: INSTANCE=binary-arch-base-latest-master-py2
81+
# - env: INSTANCE=default-debian-10-3000-1-py3
82+
# - env: INSTANCE=default-ubuntu-1804-3000-1-py3
83+
# - env: INSTANCE=default-centos-8-3000-1-py3
84+
# - env: INSTANCE=default-fedora-31-3000-1-py3
85+
# - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
86+
# - env: INSTANCE=default-amazonlinux-2-3000-1-py3
87+
# - env: INSTANCE=default-arch-base-latest-3000-1-py2
88+
# - env: INSTANCE=default-debian-10-2019-2-py3
89+
# - env: INSTANCE=default-debian-9-2019-2-py3
90+
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
91+
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
92+
# - env: INSTANCE=default-centos-8-2019-2-py3
93+
# - env: INSTANCE=default-centos-7-2019-2-py3
94+
# - env: INSTANCE=default-fedora-31-2019-2-py3
95+
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
96+
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
97+
# - env: INSTANCE=default-ubuntu-1804-2019-2-py2
98+
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
99+
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
100+
# - env: INSTANCE=default-centos-7-2018-3-py3
101+
# - env: INSTANCE=default-fedora-30-2018-3-py3
102+
# - env: INSTANCE=default-debian-9-2018-3-py2
103+
# - env: INSTANCE=default-debian-8-2018-3-py2
104+
# - env: INSTANCE=default-ubuntu-1804-2018-3-py2
105+
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
106+
# - env: INSTANCE=centos6-centos-6-2018-3-py2
107+
# - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
108+
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
109+
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
110+
# <REMOVEME
111+
112+
## Define the release stage that runs `semantic-release`
113+
- stage: 'release'
114+
language: 'node_js'
115+
node_js: 'lts/*'
116+
env: 'Release'
117+
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
118+
before_install: 'skip'
119+
script:
120+
# Update `AUTHORS.md`
121+
- export MAINTAINER_TOKEN=${GH_TOKEN}
122+
- go get github.com/myii/maintainer
123+
- maintainer contributor
124+
125+
# Install all dependencies required for `semantic-release`
126+
- npm i -D @semantic-release/changelog@3
127+
@semantic-release/exec@3
128+
@semantic-release/git@7
129+
deploy:
130+
provider: 'script'
131+
# Opt-in to `dpl v2` to complete the Travis build config validation (beta)
132+
# * https://docs.travis-ci.com/user/build-config-validation
133+
# Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
134+
edge: true
135+
# Run `semantic-release`
136+
script: 'npx [email protected]'

‎.yamllint‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
# Extend the `default` configuration provided by `yamllint`
5+
extends: default
6+
7+
# Files to ignore completely
8+
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
9+
# 2. Any SLS files under directory `test/`, which are actually state files
10+
# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
11+
ignore: |
12+
node_modules/
13+
test/**/states/**/*.sls
14+
.kitchen/
15+
node/osfamilymap.yaml
16+
17+
yaml-files:
18+
# Default settings
19+
- '*.yaml'
20+
- '*.yml'
21+
- .salt-lint
22+
- .yamllint
23+
# SaltStack Formulas additional settings
24+
- '*.example'
25+
- test/**/*.sls
26+
27+
rules:
28+
empty-values:
29+
forbid-in-block-mappings: true
30+
forbid-in-flow-mappings: true
31+
line-length:
32+
# Increase from default of `80`
33+
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
34+
max: 88
35+
octal-values:
36+
forbid-implicit-octal: true
37+
forbid-explicit-octal: true

‎AUTHORS.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Authors
2+
3+
This list is sorted by the number of commits per contributor in _descending_ order.
4+
5+
Avatar|Contributor|Contributions
6+
:-:|---|:-:
7+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|38
8+
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|10
9+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/18299?v=4' width='36' height='36' alt='@davidkarlsen'>|[@davidkarlsen](https://github.com/davidkarlsen)|8
10+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|6
11+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|6
12+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/478473?v=4' width='36' height='36' alt='@keesbos'>|[@keesbos](https://github.com/keesbos)|4
13+
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|3
14+
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|2
15+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|2
16+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1806188?v=4' width='36' height='36' alt='@tedski'>|[@tedski](https://github.com/tedski)|2
17+
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|1
18+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1654592?v=4' width='36' height='36' alt='@feiming'>|[@feiming](https://github.com/feiming)|1
19+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|1
20+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/191225?v=4' width='36' height='36' alt='@pruiz'>|[@pruiz](https://github.com/pruiz)|1
21+
22+
---
23+
24+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-03-28.

‎CHANGELOG.md‎

Whitespace-only changes.

‎FORMULA‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: node
2+
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS
3+
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris
4+
version: 0.4.0
5+
release: 1
6+
minimum_version: 2016.11
7+
summary: node formula
8+
description: Formula to install node/sar and configure it.
9+
top_level_dir: node

‎Gemfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# frozen_string_literal: true
2+
3+
source 'https://rubygems.org'
4+
5+
gem 'kitchen-docker', '>= 2.9'
6+
gem 'kitchen-inspec', '>= 1.1'
7+
gem 'kitchen-salt', '>= 0.6.0'
8+
# Latest versions of `train` cause failure when running `kitchen verify`
9+
# Downgrading to `3.2.0` until this is fixed upstream
10+
# https://github.com/inspec/train/pull/544#issuecomment-566055052
11+
gem 'train', '3.2.0'

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2015 Salt Stack Formulas
1+
Copyright (c) 2019 Salt Stack Formulas
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)