RD-6065 Secret List by Provider name (#1453)

Author: Adrian Polanczyk

cloudify_cli/cli/cfy.py

@@ -1898,6 +1898,14 @@ def __init__(self):
             help=helptexts.SECRET_PROVIDER_NAME,
         )
 
+        self.provider = click.option(
+            '--provider',
+            'provider',
+            required=False,
+            callback=validate_value_not_empty,
+            help=helptexts.SECRET_PROVIDER_NAME,
+        )
+
     def common_options(self, f):
         """A shorthand for applying commonly used arguments.
 
@@ -2490,6 +2498,21 @@ def connection_parameters(required=True, _help=None, default=None):
 
         return click.option(*args, **kwargs)
 
+    @staticmethod
+    def provider_multiple(required=False, _help=None, default=None):
+        args = [
+            '--provider',
+            'provider',
+        ]
+        kwargs = {
+            'required': required,
+            'help': _help or helptexts.SECRET_PROVIDER_NAME_MULTIPLE,
+            'multiple': True,
+            'default': default,
+        }
+
+        return click.option(*args, **kwargs)
+
 
 options = Options()
 

cloudify_cli/cli/helptexts.py

@@ -611,6 +611,7 @@
     {type} by tenant_name with a secondary grouping by visibility.
     """
 SECRET_PROVIDER_NAME = "Secret Provider's name"
+SECRET_PROVIDER_NAME_MULTIPLE = "Secret Provider's name list"
 SECRET_PROVIDER_TYPE = "Secret Provider's type"
 SECRET_PROVIDER_CONNECTION_PARAMETERS = """
     Secret Provider's connection parameters in stringify JSON format

cloudify_cli/commands/secrets.py

@@ -32,8 +32,16 @@
     handle_client_error,
     prettify_client_error)
 
-SECRETS_COLUMNS = ['key', 'created_at', 'updated_at', 'visibility',
-                   'tenant_name', 'created_by', 'is_hidden_value']
+SECRETS_COLUMNS = [
+    'key',
+    'created_at',
+    'updated_at',
+    'visibility',
+    'tenant_name',
+    'created_by',
+    'is_hidden_value',
+    'provider_name',
+]
 
 SECRET_PROVIDER_COLUMNS = [
     'name',
@@ -75,6 +83,7 @@ def providers():
 @cfy.options.secret_flag_dict
 @cfy.options.secret_flag_list
 @cfy.options.tenant_name(required=False, resource_name_for_help='secret')
+@cfy.options.provider
 @cfy.options.common_options
 @cfy.assert_manager_active()
 @cfy.pass_client(use_tenant_in_header=True)
@@ -89,6 +98,7 @@ def create(key,
            secret_flag_list,
            visibility,
            tenant_name,
+           provider,
            logger,
            client):
     """Create a new secret (key-value pair)
@@ -127,12 +137,15 @@ def create(key,
                 f'Error decoding secret value: \'{value}\' is not of '
                 f'type \'{secret_schema.get("type")}\'')
 
-    client.secrets.create(key,
-                          value,
-                          update_if_exists,
-                          hidden_value,
-                          visibility,
-                          secret_schema)
+    client.secrets.create(
+        key,
+        value,
+        update_if_exists,
+        hidden_value,
+        visibility,
+        secret_schema,
+        provider,
+    )
 
     logger.info('Secret `{0}` created'.format(key))
 
@@ -288,26 +301,43 @@ def update(key,
 @cfy.options.search
 @cfy.options.pagination_offset
 @cfy.options.pagination_size
+@cfy.options.provider_multiple()
 @cfy.assert_manager_active()
 @cfy.pass_client()
 @cfy.pass_logger
 @cfy.options.extended_view
-def list(sort_by,
-         descending,
-         tenant_name,
-         all_tenants,
-         search,
-         pagination_offset,
-         pagination_size,
-         logger,
-         client):
+def _list(
+        sort_by,
+        descending,
+        tenant_name,
+        all_tenants,
+        search,
+        pagination_offset,
+        pagination_size,
+        provider,
+        logger,
+        client,
+):
     """List all secrets
     """
+    filter_rules = None
+
+    if provider:
+        filter_rules = [
+            {
+                "key": "provider_name",
+                "values": provider,
+                "operator": "starts_with",
+                "type": "attribute",
+            }
+        ]
+
     utils.explicit_tenant_name_message(tenant_name, logger)
     logger.info('Listing all secrets...')
     secrets_list = client.secrets.list(
         sort=sort_by,
         is_descending=descending,
+        filter_rules=filter_rules,
         _all_tenants=all_tenants,
         _search=search,
         _offset=pagination_offset,