Skip to content

Commit

Permalink
Merge pull request #6 from infralovers/final-updates
Browse files Browse the repository at this point in the history 
fix: pylint review, nomad jobfile update
  • Loading branch information
@mabunixda
mabunixda authored Oct 25, 2024
2 parents 14c7dd0 + b435ed2 commit 8b26f0e
Show file tree
Hide file tree
Showing 6 changed files with 185 additions and 166 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
__pycache__/
.DS_Store
.terraform/
terraform.tfstate*
264 changes: 150 additions & 114 deletions app.py
View file
Original file line number Diff line number Diff line change
@@ -1,170 +1,206 @@
from flask import Flask, request, render_template, abort

from datetime import datetime
from os import getenv
import configparser
import json
import logging
import logging.config

from flask import Flask, request, render_template, abort
import configparser

from db_client import DbClient as TransitClient
from db_client_transform import DbClient as TransformClient

dbc: TransitClient = None
vclient = None

log_level = {
'CRITICAL' : 50,
'ERROR' : 40,
'WARN' : 30,
'INFO' : 20,
'DEBUG' : 10
}
log_level = {"CRITICAL": 50, "ERROR": 40, "WARN": 30, "INFO": 20, "DEBUG": 10}

logger = logging.getLogger('app')
logger = logging.getLogger("app")

app = Flask(__name__)
app.config['TEMPLATES_AUTO_RELOAD'] = True
app.config["TEMPLATES_AUTO_RELOAD"] = True


def read_config() -> configparser.ConfigParser:
conf = configparser.ConfigParser()
with open("config/config.ini") as f:
conf.read_file(f)
return conf

def read_config():
conf = configparser.ConfigParser()
with open('config/config.ini') as f:
conf.read_file(f)
return conf

def read_vault_token():
token = getenv('VAULT_TOKEN')
return token.strip()
token = getenv("VAULT_TOKEN")
return token.strip()

@app.route("/health", methods=['GET'])

@app.route("/health", methods=["GET"])
def health():
global dbc
if not dbc.is_initialized:
return "Unhealthy - no database", 500
return "Unhealthy - no database", 500

return "Healthy", 200

@app.route('/customers', methods=['GET'])

@app.route("/customers", methods=["GET"])
def get_customers():
global dbc
customers = dbc.get_customer_records()
logger.debug('Customers: {}'.format(customers))
logger.debug("Customers: {}".format(customers))
return json.dumps(customers)

@app.route('/customer', methods=['GET'])

@app.route("/customer", methods=["GET"])
def get_customer():
global dbc
cust_no = request.args.get('cust_no')
cust_no = request.args.get("cust_no")
if not cust_no:
return '<html><body>Error: cust_no is a required argument for the customer endpoint.</body></html>', 500
return (
"<html><body>Error: cust_no is a required argument for the customer endpoint.</body></html>",
500,
)
record = dbc.get_customer_record(cust_no)
#logger.debug('Request: {}'.format(request))
# logger.debug('Request: {}'.format(request))
return json.dumps(record)

@app.route('/customers', methods=['POST'])

@app.route("/customers", methods=["POST"])
def create_customer():
global dbc
logging.debug("Form Data: {}".format(dict(request.form)))
customer = {k:v for (k,v) in dict(request.form).items()}
for k,v in customer.items():
if type(v) is list:
customer[k] = v[0]
logging.debug('Customer: {}'.format(customer))
if 'create_date' not in customer.keys():
customer['create_date'] = datetime.now().isoformat()
customer = {k: v for (k, v) in dict(request.form).items()}
for k, v in customer.items():
if type(v) is list:
customer[k] = v[0]
logging.debug("Customer: {}".format(customer))
if "create_date" not in customer.keys():
customer["create_date"] = datetime.now().isoformat()
new_record = dbc.insert_customer_record(customer)
logging.debug('New Record: {}'.format(new_record))
logging.debug("New Record: {}".format(new_record))
return json.dumps(new_record)

@app.route('/customers', methods=['PUT'])

@app.route("/customers", methods=["PUT"])
def update_customer():
global dbc
logging.debug('Form Data: {}'.format(dict(request.form)))
customer = {k:v for (k,v) in dict(request.form).items()}
logging.debug('Customer: {}'.format(customer))
logging.debug("Form Data: {}".format(dict(request.form)))
customer = {k: v for (k, v) in dict(request.form).items()}
logging.debug("Customer: {}".format(customer))
new_record = dbc.update_customer_record(customer)
logging.debug('New Record: {}'.format(new_record))
logging.debug("New Record: {}".format(new_record))
return json.dumps(new_record)

@app.route('/', methods=['GET'])

@app.route("/", methods=["GET"])
def index():
return render_template('index.html')
return render_template("index.html")


@app.route('/records', methods=['GET'])
@app.route("/records", methods=["GET"])
def records():
records = json.loads(get_customers())
return render_template('records.html', results = records)
return render_template("records.html", results=records)

@app.route('/dbview', methods=['GET'])

@app.route("/dbview", methods=["GET"])
def dbview():
global dbc
records = dbc.get_customer_records(raw = True)
return render_template('dbview.html', results = records)
records = dbc.get_customer_records(raw=True)
return render_template("dbview.html", results=records)

@app.route('/add', methods=['GET'])

@app.route("/add", methods=["GET"])
def add():
return render_template('add.html')
return render_template("add.html")


@app.route('/add', methods=['POST'])
@app.route("/add", methods=["POST"])
def add_submit():
records = create_customer()
return render_template('records.html', results = json.loads(records), record_added = True)
return render_template(
"records.html", results=json.loads(records), record_added=True
)

@app.route('/update', methods=['GET'])

@app.route("/update", methods=["GET"])
def update():
return render_template('update.html')
return render_template("update.html")


@app.route('/update', methods=['POST'])
@app.route("/update", methods=["POST"])
def update_submit():
records = update_customer()
return render_template('records.html', results = json.loads(records), record_updated = True)

def init_vault():
global dbc
dbc = TransitClient()
if conf.has_section('VAULT') or conf['VAULT']['Enabled'].lower() == 'true':
return

logger.info('Vault is enabled...')
vault_token = ""
if conf['VAULT']['InjectToken'].lower() == 'true':
logger.info('Using Injected vault token')
vault_token = read_vault_token()
else:
vault_token = conf['VAULT']['Token']

if not conf['VAULT'].has_section('Transform') or conf['VAULT']['Transform'].lower() == 'false':
dbc.init_vault(addr=conf['VAULT']['Address'], token=vault_token, namespace=conf['VAULT']['Namespace'], path=conf['VAULT']['KeyPath'], key_name=conf['VAULT']['KeyName'])
else:
logger.info('Using Transform database client...')
dbc = TransformClient()
dbc.init_vault(addr=conf['VAULT']['Address'], token=vault_token, namespace=conf['VAULT']['Namespace'], path=conf['VAULT']['KeyPath'], key_name=conf['VAULT']['KeyName'],transform_path=conf['VAULT']['TransformPath'], ssn_role=conf['VAULT']['SSNRole'], transform_masking_path=conf['VAULT']['TransformMaskingPath'], ccn_role=conf['VAULT']['CCNRole'])

if conf["VAULT"].hasattr("database_auth") and conf["VAULT"]["database_auth"] != "":
dbc.vault_db_auth(conf["VAULT"]["database_auth"])

if __name__ == '__main__':
logger.warning('In Main...')
conf = read_config()
logging.basicConfig(
level=log_level[conf['DEFAULT']['LogLevel']],
format='%(asctime)s - %(levelname)8s - %(name)9s - %(funcName)15s - %(message)s'
)

try:
init_vault()
if not dbc.is_initialized:
logger.info('Using DB credentials from config.ini...')
dbc.init_db(
uri=conf['DATABASE']['Address'],
prt=conf['DATABASE']['Port'],
uname=conf['DATABASE']['User'],
pw=conf['DATABASE']['Password'],
db=conf['DATABASE']['Database']
)
appPort = conf["DEFAULT"]["port"]
logger.info('Starting Flask server on {} listening on port {}'.format('0.0.0.0', appPort))
app.run(host='0.0.0.0', port=appPort)

except Exception as e:
logging.error("There was an error starting the server: {}".format(e))
return render_template(
"records.html", results=json.loads(records), record_updated=True
)


def init_vault(conf):
global dbc

if not conf.has_section("VAULT") or conf["VAULT"]["Enabled"].lower() == "false":
return

dbc = TransitClient()
if (
conf.has_option("VAULT","Transform")
and conf["VAULT"]["Transform"].lower() == "true"
):
dbc = TransformClient()

vault_token = ""
if conf["VAULT"]["InjectToken"].lower() == "true":
logger.info("Using Injected vault token")
vault_token = read_vault_token()
else:
vault_token = conf["VAULT"]["Token"]

dbc.init_vault(
addr=conf["VAULT"]["Address"],
token=vault_token,
namespace=conf["VAULT"]["Namespace"],
path=conf["VAULT"]["KeyPath"],
key_name=conf["VAULT"]["KeyName"],
)

if (
conf.has_option("VAULT","Transform")
and conf["VAULT"]["Transform"].lower() == "true"
):
logger.info("Using Transform database client...")
dbc.init_transform(
transform_path=conf["VAULT"]["TransformPath"],
ssn_role=conf["VAULT"]["SSNRole"],
transform_masking_path=conf["VAULT"]["TransformMaskingPath"],
ccn_role=conf["VAULT"]["CCNRole"],
)


if conf.has_option("VAULT", "database_auth") and conf["VAULT"]["database_auth"] != "":
dbc.vault_db_auth(conf["VAULT"]["database_auth"])


if __name__ == "__main__":
logger.warning("In Main...")
conf = read_config()


logging.basicConfig(
level=log_level[conf["DEFAULT"]["LogLevel"]],
format="%(asctime)s - %(levelname)8s - %(name)9s - %(funcName)15s - %(message)s",
)

try:
init_vault(conf)
if not dbc.is_initialized:
logger.info("Using DB credentials from config.ini...")
dbc.init_db(
uri=conf["DATABASE"]["Address"],
prt=conf["DATABASE"]["Port"],
uname=conf["DATABASE"]["User"],
pw=conf["DATABASE"]["Password"],
db=conf["DATABASE"]["Database"],
)
appPort = conf["DEFAULT"]["port"]
logger.info(
"Starting Flask server on {} listening on port {}".format(
"0.0.0.0", appPort
)
)
app.run(host="0.0.0.0", port=appPort)

except Exception as e:
logging.error("There was an error starting the server: {}".format(e))
Loading

0 comments on commit 8b26f0e

Please sign in to comment.