ESC step 7: final cleanup/tweaks for hubblestack.adobe.net jenkins

Author: jettero

.pipeline

@@ -89,6 +89,16 @@ pipeline {
                     pip install --cache-dir .pip-cache -U pip
                     echo no | ./mk-requires.sh
                     pip install --cache-dir .pip-cache -U -r requirements.txt
+                    pip uninstall -y salt-ssh
+                    python -c "
+import sys
+try:
+    import salt
+    print('ERROR, SALT IS FOUND, ERROR')
+    sys.exit(1)
+except:
+    pass
+"
                     '''
             }
         }

hubblestack/daemon.py

@@ -625,15 +625,15 @@ def _setup_logging(parsed_args):
 
     # Setup logging
     hubblestack.log.setup_console_logger(**console_logging_opts)
-    hubblestack.log.setup_file_logger(**file_logging_opts)
+    if not parsed_args['skip_file_logger']:
+        hubblestack.log.setup_file_logger(**file_logging_opts)
+        with open(__opts__['log_file'], 'a') as _logfile:
+            pass  # ensure the file exists before we set perms on it
+        os.chmod(__opts__['log_file'], 0o600)
 
-    with open(__opts__['log_file'], 'a') as _logfile:
-        pass  # ensure the file exists before we set perms on it
-    # 384 is 0o600 permissions, written without octal for python 2/3 compat
-    os.chmod(__opts__['log_file'], 384)
     configfile = parsed_args.get('configfile')
     if configfile and os.path.isfile(configfile):
-        os.chmod(configfile, 384)
+        os.chmod(configfile, 0o600)
 
 
 def _setup_dirs():
@@ -824,6 +824,9 @@ def parse_args(args=None):
         help='Pass in an alternative configuration file. Default: /etc/hubble/hubble')
     parser.add_argument('-p', '--no-pprint', help='Turn off pprint for single-function output',
                         action='store_true')
+    parser.add_argument('--skip-file-logger',
+        help="Prevent logger from writing to /var/log/hubble.log",
+        action='store_true')
     parser.add_argument('-v', '--verbose', action='count',
                         help=('Verbosity level. Use -v or -vv or -vvv for '
                               'varying levels of verbosity. Note that -vv '

hubblestack/log/setup.py

@@ -155,8 +155,8 @@ def setup_file_logger(log_file,
     _remove_temp_handler()
     rootlogger = logging.getLogger()
 
-    handler = logging.handlers.RotatingFileHandler(log_file, maxBytes=max_bytes,
-                                                   backupCount=backup_count)
+    fh_cls = logging.handlers.RotatingFileHandler
+    handler = fh_cls(log_file, maxBytes=max_bytes, backupCount=backup_count)
     handler.setLevel(LOG_LEVELS.get(log_level, logging.ERROR))
 
     formatter = logging.Formatter(log_format, date_format)

tests/unittests/test_hs_config.py

@@ -114,6 +114,10 @@ def intentionally_removed_opts():
     "winrepo_user",
     }
 
+@pytest.fixture
+def added_opts():
+    return {'skip_file_logger',}
+
 @pytest.fixture
 def salt_config_opts(intentionally_removed_opts):
     """ computed-opts.json are the opts as generated by hubble's 4.1 branch
@@ -156,10 +160,13 @@ def modified_hs_config_opts(__opts__, salt_config_opts):
     return opts
 
 def test_new_hs_config_same_as_old_salt_config(modified_hs_config_opts,
-        salt_config_opts, intentionally_removed_opts, test_paths):
+        salt_config_opts, intentionally_removed_opts, test_paths, added_opts):
 
     all_keys = set(modified_hs_config_opts).union(set(salt_config_opts))
     for key in all_keys:
+        if key in added_opts:
+            continue
+
         assert key not in intentionally_removed_opts
         assert key in modified_hs_config_opts
         assert key in salt_config_opts
@@ -247,7 +254,7 @@ def test_winders_paths():
 
 @pytest.mark.skipif(sys.platform != 'linux', reason="")
 def test_linux_for_real_kindof():
-    opts = hubblestack.daemon.load_config(['-c', 'tests/unittests/resources/empty.config'])
+    opts = hubblestack.daemon.load_config([ '-c', 'tests/unittests/resources/empty.config', '--skip-file-logger' ])
 
     assert opts['cachedir'] == '/var/cache/hubble'
     assert opts['pidfile'] == '/var/run/hubble.pid'