Fixed multiple issues

tenable/io/files.py

@@ -41,9 +41,9 @@ def upload(self, fobj: BinaryIO, encrypted: bool = False):
         # We will attempt to discover the name of the file stored within the
         # file object.  If none exists however, we will generate a random
         # uuid string to use instead.
-        kw = dict()
+        params = dict()
         if encrypted:
-            kw['data'] = {'no_enc': int(encrypted)}
-        kw['files'] = {'Filedata': fobj}
+            params['no_enc'] = int(encrypted)
+        kw = {'files': {'Filedata': fobj}}
 
-        return self._api.post('file/upload', **kw).json()['fileuploaded']
+        return self._api.post('file/upload', **kw, params=params).json()['fileuploaded']

tenable/io/scans.py

@@ -1097,7 +1097,7 @@ def import_scan(self, fobj, folder_id=None, password=None, aggregate=None):
 
         # Upload the file to the Tenable Vulnerability Management and store the resulting filename in
         # the payload.
-        payload['file'] = self._api.files.upload(fobj)
+        payload['file'] = self._api.files.upload(fobj, encrypted=bool(password))
 
         # make the call to Tenable Vulnerability Management to import and then return the result to
         # the caller.

tenable/io/tags.py

@@ -51,6 +51,9 @@ class TagsAPI(TIOEndpoint):
         'category_name': {
             'operators': ['eq', 'match'], 'pattern': None, 'choices': None
         },
+        'category_uuid': {
+            'operators': ['eq'], 'pattern': r'^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12,32}$', 'choices': None
+        },
         'description': {
             'operators': ['eq', 'match'], 'pattern': None, 'choices': None
         },