fix(Global Search/Tagging): re-gen services with latest API definition (#246)

Signed-off-by: Fabrizio Leoni <[email protected]>

Author: fabrizio-leoni

ibm_platform_services/global_search_v2.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# (C) Copyright IBM Corp. 2023.
+# (C) Copyright IBM Corp. 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.82.1-2082d402-20231115-195014
+# IBM OpenAPI SDK Code Generator Version: 3.86.0-bc6f14b3-20240221-193958
 
 """
 Search for resources with the global and shared resource properties repository that is
@@ -118,15 +118,19 @@ def search(
         You must use `/v3/resources/search` when you need to fetch more than `10000`
         resource items. On the first call, the operation returns a live cursor on the data
         that you must use on all the subsequent calls to get the next batch of results
-        until you get the empty result set. By default, the fields that are returned for
-        every resource are "crn", "name", "family", "type", and "account_id". You can
-        specify the subset of the fields you want in your request.
+        until you get the empty result set.
+        By default, the fields that are returned for every resource are `crn`, `name`,
+        `family`, `type`, and `account_id`. You can specify the subset of the fields you
+        want in your request using the `fields` request body attribute. Set `"fields":
+        ["*"]` to discover the set of fields which are available to request.
 
         :param str query: (optional) The Lucene-formatted query string. Default to
                '*' if not set.
         :param List[str] fields: (optional) The list of the fields returned by the
                search. By default, the returned fields are the `account_id`, `name`,
-               `type`, `family`, and `crn`. For all queries, `crn` is always returned.
+               `type`, `family`, and `crn`. For all queries, `crn` is always returned. You
+               may set `"fields": ["*"]` to discover the set of fields available to
+               request.
         :param str search_cursor: (optional) An opaque cursor that is returned on
                each call and that must be set on the subsequent call to get the next batch
                of items. If the search returns no items, then the search_cursor is not
@@ -327,8 +331,8 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'ResultItem':
         """Initialize a ResultItem object from a json dictionary."""
         args = {}
-        if 'crn' in _dict:
-            args['crn'] = _dict.get('crn')
+        if (crn := _dict.get('crn')) is not None:
+            args['crn'] = crn
         else:
             raise ValueError('Required property \'crn\' not present in ResultItem JSON')
         args.update({k: v for (k, v) in _dict.items() if k not in cls._properties})
@@ -392,8 +396,10 @@ class ScanResult:
           the first one.
     :param int limit: Value of the limit parameter specified by the user.
     :param List[ResultItem] items: The array of results. Each item represents a
-          resource. An empty array signals the end of the result set, which means there
-          are no more results to fetch.
+          resource. For each resource, the requested `fields` are returned. If you did not
+          set the `fields` request body parameter, then the `account_id`, `name`, `type`,
+          `family`, and `crn` are returned. An empty array signals the end of the result
+          set, which means there are no more results to fetch.
     """
 
     def __init__(
@@ -408,8 +414,10 @@ def __init__(
 
         :param int limit: Value of the limit parameter specified by the user.
         :param List[ResultItem] items: The array of results. Each item represents a
-               resource. An empty array signals the end of the result set, which means
-               there are no more results to fetch.
+               resource. For each resource, the requested `fields` are returned. If you
+               did not set the `fields` request body parameter, then the `account_id`,
+               `name`, `type`, `family`, and `crn` are returned. An empty array signals
+               the end of the result set, which means there are no more results to fetch.
         :param str search_cursor: (optional) The search cursor to use on all calls
                after the first one.
         """
@@ -421,14 +429,14 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'ScanResult':
         """Initialize a ScanResult object from a json dictionary."""
         args = {}
-        if 'search_cursor' in _dict:
-            args['search_cursor'] = _dict.get('search_cursor')
-        if 'limit' in _dict:
-            args['limit'] = _dict.get('limit')
+        if (search_cursor := _dict.get('search_cursor')) is not None:
+            args['search_cursor'] = search_cursor
+        if (limit := _dict.get('limit')) is not None:
+            args['limit'] = limit
         else:
             raise ValueError('Required property \'limit\' not present in ScanResult JSON')
-        if 'items' in _dict:
-            args['items'] = [ResultItem.from_dict(v) for v in _dict.get('items')]
+        if (items := _dict.get('items')) is not None:
+            args['items'] = [ResultItem.from_dict(v) for v in items]
         else:
             raise ValueError('Required property \'items\' not present in ScanResult JSON')
         return cls(**args)

ibm_platform_services/global_tagging_v1.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# (C) Copyright IBM Corp. 2023.
+# (C) Copyright IBM Corp. 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# IBM OpenAPI SDK Code Generator Version: 3.82.1-2082d402-20231115-195014
+# IBM OpenAPI SDK Code Generator Version: 3.86.0-bc6f14b3-20240221-193958
 
 """
 Manage your tags with the Tagging API in IBM Cloud. You can attach, detach, delete, or
@@ -480,6 +480,7 @@ def attach_tag(
         transaction_id: Optional[str] = None,
         account_id: Optional[str] = None,
         tag_type: Optional[str] = None,
+        replace: Optional[bool] = None,
         **kwargs,
     ) -> DetailedResponse:
         """
@@ -519,6 +520,9 @@ def attach_tag(
         :param str tag_type: (optional) The type of the tag. Supported values are
                `user`, `service` and `access`. `service` and `access` are not supported
                for IMS resources.
+        :param bool replace: (optional) Flag to request replacement of all attached
+               tags. Set 'true' if you want to replace all the list of tags attached to
+               the resource. Default value is false.
         :param dict headers: A `dict` containing the request headers
         :return: A `DetailedResponse` containing the result, headers and HTTP status code.
         :rtype: DetailedResponse with `dict` result representing a `TagResults` object
@@ -542,6 +546,7 @@ def attach_tag(
         params = {
             'account_id': account_id,
             'tag_type': tag_type,
+            'replace': replace,
         }
 
         data = {
@@ -831,8 +836,8 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'CreateTagResults':
         """Initialize a CreateTagResults object from a json dictionary."""
         args = {}
-        if 'results' in _dict:
-            args['results'] = [CreateTagResultsResultsItem.from_dict(v) for v in _dict.get('results')]
+        if (results := _dict.get('results')) is not None:
+            args['results'] = [CreateTagResultsResultsItem.from_dict(v) for v in results]
         return cls(**args)
 
     @classmethod
@@ -901,10 +906,10 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'CreateTagResultsResultsItem':
         """Initialize a CreateTagResultsResultsItem object from a json dictionary."""
         args = {}
-        if 'tag_name' in _dict:
-            args['tag_name'] = _dict.get('tag_name')
-        if 'is_error' in _dict:
-            args['is_error'] = _dict.get('is_error')
+        if (tag_name := _dict.get('tag_name')) is not None:
+            args['tag_name'] = tag_name
+        if (is_error := _dict.get('is_error')) is not None:
+            args['is_error'] = is_error
         return cls(**args)
 
     @classmethod
@@ -965,8 +970,8 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'DeleteTagResults':
         """Initialize a DeleteTagResults object from a json dictionary."""
         args = {}
-        if 'results' in _dict:
-            args['results'] = [DeleteTagResultsItem.from_dict(v) for v in _dict.get('results')]
+        if (results := _dict.get('results')) is not None:
+            args['results'] = [DeleteTagResultsItem.from_dict(v) for v in results]
         return cls(**args)
 
     @classmethod
@@ -1042,10 +1047,10 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'DeleteTagResultsItem':
         """Initialize a DeleteTagResultsItem object from a json dictionary."""
         args = {}
-        if 'provider' in _dict:
-            args['provider'] = _dict.get('provider')
-        if 'is_error' in _dict:
-            args['is_error'] = _dict.get('is_error')
+        if (provider := _dict.get('provider')) is not None:
+            args['provider'] = provider
+        if (is_error := _dict.get('is_error')) is not None:
+            args['is_error'] = is_error
         args.update({k: v for (k, v) in _dict.items() if k not in cls._properties})
         return cls(**args)
 
@@ -1145,12 +1150,12 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'DeleteTagsResult':
         """Initialize a DeleteTagsResult object from a json dictionary."""
         args = {}
-        if 'total_count' in _dict:
-            args['total_count'] = _dict.get('total_count')
-        if 'errors' in _dict:
-            args['errors'] = _dict.get('errors')
-        if 'items' in _dict:
-            args['items'] = [DeleteTagsResultItem.from_dict(v) for v in _dict.get('items')]
+        if (total_count := _dict.get('total_count')) is not None:
+            args['total_count'] = total_count
+        if (errors := _dict.get('errors')) is not None:
+            args['errors'] = errors
+        if (items := _dict.get('items')) is not None:
+            args['items'] = [DeleteTagsResultItem.from_dict(v) for v in items]
         return cls(**args)
 
     @classmethod
@@ -1221,10 +1226,10 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'DeleteTagsResultItem':
         """Initialize a DeleteTagsResultItem object from a json dictionary."""
         args = {}
-        if 'tag_name' in _dict:
-            args['tag_name'] = _dict.get('tag_name')
-        if 'is_error' in _dict:
-            args['is_error'] = _dict.get('is_error')
+        if (tag_name := _dict.get('tag_name')) is not None:
+            args['tag_name'] = tag_name
+        if (is_error := _dict.get('is_error')) is not None:
+            args['is_error'] = is_error
         return cls(**args)
 
     @classmethod
@@ -1287,12 +1292,12 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'Resource':
         """Initialize a Resource object from a json dictionary."""
         args = {}
-        if 'resource_id' in _dict:
-            args['resource_id'] = _dict.get('resource_id')
+        if (resource_id := _dict.get('resource_id')) is not None:
+            args['resource_id'] = resource_id
         else:
             raise ValueError('Required property \'resource_id\' not present in Resource JSON')
-        if 'resource_type' in _dict:
-            args['resource_type'] = _dict.get('resource_type')
+        if (resource_type := _dict.get('resource_type')) is not None:
+            args['resource_type'] = resource_type
         return cls(**args)
 
     @classmethod
@@ -1350,8 +1355,8 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'Tag':
         """Initialize a Tag object from a json dictionary."""
         args = {}
-        if 'name' in _dict:
-            args['name'] = _dict.get('name')
+        if (name := _dict.get('name')) is not None:
+            args['name'] = name
         else:
             raise ValueError('Required property \'name\' not present in Tag JSON')
         return cls(**args)
@@ -1424,14 +1429,14 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'TagList':
         """Initialize a TagList object from a json dictionary."""
         args = {}
-        if 'total_count' in _dict:
-            args['total_count'] = _dict.get('total_count')
-        if 'offset' in _dict:
-            args['offset'] = _dict.get('offset')
-        if 'limit' in _dict:
-            args['limit'] = _dict.get('limit')
-        if 'items' in _dict:
-            args['items'] = [Tag.from_dict(v) for v in _dict.get('items')]
+        if (total_count := _dict.get('total_count')) is not None:
+            args['total_count'] = total_count
+        if (offset := _dict.get('offset')) is not None:
+            args['offset'] = offset
+        if (limit := _dict.get('limit')) is not None:
+            args['limit'] = limit
+        if (items := _dict.get('items')) is not None:
+            args['items'] = [Tag.from_dict(v) for v in items]
         return cls(**args)
 
     @classmethod
@@ -1502,8 +1507,8 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'TagResults':
         """Initialize a TagResults object from a json dictionary."""
         args = {}
-        if 'results' in _dict:
-            args['results'] = [TagResultsItem.from_dict(v) for v in _dict.get('results')]
+        if (results := _dict.get('results')) is not None:
+            args['results'] = [TagResultsItem.from_dict(v) for v in results]
         return cls(**args)
 
     @classmethod
@@ -1572,12 +1577,12 @@ def __init__(
     def from_dict(cls, _dict: Dict) -> 'TagResultsItem':
         """Initialize a TagResultsItem object from a json dictionary."""
         args = {}
-        if 'resource_id' in _dict:
-            args['resource_id'] = _dict.get('resource_id')
+        if (resource_id := _dict.get('resource_id')) is not None:
+            args['resource_id'] = resource_id
         else:
             raise ValueError('Required property \'resource_id\' not present in TagResultsItem JSON')
-        if 'is_error' in _dict:
-            args['is_error'] = _dict.get('is_error')
+        if (is_error := _dict.get('is_error')) is not None:
+            args['is_error'] = is_error
         return cls(**args)
 
     @classmethod

test/unit/test_global_search_v2.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# (C) Copyright IBM Corp. 2023.
+# (C) Copyright IBM Corp. 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

test/unit/test_global_tagging_v1.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# (C) Copyright IBM Corp. 2023.
+# (C) Copyright IBM Corp. 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -611,6 +611,7 @@ def test_attach_tag_all_params(self):
         transaction_id = 'testString'
         account_id = 'testString'
         tag_type = 'user'
+        replace = False
 
         # Invoke method
         response = _service.attach_tag(
@@ -622,6 +623,7 @@ def test_attach_tag_all_params(self):
             transaction_id=transaction_id,
             account_id=account_id,
             tag_type=tag_type,
+            replace=replace,
             headers={},
         )
 
@@ -633,6 +635,7 @@ def test_attach_tag_all_params(self):
         query_string = urllib.parse.unquote_plus(query_string)
         assert 'account_id={}'.format(account_id) in query_string
         assert 'tag_type={}'.format(tag_type) in query_string
+        assert 'replace={}'.format('true' if replace else 'false') in query_string
         # Validate body params
         req_body = json.loads(str(responses.calls[0].request.body, 'utf-8'))
         assert req_body['resources'] == [resource_model]