Fix formula to work with latest version of influxdb and bring in line with saltstack-formula standards

.gitlab-ci.yml

@@ -146,24 +146,24 @@ rubocop:
 # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
 default-debian-11-master-py3: {extends: '.test_instance'}
 default-debian-10-master-py3: {extends: '.test_instance'}
-default-debian-9-master-py3: {extends: '.test_instance'}
+# default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-default-centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-35-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-default-oraclelinux-8-master-py3: {extends: '.test_instance'}
-default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-36-master-py3: {extends: '.test_instance'}
+# default-fedora-35-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
+# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-arch-base-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-default-almalinux-8-master-py3: {extends: '.test_instance'}
-default-rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-almalinux-8-master-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-debian-11-3004-1-py3: {extends: '.test_instance'}
 # default-debian-10-3004-1-py3: {extends: '.test_instance'}
 # default-debian-9-3004-1-py3: {extends: '.test_instance'}

.travis.yml

@@ -83,6 +83,17 @@ 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
@@ -111,9 +122,9 @@ jobs:
     - env: INSTANCE=default-amazonlinux-2-master-py3
     - env: INSTANCE=default-oraclelinux-8-master-py3
     - env: INSTANCE=default-oraclelinux-7-master-py3
-    # - env: INSTANCE=default-arch-base-latest-master-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    - env: INSTANCE=default-arch-base-latest-master-py3
+    - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     - env: INSTANCE=default-almalinux-8-master-py3
     - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=default-debian-11-3004-1-py3
@@ -172,15 +183,3 @@ jobs:
         edge: true
         # Run `semantic-release`
         script: 'npx [email protected]'
-
-# Notification options: `always`, `never` or `change`
-notifications:
-  webhooks:
-    if: 'repo = saltstack-formulas/influxdb-formula'
-    urls:
-      - https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Finfluxdb-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

_modules/toml_lang.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import toml
+try:
+  import pytoml as toml
+except:
+  import toml
 
 def dumps(data):
-    return toml.dumps(data)
+  return toml.dumps(data)

docs/README.rst

@@ -47,29 +47,47 @@ Available states
 
 ``influxdb``
 ^^^^^^^^^^^^
-Installs InfluxDB from [provided packages](http://influxdb.com/download/).
+Installs and configures the influxdb package from upstream repository.
 
-At the moment you **have** to specify the InfluxDB version in the
-``influxdb:version`` pillar.
+``influxdb.dependencies``
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Installs any dependencies that may be needed to support the install of influxdb.
 
-``influxdb.cli``
-^^^^^^^^^^^^^^^^
-Installs the [influxdb-cli](https://github.com/phstc/influxdb-cli) gem system wide.
+``influxdb.repo``
+^^^^^^^^^^^^^^^^^
+Installs the influxdb repository. See `InfluxDB doc <https://portal.influxdata.com/downloads/>`_ for more details.
+
+``influxdb.package``
+^^^^^^^^^^^^^^^^^^^^
+Installs the influxdb package.
 
 ``influxdb.config``
 ^^^^^^^^^^^^^^^^^^^
-Renders the InfluxDB configuration from data provided in the ``influxdb:conf``
-pillar.
-
-It requires the installation of the
-[toml Python module](https://github.com/hit9/toml.py) via pip.
-
-The formula ships with default configuration settings for various minor versions
-of InfluxDB. That means that, if you define configuration settings in your
-``influxdb.conf`` pillar, your settings will be merged with the default ones of
-that minor version. You can set ``influxdb:no_conf_defaults`` in your pillar if
-you want to completely specify the configuration yourself, without falling back
-to defaults.
+This state manages the file ``influxdb.conf`` under ``/etc/influxdb`` (template found in "influxdb/files"). The configuration is populated by values in "influxdb/map.jinja" based on the package's default values (and RedHat, Debian, Suse and Arch family distribution specific values), which can then be overridden by values of the same name in pillar.
+
+``influxdb.service``
+^^^^^^^^^^^^^^^^^^^^
+Manages the startup and running state of the influxdb service.
+
+``influxdb.clean``
+^^^^^^^^^^^^^^^^^^
+uninstalls and removes configs for the influxdb package from upstream repository.
+
+``influxdb.repo.clean``
+^^^^^^^^^^^^^^^^^^^^^^^
+Uninstalls the influxdb repository.
+
+``influxdb.package.clean``
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Uninstalls the influxdb package.
+
+``influxdb.config.clean``
+^^^^^^^^^^^^^^^^^^^^^^^^^
+remoe the influxdb config files
+
+``influxdb.service.clean``
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+disables and stops the influxdb service
 
 Testing
 -------