cloudmarker / cloudmarker

90%

master: 84%

LAST BUILD ON BRANCH userconfig

branch: userconfig

CHANGE BRANCH

x

Reset

• userconfig
• 0.1.0
• alertdocs
• apidocindent
• audit-version
• auditemails
• azcloud
• azstorage
• azurecloud
• azurecloud-exception
• azvm_record_type
• azwebapp
• badges
• baseconfig
• bracket
• buckets
• build-matrix
• changelog
• clioptions
• clouderror
• common-plugins-config
• consistency
• copy-ext
• copyext
• cov_clean
• dependabot/pip/cryptography-3.3.2
• dependabot/pip/httplib2-0.18.0
• dependabot/pip/httplib2-0.19.0
• dependabot/pip/pyyaml-5.4
• dependabot/pip/rsa-4.7
• dependabot/pip/urllib3-1.26.5
• dist
• docfixes
• doctest-fix
• email_debug_param_from_config
• emailbody
• emaildocs
• empty-port
• esstore
• firewalleventtest
• firewallnorm
• firewallruleevent
• fix-esstore-done
• fix-unused-input-queue
• fix_cloud_worker
• fixbuild
• fixcoverage
• fixindent
• freeze
• gcpcloudlogs
• gcpcloudtest
• iam_policy
• ignore-virtual-machines
• ioworkers
• key_file_name_fix
• lint
• load_yaml_safely
• log
• logfixes
• logger-defaults
• logging-levels
• master
• maxrecs
• mock-records
• mockplugins
• mongodbdefaults
• mongodbfix
• mongodbtests
• multiprocessing
• pluginframework
• pluginloader
• readable-version
• readme
• remove-email-config
• removefirewallevent
• rename_logger
• renameparams
• requirements
• rest
• reuse-mock
• rm-venv
• slackalert
• smtpssl
• sphinx
• sphinx-rst-update
• splunkfixes
• splunkhecstore_docs
• splunkhectokentest
• splunkstore
• sub_id_rename
• tests
• travis
• userdoc
• userecordterm
• verdev
• webapp
• worker-com-fields
• worker-error-handling
• workerlogs

Build # 559

Build Type

Pull #90

travis-ci-com

Committed by web-flow

Commit Message

Search for user configuration in popular locations

Since Cloudmarker is supposed to serve as a CLI tool that one can run
with `cloudmarker -n` as well as a service that one may run as
`cloudmarker`, it is convenient if Cloudmarker searches certain popular
paths where configuration files usually reside. This would prevent the
users or service unit definition from having to specify configuration
files as arguments to the `-c` or `--config` option.

With this change, it now looks for a configuration file at the following
locations in the order specified:

  - /etc/cloudmarker.yaml
  - ~/.cloudmarker.yaml
  - ~/cloudmarker.yaml
  - cloudmarker.yaml (i.e., in the current working directory)

The base configuration file (which was named `config.base.yaml`) earlier
has been removed from the file system. There is no counterpart for it
now on the file system. Instead the base configuration is now built into
the code in a new module named `baseconfig`. This has been done for the
following reasons:

  - Provide reasonable defaults as built-in. This is consistent with how
    other tools work, e.g., Vim, Bash, etc. ship with defaults and we
    write `~/.vimrc`, `~/.bashrc`, etc. only when we want to override
    these defaults.

  - The users were never supposed to edit `config.base.yaml` anyway. By
    removing it from the file system, the users do not have to worry
    about notions like base configuration and user configuration. They
    do not have to be careful about not editing the base configuration.
    The users can still refer to the base configuration if they wish to
    by entering `cloudmarker --print-base-config`.

Since multiple configuration paths are involved, the logging has been
improved to show what configuration paths are being looked for and which
configuration paths are being found.

Pull Request Pull Request #90: Search for user configuration in popular locations

Run Details

308 of 338 branches covered (91.12%)

Branch coverage included in aggregate %.

54 of 54 new or added lines in 6 files covered. (100.0%)

1387 of 1550 relevant lines covered (89.48%)

2.68 hits per line