Merge pull request #11 from Rathan8/master

PlainTextAuth with username and password

Author: michaelraney

cqlsh-expansion/bin/cqlsh-expansion.py

@@ -480,14 +480,18 @@ def __init__(self, hostname, port, color=False,
           if options.auth_provider_name == 'SigV4AuthProvider':
             my_session = boto3.session.Session()
             self.auth_provider = SigV4AuthProvider(my_session)
-          elif auth_provider_name == DEFAULT_AUTH_PROVIDER:
+          elif options.auth_provider_name == DEFAULT_AUTH_PROVIDER:
             if username:
-               if not password:
-                   password = getpass.getpass()
-               self.auth_provider = PlainTextAuthProvider(username=username, password=password)
-            else:
+              if not password:
+                password = getpass.getpass()
+              self.auth_provider = PlainTextAuthProvider(username=username, password=password)
+          else:
               raise SyntaxError('cqlsh-expansion.py Invalid parameter for auth-provider. "%s" is not a valid AuthProvider' % (auth_provider,))
-
+        else:
+          if username:
+            if not password:
+               password = getpass.getpass()
+            self.auth_provider = PlainTextAuthProvider(username=username, password=password)
 
         self.username = username
         self.keyspace = keyspace
@@ -2485,4 +2489,4 @@ def main(options, hostname, port):
 if __name__ == '__main__':
     main(*read_options(sys.argv[1:], os.environ))
 
-# vim: set ft=python et ts=4 sw=4 :
+# vim: set ft=python et ts=4 sw=4 :