diff --git a/.gitignore b/.gitignore index f62e0ca0a..8a3cb09aa 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,5 @@ target/ .ipynb_checkpoints config.json -api-specs/ \ No newline at end of file +api-specs/ +test.py \ No newline at end of file diff --git a/sailpoint/configuration.py b/sailpoint/configuration.py index dc0a56679..19fe45d06 100644 --- a/sailpoint/configuration.py +++ b/sailpoint/configuration.py @@ -33,6 +33,9 @@ def __init__(self, configurationParams: ConfigurationParams = None) -> None: if self.access_token == None: self.access_token = self.get_access_token(url, self.client_id, self.client_secret) + + self.experimental = False + self.temp_folder_path = None """Temp file folder for downloading files """ diff --git a/sdk-resources/postscript.js b/sdk-resources/postscript.js index 1072d23cf..ff3013e54 100644 --- a/sdk-resources/postscript.js +++ b/sdk-resources/postscript.js @@ -29,6 +29,9 @@ const fixFiles = function (myArray) { if (line.includes("from sailpoint.beta.models.dict[str,_object_export_import_options] import Dict[str, ObjectExportImportOptions]")) { fileOut.push(line.replaceAll("from sailpoint.beta.models.dict[str,_object_export_import_options] import Dict[str, ObjectExportImportOptions]", "")); madeChange = true; + } else if (line.includes("from sailpoint.v2024.models.dict[str,_object_export_import_options] import Dict[str, ObjectExportImportOptions]")) { + fileOut.push(line.replaceAll("from sailpoint.v2024.models.dict[str,_object_export_import_options] import Dict[str, ObjectExportImportOptions]", "")); + madeChange = true; } else { fileOut.push(line); } diff --git a/sdk-resources/resources/api_client.mustache b/sdk-resources/resources/api_client.mustache index cdb441d43..a13493d11 100644 --- a/sdk-resources/resources/api_client.mustache +++ b/sdk-resources/resources/api_client.mustache @@ -31,6 +31,17 @@ from {{packageName}}.exceptions import ( ServiceException ) +class bcolors: + HEADER = '\033[95m' + OKBLUE = '\033[94m' + OKCYAN = '\033[96m' + OKGREEN = '\033[92m' + WARNING = '\033[93m' + FAIL = '\033[91m' + ENDC = '\033[0m' + BOLD = '\033[1m' + UNDERLINE = '\033[4m' + class ApiClient: """Generic API client for OpenAPI client library builds. @@ -191,13 +202,12 @@ class ApiClient: # Add Authentication header to request header_params['Authorization'] = self.configuration.access_token - if self.configuration.experimental and 'X-SailPoint-Experimental' in header_params: - print("TESTING") - print(f"{bcolors.WARNING}Warning: No active frommets remain. Continue?{bcolors.ENDC}") + if not self.configuration.experimental and 'X-SailPoint-Experimental' in header_params: + del header_params['X-SailPoint-Experimental'] + print(f"{bcolors.WARNING}Warning: You are using Experimental APIs. Set configuration.experimental = True to enable these APIs in the SDK.{bcolors.ENDC}") pass elif self.configuration.experimental == True: - print(f"{bcolors.WARNING}Warning: No active frommets remain. Continue?{bcolors.ENDC}") - #del header_params['X-SailPoint-Experimental'] + print(f"{bcolors.WARNING}Warning: You are using Experimental APIs{bcolors.ENDC}") # path parameters if path_params: diff --git a/sdk-resources/resources/partial_api_args.mustache b/sdk-resources/resources/partial_api_args.mustache index 379b67de9..3244bdcbf 100644 --- a/sdk-resources/resources/partial_api_args.mustache +++ b/sdk-resources/resources/partial_api_args.mustache @@ -1,7 +1,14 @@ ( self, {{#allParams}} + {{^isHeaderParam}} {{paramName}}: {{{vendorExtensions.x-py-typing}}}{{^required}} = None{{/required}}, + {{/isHeaderParam}} + {{/allParams}} + {{#allParams}} + {{#isHeaderParam}} + {{paramName}}: {{{vendorExtensions.x-py-typing}}}{{#required}}{{#isHeaderParam}} = {{{defaultValue}}}{{/isHeaderParam}}{{/required}}{{^required}} = None{{/required}}, + {{/isHeaderParam}} {{/allParams}} _request_timeout: Union[ None,