Minor fixes for NiFi 12.x matching release

Removed force reset of configuration.password and configuration.username to empty string. This was not increasing security, and was causing unexpected errors for users connecting to multiple services in a single script.
Add greedy control to versioning.get_registry_bucket and versioning.get_flow_in_bucket to avoid undesirable partial string match.
Update readme to reflect switch from 'master' branch naming to 'main'.
Update tox to pin testing to Python 3.8, as Python 3.9 is producing unexpected and unrelated SSL failures
Minor lint formatting improvements

Signed-off-by: Daniel Chaffelson <[email protected]>

Author: Chaffelson

README.rst

@@ -11,7 +11,7 @@ Nifi-Python-Api: A rich Apache NiFi Python Client SDK
         :target: https://pypi.python.org/pypi/nipyapi
         :alt: Release Status
 
-.. image:: https://img.shields.io/travis/Chaffelson/nipyapi.svg
+.. image:: https://img.shields.io/travis/Chaffelson/nipyapi/main.svg
         :target: https://travis-ci.org/Chaffelson/nipyapi
         :alt: Build Status
 
@@ -23,8 +23,8 @@ Nifi-Python-Api: A rich Apache NiFi Python Client SDK
      :target: https://pyup.io/repos/github/Chaffelson/nipyapi/
      :alt: Python Updates
 
-.. image:: https://coveralls.io/repos/github/Chaffelson/nipyapi/badge.svg?branch=master
-    :target: https://coveralls.io/github/Chaffelson/nipyapi?branch=master&service=github
+.. image:: https://coveralls.io/repos/github/Chaffelson/nipyapi/badge.svg?branch=main
+    :target: https://coveralls.io/github/Chaffelson/nipyapi?branch=main&service=github
     :alt: test coverage
 
 .. image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg

nipyapi/security.py

@@ -395,10 +395,6 @@ def service_logout(service='nifi'):
             # Logout throws error with incorrect ssl setup
         else:
             raise e
-    # Set to empty string and not None as basic auth setup will still
-    # run even if not used
-    getattr(nipyapi, service).configuration.password = ''
-    getattr(nipyapi, service).configuration.username = ''
     if not status:
         return True
     return False

nipyapi/utils.py

@@ -492,7 +492,8 @@ def check_version(base, comparator=None, service='nifi'):
             if config.api_client is None:
                 config.api_client = nipyapi.registry.ApiClient()
             reg_swagger_def = config.api_client.call_api(
-                resource_path='/swagger/swagger.json', method='GET', _preload_content=False,
+                resource_path='/swagger/swagger.json',
+                method='GET', _preload_content=False,
                 auth_settings=['tokenAuth', 'Authorization']
             )
             reg_json = load(reg_swagger_def[0].data)

nipyapi/versioning.py

@@ -161,21 +161,23 @@ def delete_registry_bucket(bucket):
         _raise(ValueError(e), e)
 
 
-def get_registry_bucket(identifier, identifier_type='name'):
+def get_registry_bucket(identifier, identifier_type='name', greedy=True):
     """
     Filters the Bucket list to a particular identifier
 
     Args:
         identifier (str): the filter string
         identifier_type (str): the param to filter on
+        greedy (bool): False for exact match, True for greedy match
 
     Returns:
         None for no matches, Single Object for unique match,
         list(Objects) for multiple matches
     """
     with nipyapi.utils.rest_exceptions():
         obj = list_registry_buckets()
-    return nipyapi.utils.filter_obj(obj, identifier, identifier_type)
+    return nipyapi.utils.filter_obj(
+        obj, identifier, identifier_type, greedy=greedy)
 
 
 def list_flows_in_bucket(bucket_id):
@@ -192,22 +194,24 @@ def list_flows_in_bucket(bucket_id):
         return nipyapi.registry.BucketFlowsApi().get_flows(bucket_id)
 
 
-def get_flow_in_bucket(bucket_id, identifier, identifier_type='name'):
+def get_flow_in_bucket(bucket_id, identifier, identifier_type='name', greedy=True):
     """
     Filters the Flows in a Bucket against a particular identifier
 
     Args:
         bucket_id (str): UUID of the Bucket to filter against
         identifier (str): The string to filter on
         identifier_type (str): The param to check
+        greedy (bool): False for exact match, True for greedy match
 
     Returns:
         None for no matches, Single Object for unique match,
         list(Objects) for multiple matches
     """
     with nipyapi.utils.rest_exceptions():
         obj = list_flows_in_bucket(bucket_id)
-    return nipyapi.utils.filter_obj(obj, identifier, identifier_type)
+    return nipyapi.utils.filter_obj(
+        obj, identifier, identifier_type, greedy=greedy)
 
 
 def save_flow_ver(process_group, registry_client, bucket, flow_name=None,

tox.ini

@@ -3,7 +3,7 @@ envlist = py27, py3, flake8, lint
 
 [travis]
 python =
-    3: py3
+    3.8: py3
     2.7: py27
 
 [flake8]
@@ -34,7 +34,7 @@ omit =
     nipyapi/registry/*
     nipyapi/demo/*
     nipyapi/docs/*
-    
+
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}