Merge pull request #8 from astuto-ai/resource_id_in_resource_catalog

addded identifier key as resource id in service catalog model
astuto-ai · Jul 31, 2024 · ba11afa · ba11afa
2 parents e56f6ce + 8cb884c
commit ba11afa
Show file tree

Hide file tree

Showing 32 changed files with 895 additions and 64 deletions.
diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
@@ -423,6 +423,8 @@ docs/TenantPoliciesApi.md
 docs/TenantPolicy.md
 docs/TenantPolicyExclusions.md
 docs/TenantPolicyFilters.md
+docs/TenantPolicyForPolicyWithSetting.md
+docs/TenantPolicyForPolicyWithSettingServicesInner.md
 docs/TenantPolicyServiceApi.md
 docs/TenantPolicySettings.md
 docs/TenantPolicySettingsFilters.md
@@ -447,6 +449,7 @@ docs/TenantUserDetailsUpdateFieldsMixin.md
 docs/TenantUserServiceApi.md
 docs/TenantUserUpdateFieldsMixin.md
 docs/TenantUsersApi.md
+docs/TenantVerifyCurBucketAPIRequest.md
 docs/TenantVerifyCurBucketRequest.md
 docs/TenantVerifyCurBucketResponse.md
 docs/TenantVerifyRequestWithUser.md
@@ -946,6 +949,8 @@ onelens_backend_client/models/tenant_filters.py
 onelens_backend_client/models/tenant_policy.py
 onelens_backend_client/models/tenant_policy_exclusions.py
 onelens_backend_client/models/tenant_policy_filters.py
+onelens_backend_client/models/tenant_policy_for_policy_with_setting.py
+onelens_backend_client/models/tenant_policy_for_policy_with_setting_services_inner.py
 onelens_backend_client/models/tenant_policy_settings.py
 onelens_backend_client/models/tenant_policy_settings_filters.py
 onelens_backend_client/models/tenant_policy_state.py
@@ -964,6 +969,7 @@ onelens_backend_client/models/tenant_tickets_stats_metrics_group_by.py
 onelens_backend_client/models/tenant_tickets_stats_metrics_sub_group_by.py
 onelens_backend_client/models/tenant_user_details_update_fields_mixin.py
 onelens_backend_client/models/tenant_user_update_fields_mixin.py
+onelens_backend_client/models/tenant_verify_cur_bucket_api_request.py
 onelens_backend_client/models/tenant_verify_cur_bucket_request.py
 onelens_backend_client/models/tenant_verify_cur_bucket_response.py
 onelens_backend_client/models/tenant_verify_request_with_user.py
@@ -1021,4 +1027,7 @@ setup.cfg
 setup.py
 test-requirements.txt
 test/__init__.py
+test/test_tenant_policy_for_policy_with_setting.py
+test/test_tenant_policy_for_policy_with_setting_services_inner.py
+test/test_tenant_verify_cur_bucket_api_request.py
 tox.ini
diff --git a/README.md b/README.md
@@ -669,6 +669,8 @@ Class | Method | Description
  - [TenantPolicy](docs/TenantPolicy.md)
  - [TenantPolicyExclusions](docs/TenantPolicyExclusions.md)
  - [TenantPolicyFilters](docs/TenantPolicyFilters.md)
+ - [TenantPolicyForPolicyWithSetting](docs/TenantPolicyForPolicyWithSetting.md)
+ - [TenantPolicyForPolicyWithSettingServicesInner](docs/TenantPolicyForPolicyWithSettingServicesInner.md)
  - [TenantPolicySettings](docs/TenantPolicySettings.md)
  - [TenantPolicySettingsFilters](docs/TenantPolicySettingsFilters.md)
  - [TenantPolicyState](docs/TenantPolicyState.md)
@@ -687,6 +689,7 @@ Class | Method | Description
  - [TenantTicketsStatsMetricsSubGroupBy](docs/TenantTicketsStatsMetricsSubGroupBy.md)
  - [TenantUserDetailsUpdateFieldsMixin](docs/TenantUserDetailsUpdateFieldsMixin.md)
  - [TenantUserUpdateFieldsMixin](docs/TenantUserUpdateFieldsMixin.md)
+ - [TenantVerifyCurBucketAPIRequest](docs/TenantVerifyCurBucketAPIRequest.md)
  - [TenantVerifyCurBucketRequest](docs/TenantVerifyCurBucketRequest.md)
  - [TenantVerifyCurBucketResponse](docs/TenantVerifyCurBucketResponse.md)
  - [TenantVerifyRequestWithUser](docs/TenantVerifyRequestWithUser.md)

diff --git a/REGENERATE.md b/REGENERATE.md
@@ -2,7 +2,7 @@ Run this to regenerate the client code locally. OneLens Backend must be running
 
 ```
 docker run --rm -v "${PWD}:/onelens-backend-python-client" openapitools/openapi-generator-cli:v7.5.0 generate \
--i http://host.docker.internal:9000/openapi.json \
+-i http://host.docker.internal:8001/openapi.json \
 -g python \
 -o /onelens-backend-python-client/ \
 -t /onelens-backend-python-client/templates/ \

diff --git a/docs/GetPolicyTicketStatsGroupBy.md b/docs/GetPolicyTicketStatsGroupBy.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **field_name** | **str** | Field name to be fetched | 
 **field_value** | **float** |  | [optional] 
 **field_details** | [**List[GetPolicyTicketStatsSubGroupBy]**](GetPolicyTicketStatsSubGroupBy.md) |  | [optional] 
+**field_display_name** | **str** |  | [optional] 
 
 ## Example
 

diff --git a/docs/GetPolicyTicketStatsSubGroupBy.md b/docs/GetPolicyTicketStatsSubGroupBy.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **field_name** | **str** | Field name to be fetched | 
 **field_value** | **float** |  | [optional] 
+**field_display_name** | **str** |  | [optional] 
 
 ## Example
 

diff --git a/docs/GetSinglePolicyTicketByEntityIdResponse.md b/docs/GetSinglePolicyTicketByEntityIdResponse.md
@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 **policy_labels** | **List[str]** | List of policy labels | [optional] 
 **policy_violated_on** | **datetime** | Datetime of the policy violation | 
 **potential_savings** | **float** | Potential savings possible for the current policy violation | 
+**resource_id** | **str** |  | [optional] 
 
 ## Example
 

diff --git a/docs/GetSinglePolicyTicketByPolicyIdResponse.md b/docs/GetSinglePolicyTicketByPolicyIdResponse.md
@@ -17,6 +17,7 @@ Name | Type | Description | Notes
 **account_id** | **str** | Account Id managing the resource | 
 **recommendation_unit_title** | **str** |  | [optional] 
 **potential_savings** | **float** | Potential savings of the ticket | 
+**resource_id** | **str** |  | [optional] 
 
 ## Example
 

diff --git a/docs/ResourceType.md b/docs/ResourceType.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **resource_type** | **str** |  | 
 **resource_table** | **str** |  | 
+**identifier_key** | **str** |  | [optional] 
 **select_columns** | **List[str]** |  | 
 **resource_url_template** | **str** |  | 
 **is_tags_available** | **bool** |  | 

diff --git a/docs/TenantPolicyForPolicyWithSetting.md b/docs/TenantPolicyForPolicyWithSetting.md
@@ -0,0 +1,43 @@
+# TenantPolicyForPolicyWithSetting
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**parent_ptp_id** | **str** | The id of the parent policy template pack. | 
+**title** | **str** | The title of the policy template. | 
+**alias** | **str** | The alias of the policy template. | 
+**description** | **str** | The description of the policy template. | [optional] 
+**services** | [**List[TenantPolicyForPolicyWithSettingServicesInner]**](TenantPolicyForPolicyWithSettingServicesInner.md) | The list of services display names associated the policy template. | 
+**execution_type** | [**PolicyExecutionType**](PolicyExecutionType.md) | The execution type of the policy template. | 
+**details** | [**PolicyTemplateDetailsOutput**](PolicyTemplateDetailsOutput.md) | The details of the policy template. | 
+**description2** | **str** | The description2 of the policy template. | [optional] 
+**resource_type** | **str** | The resource type of the policy template. | 
+**recommendation_details** | [**PolicyTemplateRecommendationDetailsOutput**](PolicyTemplateRecommendationDetailsOutput.md) | The recommendation details for the policy template. | 
+**policy_template_id** | **str** | The id of the policy template. | 
+**category** | [**PolicyCategory**](PolicyCategory.md) | The category of the policy template. | 
+**provider** | [**Provider**](Provider.md) | The cloud provider of the policy template. | 
+**id** | **str** | The unique identifier of the tenant policy. | 
+**state** | [**TenantPolicySystemState**](TenantPolicySystemState.md) | The state of the tenant policy. | 
+
+## Example
+
+```python
+from onelens_backend_client.models.tenant_policy_for_policy_with_setting import TenantPolicyForPolicyWithSetting
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of TenantPolicyForPolicyWithSetting from a JSON string
+tenant_policy_for_policy_with_setting_instance = TenantPolicyForPolicyWithSetting.from_json(json)
+# print the JSON string representation of the object
+print(TenantPolicyForPolicyWithSetting.to_json())
+
+# convert the object into a dict
+tenant_policy_for_policy_with_setting_dict = tenant_policy_for_policy_with_setting_instance.to_dict()
+# create an instance of TenantPolicyForPolicyWithSetting from a dict
+tenant_policy_for_policy_with_setting_form_dict = tenant_policy_for_policy_with_setting.from_dict(tenant_policy_for_policy_with_setting_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/TenantPolicyForPolicyWithSettingServicesInner.md b/docs/TenantPolicyForPolicyWithSettingServicesInner.md
@@ -0,0 +1,35 @@
+# TenantPolicyForPolicyWithSettingServicesInner
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **str** |  | 
+**name** | **str** |  | 
+**product_code** | **str** |  | 
+**display_name** | **str** |  | 
+**description** | **str** |  | 
+**resource_types** | [**List[ResourceType]**](ResourceType.md) |  | [optional] [default to []]
+**features** | [**Features**](Features.md) |  | [optional] 
+
+## Example
+
+```python
+from onelens_backend_client.models.tenant_policy_for_policy_with_setting_services_inner import TenantPolicyForPolicyWithSettingServicesInner
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of TenantPolicyForPolicyWithSettingServicesInner from a JSON string
+tenant_policy_for_policy_with_setting_services_inner_instance = TenantPolicyForPolicyWithSettingServicesInner.from_json(json)
+# print the JSON string representation of the object
+print(TenantPolicyForPolicyWithSettingServicesInner.to_json())
+
+# convert the object into a dict
+tenant_policy_for_policy_with_setting_services_inner_dict = tenant_policy_for_policy_with_setting_services_inner_instance.to_dict()
+# create an instance of TenantPolicyForPolicyWithSettingServicesInner from a dict
+tenant_policy_for_policy_with_setting_services_inner_form_dict = tenant_policy_for_policy_with_setting_services_inner.from_dict(tenant_policy_for_policy_with_setting_services_inner_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/TenantPolicyWithSetting.md b/docs/TenantPolicyWithSetting.md
@@ -5,7 +5,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**policy** | [**TenantPolicy**](TenantPolicy.md) | The policy details. | 
+**policy** | [**TenantPolicyForPolicyWithSetting**](TenantPolicyForPolicyWithSetting.md) | The policy details. | 
 **setting** | [**TenantPolicySettings**](TenantPolicySettings.md) | The policy setting details. | 
 
 ## Example

diff --git a/docs/TenantVerifyCurBucketAPIRequest.md b/docs/TenantVerifyCurBucketAPIRequest.md
@@ -0,0 +1,30 @@
+# TenantVerifyCurBucketAPIRequest
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cur_bucket_config** | [**CurBucketConfig**](CurBucketConfig.md) | cur bucket config | 
+**cloud_id** | **str** | cloud id | 
+
+## Example
+
+```python
+from onelens_backend_client.models.tenant_verify_cur_bucket_api_request import TenantVerifyCurBucketAPIRequest
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of TenantVerifyCurBucketAPIRequest from a JSON string
+tenant_verify_cur_bucket_api_request_instance = TenantVerifyCurBucketAPIRequest.from_json(json)
+# print the JSON string representation of the object
+print(TenantVerifyCurBucketAPIRequest.to_json())
+
+# convert the object into a dict
+tenant_verify_cur_bucket_api_request_dict = tenant_verify_cur_bucket_api_request_instance.to_dict()
+# create an instance of TenantVerifyCurBucketAPIRequest from a dict
+tenant_verify_cur_bucket_api_request_form_dict = tenant_verify_cur_bucket_api_request.from_dict(tenant_verify_cur_bucket_api_request_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/TenantVerifyCurBucketRequest.md b/docs/TenantVerifyCurBucketRequest.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cur_bucket_config** | [**CurBucketConfig**](CurBucketConfig.md) | cur bucket config | 
 **cloud_id** | **str** | cloud id | 
+**tenant_id** | **str** | Tenant ID | 
 
 ## Example
 

diff --git a/docs/TenantVerifyServiceApi.md b/docs/TenantVerifyServiceApi.md
@@ -77,7 +77,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **verify_tenant_cur_bucket**
-> object verify_tenant_cur_bucket(request)
+> object verify_tenant_cur_bucket(tenant_verify_cur_bucket_request)
 
 Verify Tenant Cur Bucket
 
@@ -86,6 +86,7 @@ Verify Tenant Cur Bucket
 
 ```python
 import onelens_backend_client
+from onelens_backend_client.models.tenant_verify_cur_bucket_request import TenantVerifyCurBucketRequest
 from onelens_backend_client.rest import ApiException
 from pprint import pprint
 
@@ -100,11 +101,11 @@ configuration = onelens_backend_client.Configuration(
 with onelens_backend_client.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = onelens_backend_client.TenantVerifyServiceApi(api_client)
-    request = 'request_example' # str | 
+    tenant_verify_cur_bucket_request = onelens_backend_client.TenantVerifyCurBucketRequest() # TenantVerifyCurBucketRequest | 
 
     try:
         # Verify Tenant Cur Bucket
-        api_response = api_instance.verify_tenant_cur_bucket(request)
+        api_response = api_instance.verify_tenant_cur_bucket(tenant_verify_cur_bucket_request)
         print("The response of TenantVerifyServiceApi->verify_tenant_cur_bucket:\n")
         pprint(api_response)
     except Exception as e:
@@ -118,7 +119,7 @@ with onelens_backend_client.ApiClient(configuration) as api_client:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **request** | **str**|  | 
+ **tenant_verify_cur_bucket_request** | [**TenantVerifyCurBucketRequest**](TenantVerifyCurBucketRequest.md)|  | 
 
 ### Return type
 
@@ -130,7 +131,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 ### HTTP response details

diff --git a/docs/TenantsTenantProviderVerifyApi.md b/docs/TenantsTenantProviderVerifyApi.md
@@ -8,7 +8,7 @@ Method | Description
 
 
 # **verify_tenant_cur_bucket**
-> ResponseTenantVerifyCurBucketResponse verify_tenant_cur_bucket(tenant_id, tenant_verify_cur_bucket_request)
+> ResponseTenantVerifyCurBucketResponse verify_tenant_cur_bucket(tenant_id, tenant_verify_cur_bucket_api_request)
 
 Verify Tenant Cur Bucket
 
@@ -20,7 +20,7 @@ An API endpoint that verifies the tenant cur bucket.
 ```python
 import onelens_backend_client
 from onelens_backend_client.models.response_tenant_verify_cur_bucket_response import ResponseTenantVerifyCurBucketResponse
-from onelens_backend_client.models.tenant_verify_cur_bucket_request import TenantVerifyCurBucketRequest
+from onelens_backend_client.models.tenant_verify_cur_bucket_api_request import TenantVerifyCurBucketAPIRequest
 from onelens_backend_client.rest import ApiException
 from pprint import pprint
 
@@ -36,11 +36,11 @@ with onelens_backend_client.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = onelens_backend_client.TenantsTenantProviderVerifyApi(api_client)
     tenant_id = 'tenant_id_example' # str | 
-    tenant_verify_cur_bucket_request = onelens_backend_client.TenantVerifyCurBucketRequest() # TenantVerifyCurBucketRequest | 
+    tenant_verify_cur_bucket_api_request = onelens_backend_client.TenantVerifyCurBucketAPIRequest() # TenantVerifyCurBucketAPIRequest | 
 
     try:
         # Verify Tenant Cur Bucket
-        api_response = api_instance.verify_tenant_cur_bucket(tenant_id, tenant_verify_cur_bucket_request)
+        api_response = api_instance.verify_tenant_cur_bucket(tenant_id, tenant_verify_cur_bucket_api_request)
         print("The response of TenantsTenantProviderVerifyApi->verify_tenant_cur_bucket:\n")
         pprint(api_response)
     except Exception as e:
@@ -55,7 +55,7 @@ with onelens_backend_client.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **tenant_id** | **str**|  | 
- **tenant_verify_cur_bucket_request** | [**TenantVerifyCurBucketRequest**](TenantVerifyCurBucketRequest.md)|  | 
+ **tenant_verify_cur_bucket_api_request** | [**TenantVerifyCurBucketAPIRequest**](TenantVerifyCurBucketAPIRequest.md)|  | 
 
 ### Return type
 

diff --git a/onelens_backend_client/__init__.py b/onelens_backend_client/__init__.py
@@ -464,6 +464,8 @@
 from onelens_backend_client.models.tenant_policy import TenantPolicy
 from onelens_backend_client.models.tenant_policy_exclusions import TenantPolicyExclusions
 from onelens_backend_client.models.tenant_policy_filters import TenantPolicyFilters
+from onelens_backend_client.models.tenant_policy_for_policy_with_setting import TenantPolicyForPolicyWithSetting
+from onelens_backend_client.models.tenant_policy_for_policy_with_setting_services_inner import TenantPolicyForPolicyWithSettingServicesInner
 from onelens_backend_client.models.tenant_policy_settings import TenantPolicySettings
 from onelens_backend_client.models.tenant_policy_settings_filters import TenantPolicySettingsFilters
 from onelens_backend_client.models.tenant_policy_state import TenantPolicyState
@@ -482,6 +484,7 @@
 from onelens_backend_client.models.tenant_tickets_stats_metrics_sub_group_by import TenantTicketsStatsMetricsSubGroupBy
 from onelens_backend_client.models.tenant_user_details_update_fields_mixin import TenantUserDetailsUpdateFieldsMixin
 from onelens_backend_client.models.tenant_user_update_fields_mixin import TenantUserUpdateFieldsMixin
+from onelens_backend_client.models.tenant_verify_cur_bucket_api_request import TenantVerifyCurBucketAPIRequest
 from onelens_backend_client.models.tenant_verify_cur_bucket_request import TenantVerifyCurBucketRequest
 from onelens_backend_client.models.tenant_verify_cur_bucket_response import TenantVerifyCurBucketResponse
 from onelens_backend_client.models.tenant_verify_request_with_user import TenantVerifyRequestWithUser