bitbake: bitbake-hashserv: Allow arguments from environment

Allows the arguments to the bitbake-hashserv command to be specified in
environment variables. This is a very common idiom when running services
in containers as it allows the arguments to be specified from different
sources as desired by the service administrator

(Bitbake rev: f65c87fab07a730f2f4588764cb64508c2149b40)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake/bin/bitbake-hashserv

@@ -11,56 +11,96 @@ import logging
 import argparse
 import sqlite3
 import warnings
+
 warnings.simplefilter("default")
 
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)), "lib"))
 
 import hashserv
 
 VERSION = "1.0.0"
 
-DEFAULT_BIND = 'unix://./hashserve.sock'
+DEFAULT_BIND = "unix://./hashserve.sock"
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Hash Equivalence Reference Server. Version=%s' % VERSION,
+    parser = argparse.ArgumentParser(
-                                     epilog='''The bind address is the path to a unix domain socket if it is
+        description="Hash Equivalence Reference Server. Version=%s" % VERSION,
-                                               prefixed with "unix://". Otherwise, it is an IP address
+        formatter_class=argparse.RawTextHelpFormatter,
-                                               and port in form ADDRESS:PORT. To bind to all addresses, leave
+        epilog="""
-                                               the ADDRESS empty, e.g. "--bind :8686". To bind to a specific
+The bind address may take one of the following formats:
-                                               IPv6 address, enclose the address in "[]", e.g.
+    unix://PATH         - Bind to unix domain socket at PATH
-                                               "--bind [::1]:8686"'''
+    ws://ADDRESS:PORT   - Bind to websocket on ADDRESS:PORT
-                                     )
+    ADDRESS:PORT        - Bind to raw TCP socket on ADDRESS:PORT
 
-    parser.add_argument('-b', '--bind', default=DEFAULT_BIND, help='Bind address (default "%(default)s")')
+To bind to all addresses, leave the ADDRESS empty, e.g. "--bind :8686" or
-    parser.add_argument('-d', '--database', default='./hashserv.db', help='Database file (default "%(default)s")')
+"--bind ws://:8686". To bind to a specific IPv6 address, enclose the address in
-    parser.add_argument('-l', '--log', default='WARNING', help='Set logging level')
+"[]", e.g. "--bind [::1]:8686" or "--bind ws://[::1]:8686"
-    parser.add_argument('-u', '--upstream', help='Upstream hashserv to pull hashes from')
+        """,
-    parser.add_argument('-r', '--read-only', action='store_true', help='Disallow write operations from clients')
+    )
+
+    parser.add_argument(
+        "-b",
+        "--bind",
+        default=os.environ.get("HASHSERVER_BIND", DEFAULT_BIND),
+        help='Bind address (default $HASHSERVER_BIND, "%(default)s")',
+    )
+    parser.add_argument(
+        "-d",
+        "--database",
+        default=os.environ.get("HASHSERVER_DB", "./hashserv.db"),
+        help='Database file (default $HASHSERVER_DB, "%(default)s")',
+    )
+    parser.add_argument(
+        "-l",
+        "--log",
+        default=os.environ.get("HASHSERVER_LOG_LEVEL", "WARNING"),
+        help='Set logging level (default $HASHSERVER_LOG_LEVEL, "%(default)s")',
+    )
+    parser.add_argument(
+        "-u",
+        "--upstream",
+        default=os.environ.get("HASHSERVER_UPSTREAM", None),
+        help="Upstream hashserv to pull hashes from ($HASHSERVER_UPSTREAM)",
+    )
+    parser.add_argument(
+        "-r",
+        "--read-only",
+        action="store_true",
+        help="Disallow write operations from clients ($HASHSERVER_READ_ONLY)",
+    )
 
     args = parser.parse_args()
 
-    logger = logging.getLogger('hashserv')
+    logger = logging.getLogger("hashserv")
 
     level = getattr(logging, args.log.upper(), None)
     if not isinstance(level, int):
-        raise ValueError('Invalid log level: %s' % args.log)
+        raise ValueError("Invalid log level: %s" % args.log)
 
     logger.setLevel(level)
     console = logging.StreamHandler()
     console.setLevel(level)
     logger.addHandler(console)
 
-    server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only)
+    read_only = (os.environ.get("HASHSERVER_READ_ONLY", "0") == "1") or args.read_only
+
+    server = hashserv.create_server(
+        args.bind,
+        args.database,
+        upstream=args.upstream,
+        read_only=read_only,
+    )
     server.serve_forever()
     return 0
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     try:
         ret = main()
     except Exception:
         ret = 1
         import traceback
+
         traceback.print_exc()
     sys.exit(ret)