scylla-cqlsh 6.0.16__pp310-pypy310_pp73-win_amd64.whl → 6.0.19__pp310-pypy310_pp73-win_amd64.whl

cqlsh/cqlsh.py

@@ -48,11 +48,6 @@ UTF8 = 'utf-8'
 
 description = "CQL Shell for Apache Cassandra"
 
-try:
-    from cqlshlib._version import __version__ as version
-except ImportError:
-    version = "6.2.0"
-
 readline = None
 try:
     # check if tty first, cause readline doesn't check, and only cares
@@ -161,6 +156,10 @@ from cqlshlib.tracing import print_trace, print_trace_session
 from cqlshlib.util import get_file_encoding_bomsize
 from cqlshlib.util import is_file_secure, trim_if_present
 
+try:
+    from cqlshlib._version import __version__ as version
+except ImportError:
+    version = "0.0.0"
 
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042
@@ -494,6 +493,8 @@ class Shell(cmd.Cmd):
                     profiles[EXEC_PROFILE_DEFAULT].load_balancing_policy = WhiteListRoundRobinPolicy([self.hostname])
                 kwargs['port'] = self.port
                 kwargs['ssl_context'] = sslhandling.ssl_settings(hostname, CONFIG_FILE) if ssl else None
+                # workaround until driver would know not to lose the DNS names for `server_hostname`
+                kwargs['ssl_options'] = {'server_hostname': self.hostname} if ssl else None
             else:
                 assert 'scylla' in DRIVER_NAME.lower(), f"{DRIVER_NAME} {DRIVER_VERSION} isn't supported by scylla_cloud"
                 kwargs['scylla_cloud'] = cloudconf
@@ -1588,7 +1589,10 @@ class Shell(cmd.Cmd):
           where object can be either a keyspace or a table or an index or a materialized
           view (in this order).
         """
-        if self.connection_versions['build'][0] < '4':
+        self._do_describe(parsed, force_client_side_describe=False)
+
+    def _do_describe(self, parsed, force_client_side_describe):
+        if force_client_side_describe:
             what = parsed.matched[1][1].lower()
             if what == 'functions':
                 self.describe_functions_client(self.current_keyspace)
@@ -1664,6 +1668,10 @@ class Shell(cmd.Cmd):
                 elif what:
                     self.describe_element(result)
 
+            except cassandra.protocol.SyntaxException:
+                # Server doesn't support DESCRIBE query, retry with 
+                # client-side DESCRIBE implementation
+                self._do_describe(parsed, force_client_side_describe=True)
             except CQL_ERRORS as err:
                 err_msg = err.message if hasattr(err, 'message') else str(err)
                 self.printerr(err_msg.partition("message=")[2].strip('"'))
@@ -2131,6 +2139,7 @@ class Shell(cmd.Cmd):
             kwargs['contact_points'] = (self.hostname,)
             kwargs['port'] = self.port
             kwargs['ssl_context'] = self.conn.ssl_context
+            kwargs['ssl_options'] = self.conn.ssl_options
             if os.path.exists(self.hostname) and stat.S_ISSOCK(os.stat(self.hostname).st_mode):
                 kwargs['load_balancing_policy'] = WhiteListRoundRobinPolicy([UnixSocketEndPoint(self.hostname)])
             else: 
@@ -2421,7 +2430,8 @@ def read_options(cmdlineargs, environment):
             print("\nWarning: Password is found in an insecure cqlshrc file. The file is owned or readable by other users on the system.",
                   end='', file=sys.stderr)
         print("\nNotice: Credentials in the cqlshrc file is deprecated and will be ignored in the future."
-              "\nPlease use a credentials file to specify the username and password.\n", file=sys.stderr)
+              "\nPlease use a credentials file to specify the username and password.\n"
+              "\nTo use basic authentication, place the username and password in the [PlainTextAuthProvider] section of the credentials file.\n", file=sys.stderr)
 
     optvalues = optparse.Values()
 
@@ -2493,7 +2503,7 @@ def read_options(cmdlineargs, environment):
         credentials.read(options.credentials)
 
         # use the username from credentials file but fallback to cqlshrc if username is absent from the command line parameters
-        options.username = username_from_cqlshrc
+        options.username = option_with_default(credentials.get, 'plain_text_auth', 'username', username_from_cqlshrc)
 
     if not options.password:
         rawcredentials = configparser.RawConfigParser()
@@ -2501,7 +2511,6 @@ def read_options(cmdlineargs, environment):
 
         # handling password in the same way as username, priority cli > credentials > cqlshrc
         options.password = option_with_default(rawcredentials.get, 'plain_text_auth', 'password', password_from_cqlshrc)
-        options.password = password_from_cqlshrc
     elif not options.insecure_password_without_warning:
         print("\nWarning: Using a password on the command line interface can be insecure."
               "\nRecommendation: use the credentials file to securely provide the password.\n", file=sys.stderr)

cqlshlib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.16'
-__version_tuple__ = version_tuple = (6, 0, 16)
+__version__ = version = '6.0.19'
+__version_tuple__ = version_tuple = (6, 0, 19)

cqlshlib/cql3handling.py

@@ -36,8 +36,8 @@ class UnexpectedTableStructure(UserWarning):
 
 
 SYSTEM_KEYSPACES = ('system', 'system_schema', 'system_traces', 'system_auth', 'system_distributed', 'system_views',
-                    'system_virtual_schema', 'system_distributed_everywhere')
-NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere')
+                    'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
+NONALTERBALE_KEYSPACES = ('system', 'system_schema', 'system_views', 'system_virtual_schema', 'system_distributed_everywhere', 'system_replicated_keys')
 
 
 class Cql3ParsingRuleSet(CqlParsingRuleSet):
@@ -296,6 +296,12 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
                             | <alterRoleStatement>
                             | <dropRoleStatement>
                             | <listRolesStatement>
+                            | <createSlaStatement>
+                            | <alterSlaStatement>
+                            | <dropSlaStatement>
+                            | <listSlaStatement>
+                            | <attachSlaStatement>
+                            | <detachRSlaStatement>
                             ;
 
 <authorizationStatement> ::= <grantStatement>
@@ -1501,6 +1507,41 @@ syntax_rules += r'''
                        ;
 '''
 
+syntax_rules += r'''
+<slaName> ::= <identifier>
+             | <quotedName>
+             | <unreservedKeyword>
+             ;
+
+<createSlaStatement> ::= "CREATE" "SERVICE_LEVEL" ( "IF" "NOT" "EXISTS" )? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                        ;
+
+<alterSlaStatement> ::= "ALTER" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                              ( "WITH" <slaProperty> ("AND" <slaProperty>)*)?
+                       ;
+
+<slaProperty> ::= "WORKLOAD_TYPE" "=" <stringLiteral>
+                 | "TIMEOUT" "=" <wholenumber>
+                 | "SHARES" "=" <wholenumber>
+                 ;
+
+<dropSlaStatement> ::= "DROP" "SERVICE_LEVEL" ("IF" "EXISTS")? <slaName>
+                      ;
+
+<listSlaStatement> ::= ("LIST" "SERVICE_LEVEL" <slaName> )
+                       | ("LIST" "ATTACHED" "SERVICE_LEVEL" "OF" <rolename> )
+                       | ("LIST" "ALL" "SERVICE_LEVELS" )
+                       | ("LIST" "ALL" "ATTACHED" "SERVICE_LEVELS" )
+                       ;
+
+<attachSlaStatement> ::= "ATTACH" "SERVICE_LEVEL" <slaName> "TO" <rolename>
+                       ;
+
+<detachRSlaStatement> ::= "DETACH" "SERVICE_LEVEL" <slaName> "FROM" <rolename>
+                        ;
+'''
+
 syntax_rules += r'''
 <grantStatement> ::= "GRANT" <permissionExpr> "ON" <resource> "TO" <rolename>
                    ;

cqlshlib/sslhandling.py

@@ -58,6 +58,16 @@ def ssl_settings(host, config_file, env=os.environ):
         ssl_validate = get_option('ssl', 'validate')
     ssl_validate = ssl_validate is None or ssl_validate.lower() != 'false'
 
+    ssl_check_hostname = env.get('SSL_CHECK_HOSTNAME')
+    if ssl_check_hostname is None:
+        ssl_check_hostname = get_option('ssl', 'check_hostname')
+    ssl_check_hostname = ssl_check_hostname is not None and ssl_check_hostname.lower() != 'false'
+
+    if ssl_check_hostname and not ssl_validate:
+        sys.exit("SSL certificate hostname checking "
+                 "(`check_hostname` in the [ssl] section) must be turned off "
+                 "if certificate `validate` is turned off.")
+        
     ssl_version_str = env.get('SSL_VERSION')
     if ssl_version_str is None:
         ssl_version_str = get_option('ssl', 'version')
@@ -85,9 +95,12 @@ def ssl_settings(host, config_file, env=os.environ):
         usercert = os.path.expanduser(usercert)
 
     ssl_context = ssl.SSLContext(ssl_version)
-    ssl_context.check_hostname = ssl_validate
-    ssl_context.load_cert_chain(certfile=usercert,
-                                keyfile=userkey)
+    ssl_context.check_hostname = ssl_check_hostname
+    if usercert and userkey:
+        ssl_context.load_cert_chain(certfile=usercert,
+                                    keyfile=userkey)
+    if (usercert and not userkey) or (userkey and not usercert):
+        print("Warning: userkey and usercert from [ssl] section, should be both configured, otherwise won't be used")
 
     ssl_context.verify_mode = ssl.CERT_REQUIRED if ssl_validate else ssl.CERT_NONE
     if ssl_certfile:

{scylla_cqlsh-6.0.16.dist-info → scylla_cqlsh-6.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scylla-cqlsh
-Version: 6.0.16
+Version: 6.0.19
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter

{scylla_cqlsh-6.0.16.dist-info → scylla_cqlsh-6.0.19.dist-info}/RECORD

@@ -1,12 +1,12 @@
-copyutil.pypy310-pp73-win_amd64.pyd,sha256=9cKrs9lHrtU4IF_YKQVwfxQ4Xli09vy8z0141NpRaao,926720
+copyutil.pypy310-pp73-win_amd64.pyd,sha256=3Av1OnxCUpil4UKLVE42QaRJbH-IMzEyMxSeWp3mKzc,926720
 cqlsh/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 cqlsh/__main__.py,sha256=x2NuvlSuAKwNCxiX07YoYfxog9JNAO759ZxnjBEcfus,231
-cqlsh/cqlsh.py,sha256=rsB67mN6-bxAk-OkU4TvCamhSyGxIE_gddY1Rd8snd8,114259
+cqlsh/cqlsh.py,sha256=ynRbzKW4cKaLWz6Apg3JkyD7KcvtkFgqilgrt1pkCQQ,115053
 cqlshlib/__init__.py,sha256=3M0IQCsjdCGYEOBT20swSvqxV6V8vg_mu1uJig78Vmk,3274
-cqlshlib/_version.py,sha256=0MZ9pE0ihI9iKYAkAM4JQg9TJH1oQ0o_WareBFn8tWk,429
+cqlshlib/_version.py,sha256=vZTcGTjX_kaPLeuXQdqpNpU6XM8o305_WEo7PP5YEuI,429
 cqlshlib/authproviderhandling.py,sha256=goFjJCO1FKuVCXU7KXlmlorx_cD_oIRlgpOeH13W--g,7254
 cqlshlib/copyutil.py,sha256=Pc4WaKg_W8IP4ZpuWEvoLOrJJGQTwRHTyOdqExfDro0,116171
-cqlshlib/cql3handling.py,sha256=7lwOXRGeDH-IDy2ENNJ3dbeP5o3LRmlonvIoO9rs6kw,59132
+cqlshlib/cql3handling.py,sha256=NaPViE6v9K4S4ffBmmWzI3_U0Kd-HvBjKq3N6G4GLzI,60790
 cqlshlib/cqlhandling.py,sha256=hiqjCKY5fQnqSEeugYJgAD3hRiloqUtOUTSg_GccL4A,13436
 cqlshlib/cqlshhandling.py,sha256=cMlDbq5MuXagJmq-qpJxRqwstOAawWUu2rry6tfHV_w,10824
 cqlshlib/displaying.py,sha256=WxKcYuX098sa6NoyPeYwJod0zutkrTm2Zm3riIhrYpA,4105
@@ -14,13 +14,13 @@ cqlshlib/formatting.py,sha256=-oKYKPHUH9o2GFUC8QPWs3cbDplJ6awn_Xw4uIMuIUg,23633
 cqlshlib/helptopics.py,sha256=Dh2qBHFWJHwkZyQKfC6Ma5o-grLix2uqnFba6UTYxVA,4714
 cqlshlib/pylexotron.py,sha256=YHThu6pk9kDNoTOuJTDdXBXbso7eQjmAWqh9qy4w5l0,19835
 cqlshlib/saferscanner.py,sha256=N5ugQIf-ZyJ8w8CtkY-6f8F8OpqgUSJgyMuusA4yWSM,3630
-cqlshlib/sslhandling.py,sha256=GaZ5Mc6skkwgz83CUWnkka6_Nk71Pag-pL-mA2Je9uU,4014
+cqlshlib/sslhandling.py,sha256=XYdvON1WkWFQ5dg5ttpwpSQDgbqI58YJi8Lx1qTDtQA,4758
 cqlshlib/tracing.py,sha256=Krb-TkfWrUdxr17-2yZrW5DXKvBEQt-FYZAix_62Tes,3493
 cqlshlib/util.py,sha256=gHvzlTw1T9N1YzXdVPFptAt58EzyXpDRibAo8QB03I8,5240
 cqlshlib/wcwidth.py,sha256=zsoo9u3ZA3q8RL5Afb6ynRujqDdUZ9zlFIHGE8RkqyA,16244
-scylla_cqlsh-6.0.16.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
-scylla_cqlsh-6.0.16.dist-info/METADATA,sha256=r3olDujB0GyBN-sJG0GsAnWdJhzAp4Z_fwSCqsNqaGU,2910
-scylla_cqlsh-6.0.16.dist-info/WHEEL,sha256=rYXTyvkpxaXVZIMCnvr11ItNt5drcLWY4co014vQHhI,109
-scylla_cqlsh-6.0.16.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
-scylla_cqlsh-6.0.16.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
-scylla_cqlsh-6.0.16.dist-info/RECORD,,
+scylla_cqlsh-6.0.19.dist-info/LICENSE.txt,sha256=65AZdlqRQxiyMBv8nY6itMITk5jx9EkE_jHujbcDzbk,11564
+scylla_cqlsh-6.0.19.dist-info/METADATA,sha256=2zpyU0kRbhMV_ja-5GmXS3nypqrpHmU21pgqv5wg5Tg,2910
+scylla_cqlsh-6.0.19.dist-info/WHEEL,sha256=Fa2X3aJKyv9pvj6zwWqKNuuhKGur73Qk7iIcOtDs-ac,109
+scylla_cqlsh-6.0.19.dist-info/entry_points.txt,sha256=oE4unqgR3WwNkCJDGlMG1HYtCE3nEZZ4d9CIl-JSZyQ,46
+scylla_cqlsh-6.0.19.dist-info/top_level.txt,sha256=PVG-5w7PDG3FoAJH6Rq2I8C0y4cKa2KOW75GxjHkmQ4,24
+scylla_cqlsh-6.0.19.dist-info/RECORD,,

{scylla_cqlsh-6.0.16.dist-info → scylla_cqlsh-6.0.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: false
 Tag: pp310-pypy310_pp73-win_amd64