Skip to content

Commit b019b47

Browse files
noelmcloughlinnoelmcloughlin
committed
feat(formula): align to template formula; add ci tests
BREAKING CHANGE: Major refactor of formula to bring it in alignment with the template-formula. As with all substantial changes, please ensure your existing configurations work in the ways you expect from this formula.
1 parent da0542c commit b019b47

Some content is hidden

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

54 files changed

+2718
-355
lines changed

‎.github/workflows/commitlint.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
3+
---
4+
name: Commitlint
5+
'on': [pull_request]
6+
7+
jobs:
8+
lint:
9+
runs-on: ubuntu-latest
10+
env:
11+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
16+
- uses: wagoid/commitlint-github-action@v1

‎.gitignore

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
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+
110+
# copied `.md` files used for conversion to `.rst` using `m2r`
111+
docs/*.md
112+
113+
# Vim
114+
*.sw?
115+
116+
## Collected when centralising formulas (check and sort)
117+
# `collectd-formula`
118+
.pytest_cache/
119+
/.idea/
120+
Dockerfile.*_*
121+
ignore/
122+
tmp/

‎.rubocop.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
Metrics/BlockLength:
10+
ExcludedMethods:
11+
- control
12+
- describe
13+
# Increase from default of `25`
14+
Max: 30
15+
16+
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

‎.salt-lint

+14
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

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
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+
- env: INSTANCE=default-debian-10-master-py3
62+
# - env: INSTANCE=default-ubuntu-1804-master-py3
63+
- env: INSTANCE=default-centos-8-master-py3
64+
- env: INSTANCE=default-fedora-31-master-py3
65+
- env: INSTANCE=default-opensuse-leap-151-master-py3
66+
# - env: INSTANCE=default-amazonlinux-2-master-py3
67+
# - env: INSTANCE=default-debian-10-3000-2-py3
68+
# - env: INSTANCE=default-debian-9-3000-2-py3
69+
# - env: INSTANCE=default-ubuntu-1804-3000-2-py3
70+
# - env: INSTANCE=default-centos-8-3000-2-py3
71+
# - env: INSTANCE=default-centos-7-3000-2-py3
72+
# - env: INSTANCE=default-fedora-31-3000-2-py3
73+
# - env: INSTANCE=default-opensuse-leap-151-3000-2-py3
74+
# - env: INSTANCE=default-amazonlinux-2-3000-2-py3
75+
# - env: INSTANCE=default-ubuntu-1804-3000-2-py2
76+
# - env: INSTANCE=default-ubuntu-1604-3000-2-py2
77+
# - env: INSTANCE=arch-arch-base-latest-3000-2-py2
78+
# - env: INSTANCE=default-debian-10-2019-2-py3
79+
# - env: INSTANCE=default-debian-9-2019-2-py3
80+
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
81+
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
82+
# - env: INSTANCE=default-centos-8-2019-2-py3
83+
# - env: INSTANCE=default-centos-7-2019-2-py3
84+
# - env: INSTANCE=default-fedora-31-2019-2-py3
85+
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
86+
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
87+
# - env: INSTANCE=default-centos-6-2019-2-py2
88+
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
89+
- env: INSTANCE=arch-arch-base-latest-2019-2-py2
90+
91+
## Define the release stage that runs `semantic-release`
92+
- stage: 'release'
93+
language: 'node_js'
94+
node_js: 'lts/*'
95+
env: 'Release'
96+
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
97+
before_install: 'skip'
98+
script:
99+
# Update `AUTHORS.md`
100+
- export MAINTAINER_TOKEN=${GH_TOKEN}
101+
- go get github.com/myii/maintainer
102+
- maintainer contributor
103+
104+
# Install all dependencies required for `semantic-release`
105+
- npm i -D @semantic-release/changelog@3
106+
@semantic-release/exec@3
107+
@semantic-release/git@7
108+
deploy:
109+
provider: 'script'
110+
# Opt-in to `dpl v2` to complete the Travis build config validation (beta)
111+
# * https://docs.travis-ci.com/user/build-config-validation
112+
# Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
113+
edge: true
114+
# Run `semantic-release`
115+
script: 'npx [email protected]'

‎.yamllint

+37
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+
sqlplus/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

Whitespace-only changes.

‎CHANGELOG.md

Whitespace-only changes.

‎CODEOWNERS

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
2+
3+
# SECTION: Owner(s) for everything in the repo, unless a later match takes precedence
4+
# FILE PATTERN OWNER(S)
5+
* @noelmcloughlin
6+
7+
# SECTION: Owner(s) for specific directories
8+
# FILE PATTERN OWNER(S)
9+
10+
# SECTION: Owner(s) for files/directories related to `semantic-release`
11+
# FILE PATTERN OWNER(S)
12+
/.github/workflows/ @saltstack-formulas/ssf
13+
/bin/kitchen @saltstack-formulas/ssf
14+
/docs/AUTHORS.rst @saltstack-formulas/ssf
15+
/docs/CHANGELOG.rst @saltstack-formulas/ssf
16+
/docs/TOFS_pattern.rst @saltstack-formulas/ssf
17+
/sqlplus/libsaltcli.jinja @saltstack-formulas/ssf
18+
/sqlplus/libtofs.jinja @saltstack-formulas/ssf
19+
/test/integration/**/inspec.yml @saltstack-formulas/ssf
20+
/test/integration/**/README.md @saltstack-formulas/ssf
21+
/.gitignore @saltstack-formulas/ssf
22+
/.cirrus.yml @saltstack-formulas/ssf
23+
/.rubocop.yml @saltstack-formulas/ssf
24+
/.salt-lint @saltstack-formulas/ssf
25+
/.travis.yml @saltstack-formulas/ssf
26+
/.yamllint @saltstack-formulas/ssf
27+
/AUTHORS.md @saltstack-formulas/ssf
28+
/CHANGELOG.md @saltstack-formulas/ssf
29+
/CODEOWNERS @saltstack-formulas/ssf
30+
/commitlint.config.js @saltstack-formulas/ssf
31+
/FORMULA @saltstack-formulas/ssf
32+
/Gemfile @saltstack-formulas/ssf
33+
/Gemfile.lock @saltstack-formulas/ssf
34+
/kitchen.yml @saltstack-formulas/ssf
35+
/pre-commit_semantic-release.sh @saltstack-formulas/ssf
36+
/release-rules.js @saltstack-formulas/ssf
37+
/release.config.js @saltstack-formulas/ssf
38+
39+
# SECTION: Owner(s) for specific files
40+
# FILE PATTERN OWNER(S)

‎FORMULA

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: sqlplus
2-
os: MacOS, Windows, Linux
3-
os_family: RedHat, Debian, Suse, FreeBSD, MacOS, Windows
4-
version: 201710
5-
release: 1.1
6-
minimum_version: 2016.3
7-
summary: Formula for installing sqlplus
8-
description: Formula for installing SQLPLUS for Oracle Database
2+
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
3+
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4+
version: 0.2.2
5+
release: 1
6+
minimum_version: 2019.2
7+
summary: sqlplus formula
8+
description: Formula to install sqlplus and configure it
9+
top_level_dir: sqlplus

‎Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
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'

0 commit comments

Comments
 (0)