Merge pull request #2 from myii/chore/standardise-structure

chore: standardise `semantic-release` implementation

Author: javierbertoli

.gitlab-ci.yml

@@ -15,7 +15,6 @@
   # `image`
   image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
   image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
-  image_dindrubybionic: &image_dindrubybionic 'myii/ssf-dind-ruby-bionic:2.7.5-1bbox1'
   image_precommit: &image_precommit
     name: 'myii/ssf-pre-commit:2.9.2'
     entrypoint: ['/bin/bash', '-c']

.pre-commit-config.yaml

@@ -61,7 +61,5 @@ repos:
             (?x)^(
                 docs/CHANGELOG.rst|
                 docs/TOFS_pattern.rst|
-                docs/CONTRIBUTING_DOCS.rst|
-                docs/index.rst|
             )$
         additional_dependencies: [pygments==2.9.0]

.travis.yml

@@ -83,17 +83,6 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    # NOTE: Please try to select up to six instances that add some meaningful
-    #       testing of the formula's behaviour. If possible, try to refrain from
-    #       the classical "chosing all the instances because I want to test on
-    #       another/all distro/s" trap: it will just add time to the testing (see
-    #       the discussion on #121).  As an example, the set chosen below covers
-    #       the most used distros families, systemd and non-systemd and the latest
-    #       three supported Saltstack versions with python2 and 3.
-    #       As for `kitchen.yml`, that should still contain all of the platforms,
-    #       to allow for comprehensive local testing
-    #       Ref: https://github.com/saltstack-formulas/template-formula/issues/118
-    #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
     # - env: INSTANCE=default-debian-11-tiamat-py3
     # - env: INSTANCE=default-debian-10-tiamat-py3
     # - env: INSTANCE=default-debian-9-tiamat-py3
@@ -193,3 +182,15 @@ jobs:
         edge: true
         # Run `semantic-release`
         script: 'npx semantic-release@15.14'
+
+# Notification options: `always`, `never` or `change`
+notifications:
+  webhooks:
+    if: 'repo = saltstack-formulas/caddy-formula'
+    urls:
+      - https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fcaddy-formula&ignore_pull_requests=true
+    on_success: always  # default: always
+    on_failure: always  # default: always
+    on_start: always    # default: never
+    on_cancel: always   # default: always
+    on_error: always    # default: always

CODEOWNERS

@@ -2,7 +2,7 @@
 
 # SECTION: Owner(s) for everything in the repo, unless a later match takes precedence
 # FILE PATTERN                              OWNER(S)
-*                                           @NONE
+*                                           @javierbertoli
 
 # SECTION: Owner(s) for specific directories
 # FILE PATTERN                              OWNER(S)

Gemfile.lock

@@ -1,20 +1,20 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255
+  revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057
   branch: ssf
   specs:
-    inspec (5.15.0)
+    inspec (5.16.2)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.15.0)
+      inspec-core (= 5.16.2)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
       train (~> 3.0)
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.15.0)
+    inspec-core (5.16.2)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -89,7 +89,7 @@ GEM
     aws-sdk-cloudformation (1.68.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.64.0)
+    aws-sdk-cloudfront (1.65.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudhsm (1.39.0)
@@ -128,7 +128,7 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.2)
+    aws-sdk-core (3.131.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.312.0)
+    aws-sdk-ec2 (1.315.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -157,7 +157,7 @@ GEM
     aws-sdk-efs (1.54.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.74.0)
+    aws-sdk-eks (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticache (1.77.0)
@@ -202,7 +202,7 @@ GEM
     aws-sdk-kms (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.83.0)
+    aws-sdk-lambda (1.84.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-mq (1.40.0)
@@ -379,7 +379,7 @@ GEM
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.2)
     jwt (2.3.0)
     kitchen-inspec (2.5.2)
       hashie (>= 3.4, <= 5.0)
@@ -448,7 +448,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.4.0)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -479,7 +479,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)

test/integration/default/inspec.yml

@@ -5,11 +5,24 @@ name: default
 title: caddy formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
-# yamllint disable-line rule:line-length
 summary: Verify that the caddy formula is setup and configured correctly
 depends:
   - name: share
     path: test/integration/share
 supports:
   - platform-name: debian
   - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: openbsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
+  - platform-name: mac_os_x
+  - platform: windows

test/integration/share/inspec.yml

@@ -21,4 +21,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

test/integration/share/libraries/system.rb

@@ -57,6 +57,8 @@ def build_platform_release
       'base-latest'
     when 'gentoo'
       "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
+    when 'mac_os_x'
+      inspec.command('sw_vers -productVersion').stdout.to_s
     when 'opensuse'
       # rubocop:disable Style/NumericLiterals,Layout/LineLength
       inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]

test/salt/pillar/top.sls

@@ -4,3 +4,4 @@
 base:
   '*':
     - default
+...