Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHOENIX-7012 Expose keystore_type paramter in sqlline-thin.py #132

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bin/sqlline-thin.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ def kill_child():
# Avatica HTTPS truststore
parser.add_argument('-t', '--truststore', help='Truststore file that contains the TLS certificate of the server.')
parser.add_argument('-tp', '--truststore-password', help='Password for the server TLS certificate truststore')
# Keystore type
parser.add_argument('-st', '--keystore-type', help='Type of key- and truststore files (i.e. JKS).')

# Common arguments across sqlline.py and sqlline-thin.py
phoenix_queryserver_utils.common_sqlline_args(parser)
# Parse the args
Expand Down Expand Up @@ -201,7 +204,8 @@ def get_spnego_auth_disabled():
jdbc_url += ';truststore=' + tryDecode(args.truststore)
if args.truststore_password:
jdbc_url += ';truststore_password=' + tryDecode(args.truststore_password)

if args.keystore_type:
jdbc_url += ';keystore_type=' + tryDecode(args.keystore_type)

# Add SPENGO auth if this cluster uses it, and there are no conflicting HBase parameters
if (get_hbase_authentication() == 'kerberos' and get_spnego_auth_disabled() == 'false'
Expand Down
Loading