ibm-cloud-sdk-core 3.24.2__tar.gz → 3.24.4__tar.gz

ibm_cloud_sdk_core-3.24.4/MANIFEST.in

@@ -0,0 +1,3 @@
+include LICENSE
+recursive-include resources *.crt *.env *.env.example *.key *.txt
+recursive-include test/utils *.py

{ibm_cloud_sdk_core-3.24.2/ibm_cloud_sdk_core.egg-info → ibm_cloud_sdk_core-3.24.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-cloud-sdk-core
-Version: 3.24.2
+Version: 3.24.4
 Summary: Core library used by SDKs for IBM Cloud Services
 Author-email: IBM <devxsdk@us.ibm.com>
 Project-URL: Repository, https://github.com/IBM/python-sdk-core
@@ -12,11 +12,11 @@ Project-URL: License, https://github.com/IBM/python-sdk-core/blob/main/LICENSE
 Keywords: ibm,cloud,ibm cloud services
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -25,13 +25,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests<3.0.0,>=2.32.4
 Requires-Dist: urllib3<3.0.0,>=2.4.0
 Requires-Dist: python_dateutil<3.0.0,>=2.9.0
-Requires-Dist: PyJWT<3.0.0,>=2.10.1
+Requires-Dist: PyJWT<3.0.0,>=2.11.0
 Provides-Extra: dev
 Requires-Dist: coverage<8.0.0,>=7.9.0; extra == "dev"
 Requires-Dist: pylint<4.0.0,>=3.3.7; extra == "dev"
@@ -50,12 +50,12 @@ Dynamic: license-file
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Python SDK Core Version 3.24.2
+# IBM Python SDK Core Version 3.24.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 
 # Python Version
-The current minimum Python version supported is 3.9.
+The current minimum Python version supported is 3.10.
 
 ## Installation
 
@@ -116,12 +116,12 @@ When running your application, you should see output like this if debug logging
 ```
 2024-09-16 15:44:45,174 [ibm-cloud-sdk-core:DEBUG] Get authenticator from environment, key=global_search
 2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set service URL: https://api.global-search-tagging.cloud.ibm.com
-2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
+2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Configuring BaseService instance with service name: global_search
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Performing synchronous token fetch
 2024-09-16 15:44:45,182 [ibm-cloud-sdk-core:DEBUG] Invoking IAM get_token operation: https://iam.cloud.ibm.com/identity/token
 2024-09-16 15:44:45,182 [urllib3.connectionpool:DEBUG] Starting new HTTPS connection (1): iam.cloud.ibm.com:443
-send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
+send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
 send: b'grant_type=urn%3Aibm%3Aparams%3Aoauth%3Agrant-type%3Aapikey&apikey=[redacted]&response_type=cloud_iam'
 reply: 'HTTP/1.1 200 OK\r\n'
 header: Content-Type: application/json

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4}/README.md

@@ -4,12 +4,12 @@
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Python SDK Core Version 3.24.2
+# IBM Python SDK Core Version 3.24.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 
 # Python Version
-The current minimum Python version supported is 3.9.
+The current minimum Python version supported is 3.10.
 
 ## Installation
 
@@ -70,12 +70,12 @@ When running your application, you should see output like this if debug logging
 ```
 2024-09-16 15:44:45,174 [ibm-cloud-sdk-core:DEBUG] Get authenticator from environment, key=global_search
 2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set service URL: https://api.global-search-tagging.cloud.ibm.com
-2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
+2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Configuring BaseService instance with service name: global_search
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Performing synchronous token fetch
 2024-09-16 15:44:45,182 [ibm-cloud-sdk-core:DEBUG] Invoking IAM get_token operation: https://iam.cloud.ibm.com/identity/token
 2024-09-16 15:44:45,182 [urllib3.connectionpool:DEBUG] Starting new HTTPS connection (1): iam.cloud.ibm.com:443
-send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
+send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
 send: b'grant_type=urn%3Aibm%3Aparams%3Aoauth%3Agrant-type%3Aapikey&apikey=[redacted]&response_type=cloud_iam'
 reply: 'HTTP/1.1 200 OK\r\n'
 header: Content-Type: application/json

ibm_cloud_sdk_core-3.24.4/ibm_cloud_sdk_core/version.py

@@ -0,0 +1 @@
+__version__ = '3.24.4'

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4/ibm_cloud_sdk_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-cloud-sdk-core
-Version: 3.24.2
+Version: 3.24.4
 Summary: Core library used by SDKs for IBM Cloud Services
 Author-email: IBM <devxsdk@us.ibm.com>
 Project-URL: Repository, https://github.com/IBM/python-sdk-core
@@ -12,11 +12,11 @@ Project-URL: License, https://github.com/IBM/python-sdk-core/blob/main/LICENSE
 Keywords: ibm,cloud,ibm cloud services
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -25,13 +25,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests<3.0.0,>=2.32.4
 Requires-Dist: urllib3<3.0.0,>=2.4.0
 Requires-Dist: python_dateutil<3.0.0,>=2.9.0
-Requires-Dist: PyJWT<3.0.0,>=2.10.1
+Requires-Dist: PyJWT<3.0.0,>=2.11.0
 Provides-Extra: dev
 Requires-Dist: coverage<8.0.0,>=7.9.0; extra == "dev"
 Requires-Dist: pylint<4.0.0,>=3.3.7; extra == "dev"
@@ -50,12 +50,12 @@ Dynamic: license-file
 [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/python-sdk-core)](https://cla-assistant.io/ibm/python-sdk-core)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Python SDK Core Version 3.24.2
+# IBM Python SDK Core Version 3.24.4
 This project contains core functionality required by Python code generated by the IBM Cloud OpenAPI SDK Generator
 (openapi-sdkgen).
 
 # Python Version
-The current minimum Python version supported is 3.9.
+The current minimum Python version supported is 3.10.
 
 ## Installation
 
@@ -116,12 +116,12 @@ When running your application, you should see output like this if debug logging
 ```
 2024-09-16 15:44:45,174 [ibm-cloud-sdk-core:DEBUG] Get authenticator from environment, key=global_search
 2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set service URL: https://api.global-search-tagging.cloud.ibm.com
-2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
+2024-09-16 15:44:45,175 [ibm-cloud-sdk-core:DEBUG] Set User-Agent: ibm-python-sdk-core-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Configuring BaseService instance with service name: global_search
 2024-09-16 15:44:45,181 [ibm-cloud-sdk-core:DEBUG] Performing synchronous token fetch
 2024-09-16 15:44:45,182 [ibm-cloud-sdk-core:DEBUG] Invoking IAM get_token operation: https://iam.cloud.ibm.com/identity/token
 2024-09-16 15:44:45,182 [urllib3.connectionpool:DEBUG] Starting new HTTPS connection (1): iam.cloud.ibm.com:443
-send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.2 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
+send: b'POST /identity/token HTTP/1.1\r\nHost: iam.cloud.ibm.com\r\nUser-Agent: ibm-python-sdk-core/iam-authenticator-3.24.4 os.name=Linux os.version=6.10.9-100.fc39.x86_64 python.version=3.12.5\r\nAccept-Encoding: gzip, deflate\r\nAccept: application/json\r\nConnection: keep-alive\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 135\r\n\r\n'
 send: b'grant_type=urn%3Aibm%3Aparams%3Aoauth%3Agrant-type%3Aapikey&apikey=[redacted]&response_type=cloud_iam'
 reply: 'HTTP/1.1 200 OK\r\n'
 header: Content-Type: application/json

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4}/ibm_cloud_sdk_core.egg-info/SOURCES.txt

@@ -41,6 +41,24 @@ ibm_cloud_sdk_core/token_managers/mcsp_token_manager.py
 ibm_cloud_sdk_core/token_managers/mcspv2_token_manager.py
 ibm_cloud_sdk_core/token_managers/token_manager.py
 ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py
+resources/cr-token.txt
+resources/ibm-credentials-basic.env
+resources/ibm-credentials-bearer.env
+resources/ibm-credentials-container.env
+resources/ibm-credentials-cp4d.env
+resources/ibm-credentials-cp4dtest.env.example
+resources/ibm-credentials-external.env
+resources/ibm-credentials-gzip.env
+resources/ibm-credentials-iam-assume.env
+resources/ibm-credentials-iam.env
+resources/ibm-credentials-mcsp.env
+resources/ibm-credentials-mcspv2.env
+resources/ibm-credentials-no-auth.env
+resources/ibm-credentials-retry.env
+resources/ibm-credentials-vpc.env
+resources/ibm-credentials.env
+resources/test_ssl.crt
+resources/test_ssl.key
 test/test_api_exception.py
 test/test_authenticator.py
 test/test_base_service.py
@@ -66,4 +84,7 @@ test/test_no_auth_authenticator.py
 test/test_token_manager.py
 test/test_utils.py
 test/test_vpc_instance_authenticator.py
-test/test_vpc_instance_token_manager.py
+test/test_vpc_instance_token_manager.py
+test/utils/__init__.py
+test/utils/http_utils.py
+test/utils/logger_utils.py

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4}/ibm_cloud_sdk_core.egg-info/requires.txt

@@ -1,7 +1,7 @@
 requests<3.0.0,>=2.32.4
 urllib3<3.0.0,>=2.4.0
 python_dateutil<3.0.0,>=2.9.0
-PyJWT<3.0.0,>=2.10.1
+PyJWT<3.0.0,>=2.11.0
 
 [dev]
 coverage<8.0.0,>=7.9.0

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4}/pyproject.toml

@@ -1,20 +1,20 @@
 [project]
 name = "ibm-cloud-sdk-core"
-version = "3.24.2"
+version = "3.24.4"
 authors = [
     { name="IBM", email="devxsdk@us.ibm.com" }
 ]
 description = "Core library used by SDKs for IBM Cloud Services"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Intended Audience :: Developers",
@@ -29,7 +29,7 @@ dependencies = [
     "requests>=2.32.4,<3.0.0",
     "urllib3>=2.4.0,<3.0.0",
     "python_dateutil>=2.9.0,<3.0.0",
-    "PyJWT>=2.10.1,<3.0.0",
+    "PyJWT>=2.11.0,<3.0.0",
 ]
 
 [project.urls]

ibm_cloud_sdk_core-3.24.4/resources/cr-token.txt

@@ -0,0 +1 @@
+cr-token-1

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-basic.env

@@ -0,0 +1,3 @@
+WATSON_USERNAME=my_username
+WATSON_PASSWORD=my_password
+WATSON_AUTHTYPE=basic

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-bearer.env

@@ -0,0 +1,2 @@
+WATSON_BEARER_TOKEN=my_token
+WATSON_AUTHTYPE=bearerToken

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-container.env

@@ -0,0 +1,13 @@
+SERVICE_1_AUTH_TYPE=container
+SERVICE_1_CR_TOKEN_FILENAME=crtoken.txt
+SERVICE_1_IAM_PROFILE_NAME=iam-user-123
+SERVICE_1_IAM_PROFILE_ID=iam-id-123
+SERVICE_1_AUTH_URL=https://iamhost/iam/api
+SERVICE_1_SCOPE=scope1
+SERVICE_1_CLIENT_ID=iam-client-123
+SERVICE_1_CLIENT_SECRET=iam-secret-123
+SERVICE_1_AUTH_DISABLE_SSL=true
+
+SERVICE_2_AUTH_TYPE=container
+SERVICE_2_IAM_PROFILE_NAME=iam-user-123
+SERVICE_2_AUTH_DISABLE_SSL=false

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-cp4d.env

@@ -0,0 +1,6 @@
+WATSON_USERNAME=my_username
+WATSON_PASSWORD=my_password
+WATSON_AUTH_URL=https://my_url
+WATSON_AUTH_TYPE=cp4d
+WATSON_AUTH_DISABLE_SSL=False
+WATSON_DISABLE_SSL=True

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-cp4dtest.env.example

@@ -0,0 +1,11 @@
+CP4D_PASSWORD_TEST_AUTH_URL=<url>   e.g. https://cpd350-cpd-cpd350.apps.wml-kf-cluster.os.fyre.ibm.com/icp4d-api
+CP4D_PASSWORD_TEST_AUTH_TYPE=cp4d
+CP4D_PASSWORD_TEST_USERNAME=<username>
+CP4D_PASSWORD_TEST_PASSWORD=<password>
+CP4D_PASSWORD_TEST_AUTH_DISABLE_SSL=true
+
+CP4D_APIKEY_TEST_AUTH_URL=<url>   e.g. https://cpd350-cpd-cpd350.apps.wml-kf-cluster.os.fyre.ibm.com/icp4d-api
+CP4D_APIKEY_TEST_AUTH_TYPE=cp4d
+CP4D_APIKEY_TEST_USERNAME=<username>
+CP4D_APIKEY_TEST_APIKEY=<apikey>
+CP4D_APIKEY_TEST_AUTH_DISABLE_SSL=true  

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-external.env

@@ -0,0 +1,4 @@
+INCLUDE_EXTERNAL_CONFIG_APIKEY=5678efgh
+INCLUDE_EXTERNAL_CONFIG_AUTH_TYPE=iam
+INCLUDE_EXTERNAL_CONFIG_URL=https://externallyconfigured.com/api
+INCLUDE_EXTERNAL_CONFIG_DISABLE_SSL=True

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-gzip.env

@@ -0,0 +1,4 @@
+INCLUDE_EXTERNAL_CONFIG_APIKEY=mockkey
+INCLUDE_EXTERNAL_CONFIG_AUTH_TYPE=iam
+INCLUDE_EXTERNAL_CONFIG_URL=https://mockurl
+INCLUDE_EXTERNAL_CONFIG_ENABLE_GZIP=True

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-iam-assume.env

@@ -0,0 +1,5 @@
+SERVICE_1_AUTH_TYPE=iamAssume
+SERVICE_1_APIKEY=my-api-key
+SERVICE_1_IAM_PROFILE_ID=iam-profile-1
+SERVICE_1_URL=https://iamhost/iamassume/api
+SERVICE_1_DISABLE_SSL=True

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-iam.env

@@ -0,0 +1,4 @@
+IBM_WATSON_APIKEY=5678efgh
+IBM_WATSON_AUTH_TYPE=iam
+IBM_WATSON_URL=https://gateway-s.watsonplatform.net/watson/api
+IBM_WATSON_DISABLE_SSL=False

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-mcsp.env

@@ -0,0 +1,3 @@
+SERVICE1_AUTH_TYPE=mcsp
+SERVICE1_APIKEY=my-api-key
+SERVICE1_AUTH_URL=https://mcsp.ibm.com

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-mcspv2.env

@@ -0,0 +1,27 @@
+# MCSP v2 with only required properties
+SERVICE1_AUTH_TYPE=mcspv2
+SERVICE1_APIKEY=my-api-key
+SERVICE1_AUTH_URL=https://mcspv2.ibm.com
+SERVICE1_SCOPE_COLLECTION_TYPE=accounts
+SERVICE1_SCOPE_ID=global_account
+
+# MCSP v2 with all properties
+SERVICE2_AUTH_TYPE=mcspv2
+SERVICE2_APIKEY=my-api-key
+SERVICE2_AUTH_URL=https://mcspv2.ibm.com
+SERVICE2_SCOPE_COLLECTION_TYPE=accounts
+SERVICE2_SCOPE_ID=global_account
+SERVICE2_INCLUDE_BUILTIN_ACTIONS=true
+SERVICE2_INCLUDE_CUSTOM_ACTIONS=true
+SERVICE2_INCLUDE_ROLES=false
+SERVICE2_PREFIX_ROLES=true
+SERVICE2_CALLER_EXT_CLAIM={"productID": "prod-123"}
+SERVICE2_AUTH_DISABLE_SSL=true
+
+# MCSP v with error config
+ERROR1_AUTH_TYPE=mcspv2
+ERROR1_APIKEY=my-api-key
+ERROR1_AUTH_URL=https://mcspv2.ibm.com
+ERROR1_SCOPE_COLLECTION_TYPE=accounts
+ERROR1_SCOPE_ID=global_account
+ERROR1_CALLER_EXT_CLAIM={not json}

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-no-auth.env

@@ -0,0 +1 @@
+WATSON_AUTH_TYPE=noAuth

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-retry.env

@@ -0,0 +1,6 @@
+INCLUDE_EXTERNAL_CONFIG_APIKEY=mockkey
+INCLUDE_EXTERNAL_CONFIG_AUTH_TYPE=iam
+INCLUDE_EXTERNAL_CONFIG_URL=https://mockurl
+INCLUDE_EXTERNAL_CONFIG_MAX_RETRIES=3
+INCLUDE_EXTERNAL_CONFIG_RETRY_INTERVAL=25.0
+INCLUDE_EXTERNAL_CONFIG_ENABLE_RETRIES=true

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials-vpc.env

@@ -0,0 +1,11 @@
+# VPC auth with default config
+SERVICE1_AUTH_TYPE=vpc
+
+# VPC auth with profile CRN
+SERVICE2_AUTH_TYPE=vpc
+SERVICE2_IAM_PROFILE_CRN=crn:iam-profile1
+SERVICE2_AUTH_URL=http://vpc.imds.com/api
+
+# VPC auth with profile ID
+SERVICE3_AUTH_TYPE=vpc
+SERVICE3_IAM_PROFILE_ID=iam-profile1-id

ibm_cloud_sdk_core-3.24.4/resources/ibm-credentials.env

@@ -0,0 +1,21 @@
+IBM_WATSON_APIKEY=5678efgh
+IBM_WATSON_AUTH_TYPE=iam
+IBM_WATSON_URL=https://cwdserviceurl
+IBM_WATSON_DISABLE_SSL=False
+
+# Service1 auth properties configured with IAM and a token containing '='
+SERVICE_1_AUTH_TYPE=iam
+SERVICE_1_APIKEY=V4HXmoUtMjohnsnow=KotN
+SERVICE_1_CLIENT_ID=somefake========id
+SERVICE_1_CLIENT_SECRET===my-client-secret==
+SERVICE_1_AUTH_URL=https://iamhost/iam/api=
+SERVICE_1_URL=service1.com/api
+
+# Service2 configured with IAM w/scope
+SERVICE_2_AUTH_TYPE=iam
+SERVICE_2_APIKEY=V4HXmoUtMjohnsnow=KotN
+SERVICE_2_CLIENT_ID=somefake========id
+SERVICE_2_CLIENT_SECRET===my-client-secret==
+SERVICE_2_AUTH_URL=https://iamhost/iam/api=
+SERVICE_2_URL=service1.com/api
+SERVICE_2_SCOPE=A B C D

ibm_cloud_sdk_core-3.24.4/resources/test_ssl.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDETCCAfmgAwIBAgIUVQfATsBxBkHqAgmrv9Eb/KQhA2IwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTI0MDcwMjA5MTkyN1oYDzIxMjQw
+NjA4MDkxOTI3WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCx7eyXu0A1IH18U0fmVbHlC0OpzpGfGOQayrlrxyxN
+kNc8T2ehnt7W33FHI2tjcmO11wgsN+U2+uB2aq0q1OYaqo3OlZtTF4A91CgAdbGd
+Ix5aEEzjogiQIBvrBQhaU6uFTzUBQ5tWs+pLcorVrp8G/ONN/1e4Z3NCg036ibSs
+Vkfdw1zX6vTR674uTq8aIG7sH3DCF1Q+CzvxhQrhjkZOha+u0H+OhZ9yd30hU/xy
+AKZsoGHNY65bVSYAPxP6XLw5inF534TLriggFDonEk16eHjAi7SxcjdKcyxhfX7u
+DefD/s9cKUY4Tf1JeAx2F1Y++ffqWlQSde5DKkfC6xU5AgMBAAGjWTBXMBQGA1Ud
+EQQNMAuCCWxvY2FsaG9zdDALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFIHsshXxnhcdXRSPxHvTvfMWhfTgMA0GCSqGSIb3DQEBCwUA
+A4IBAQCnEU3NtmskVv2/3U0DQM8FM8jKc/V7WCfK/PWPFUZgCkj8pUg4yYxjOZ4K
+pFV7cPJjtArmjyU9lB0g2wQvlpXEYbDJ5K0LK9GsdhowZQatZaTB0nVZeG87mlV7
+kxrQTMsMTYf5I6S3SW63SorlJQiuaQjOKwvommCS+6Q5goEOodZpGr+5sQSuRLlw
+XMKzcU7ZDfe1jidjjcWSyf6UMKB/mhMQVMTTDURt/jS7koA5lXiU+m0XCSi28wTr
+lV9ZRzZiE4mRDANlEkoqUCYPG/PDF0KOgDROiavlrBcBycsqBD5iRdGYGaYwUmSo
+UpaVGGLYBguqwEeQ2ixC2rTGkyg7
+-----END CERTIFICATE-----

ibm_cloud_sdk_core-3.24.4/resources/test_ssl.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCx7eyXu0A1IH18
+U0fmVbHlC0OpzpGfGOQayrlrxyxNkNc8T2ehnt7W33FHI2tjcmO11wgsN+U2+uB2
+aq0q1OYaqo3OlZtTF4A91CgAdbGdIx5aEEzjogiQIBvrBQhaU6uFTzUBQ5tWs+pL
+corVrp8G/ONN/1e4Z3NCg036ibSsVkfdw1zX6vTR674uTq8aIG7sH3DCF1Q+Czvx
+hQrhjkZOha+u0H+OhZ9yd30hU/xyAKZsoGHNY65bVSYAPxP6XLw5inF534TLrigg
+FDonEk16eHjAi7SxcjdKcyxhfX7uDefD/s9cKUY4Tf1JeAx2F1Y++ffqWlQSde5D
+KkfC6xU5AgMBAAECggEABbqBSYlP0eYP5DbSM8pChftM3GS4L4UfovUv7xZkiMLH
+CzwLPBrfVc+v1/h99p+yMiKQMsxB5vlAzM82cBCWr/kZw7LxY0V4bYUtHIathz+g
+NIodz55h5DIEdBafZDkZZptcO4QvtiTowDEZ4zNSD2mI7/PuoRNDlLqhghV46at3
+nfJmOgbWxzciOhpYUXtXl1+n1ywkXIbL58sfp5HgkuM9dL2BTZQdUwbS58TgyYla
+DBYZQfiZ+MgrCqJKCYEy+lycVHz9LaSCVXgEYmstfcLqdC7X3/nQuUn587rV5FDA
+75bDZ7r2jvrQT7/MEGm3b2fgk0+0gMew52wrDsncuQKBgQDygvVlm6BU2cIm8qvR
+l1LqU06jbEVW2fzrXi73RVgCR+ZQoy+hB8LviqNO0ayAOWIH/6iMGU09bK72DlJ0
+K4P58X6iJaop1ntdYa2DApPzrz3/4weMl4ZVjz5tPBUxhkfJCMfZF2q+CoHOsdlQ
+rTXNFQgfq4XNGpj3YX0L94pkgwKBgQC702bRFk7lHoMyn8hs8MQqumSsefpTsc6v
+3fLl6DgwhU9/FAEymIt+wEIchoU0GkVfZ16OmO1whZAgj3zsBr/zG7C7Din9s7hB
+KV57o7KIRP3IUo+N6qQ2xNPG8lrCd7Xz+430RHT5BRudqNXWsZziFOrPXZz7Yh8/
+TMy4ZwzKkwKBgQCOTToh/Uf/gifjItKfkeQdi/TBAG9Pn2pB0mpMvmv+KqKC/r6c
+Bynj1b4uKerG8uULPIFydAZW3MdtqsnHUSGIMKTWELPhCPIqwX5HOeQHQfVniZiM
+bv1shzlib7cf8GN/G5/pS0xfZ1r0JngWVw0S4hx6OPOyfsDzqEjwFLkocQKBgBOQ
+2xYO19sgSZR9dph6oES/M/uPnVcYn6pMWaA/h5LuYDChudo2b9mdV4W3MasSzYU5
+tGzwW1OsZi4uJFpF/brqeIeT2yX1kc0f7Rq+G7v8S9+RUij7d23JJTKFTpUReV/Y
+JZp7gx/pu026J8R8rhYTDb7aRp8dQpoKewz+lyOHAoGAUGOfsLybzE2w/gL1gZ8W
+L6sdkQ7zq/IF04cqM5jw1g82f9CGdZlWrT6wv5D++O9zpZSmuwJ2p/os5Tsygmb4
+M0IjG23Mw5IWLCC6n2riYwpQ8sjuL3SOhqgt4k5mnu4H0RpVLz69JPBJkaGuE1Ld
+k4zeVfI1+X2clcHVfDS6xhc=
+-----END PRIVATE KEY-----

{ibm_cloud_sdk_core-3.24.2 → ibm_cloud_sdk_core-3.24.4}/test/test_base_service.py

@@ -605,7 +605,7 @@ def test_http_client():
     auth = BasicAuthenticator('my_username', 'my_password')
     service = AnyServiceV1('2018-11-20', authenticator=auth)
     assert isinstance(service.get_http_client(), requests.sessions.Session)
-    assert service.get_http_client().headers.get('Accept-Encoding') == 'gzip, deflate'
+    assert service.get_http_client().headers.get('Accept-Encoding').startswith('gzip, deflate')
 
     new_http_client = requests.Session()
     new_http_client.headers.update({'Accept-Encoding': 'gzip'})
@@ -677,7 +677,6 @@ def test_gzip_compression():
 def test_gzip_compression_file_input():
     service = AnyServiceV1('2018-11-20', authenticator=NoAuthAuthenticator())
     service.set_enable_gzip_compression(True)
-
     # Should return file-like object with the compressed data when compression is on
     # and the input is a file, opened for reading in binary mode.
     raw_data = b'rawdata'
@@ -686,7 +685,7 @@ def test_gzip_compression_file_input():
         tmp_file.seek(0)
 
         prepped = service.prepare_request('GET', url='', data=tmp_file)
-        assert prepped['data'].read() == gzip.compress(raw_data)
+        assert prepped['data'].read() == gzip.compress(raw_data, mtime=None)
         assert prepped['headers'].get('content-encoding') == 'gzip'
         assert prepped['data'].read() == b''
 
@@ -694,13 +693,12 @@ def test_gzip_compression_file_input():
     with tempfile.TemporaryFile(mode='w+b') as tmp_file:
         tmp_file.write(raw_data)
         tmp_file.seek(0)
-
         prepped = service.prepare_request('GET', url='', data=tmp_file)
         compressed = b''
         for chunk in prepped['data']:
             compressed += chunk
 
-        assert compressed == gzip.compress(raw_data)
+        assert compressed == gzip.compress(raw_data, mtime=None)
 
     # Make sure the decompression works fine.
     assert gzip.decompress(compressed) == raw_data
@@ -714,7 +712,7 @@ def test_gzip_compression_file_input():
         tmp_file.seek(0)
 
         prepped = service.prepare_request('GET', url='', data=tmp_file)
-        assert prepped['data'].read() == gzip.compress(text_data.encode())
+        assert prepped['data'].read() == gzip.compress(text_data.encode(), mtime=None)
         assert prepped['headers'].get('content-encoding') == 'gzip'
         assert prepped['data'].read() == b''
 
@@ -722,13 +720,12 @@ def test_gzip_compression_file_input():
     with tempfile.TemporaryFile(mode='w+') as tmp_file:
         tmp_file.write(text_data)
         tmp_file.seek(0)
-
         prepped = service.prepare_request('GET', url='', data=tmp_file)
         compressed = b''
         for chunk in prepped['data']:
             compressed += chunk
 
-        assert compressed == gzip.compress(text_data.encode())
+        assert compressed == gzip.compress(text_data.encode(), mtime=None)
 
     # Make sure the decompression works fine.
     assert gzip.decompress(compressed).decode() == text_data

ibm_cloud_sdk_core-3.24.4/test/utils/http_utils.py

@@ -0,0 +1,66 @@
+# coding: utf-8
+
+# Copyright 2024 IBM All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import functools
+import threading
+import warnings
+from typing import Callable, Optional
+from http.server import HTTPServer, SimpleHTTPRequestHandler
+from ssl import SSLContext
+
+import urllib3
+
+
+def local_server(
+    port: int, tls_version: Optional[int] = None, cert: Optional[str] = None, key: Optional[str] = None
+) -> Callable:
+    """local_server helps setting up and running an HTTP(S) server for testing purposes."""
+
+    def decorator(test_function: Callable) -> Callable:
+        @functools.wraps(test_function)
+        def inner(*args, **kwargs):
+            is_https = tls_version and cert and key
+            # Disable warnings caused by the self-signed certificate.
+            urllib3.disable_warnings()
+
+            if is_https:
+                # Build the SSL context for the server.
+                ssl_context = SSLContext(tls_version)
+                ssl_context.load_cert_chain(certfile=cert, keyfile=key)
+
+            # Create and start the server on a separate thread.
+            server = HTTPServer(('localhost', port), SimpleHTTPRequestHandler)
+            if is_https:
+                server.socket = ssl_context.wrap_socket(server.socket, server_side=True)
+
+            t = threading.Thread(target=server.serve_forever)
+            t.start()
+
+            # We run everything in a big try-except-finally block to make sure we always
+            # shutdown the HTTP server gracefully.
+            try:
+                test_function(*args, **kwargs)
+            except Exception:  # pylint: disable=try-except-raise
+                raise
+            finally:
+                server.shutdown()
+                t.join()
+                # Re-enable warnings.
+                warnings.resetwarnings()
+
+        return inner
+
+    return decorator

ibm_cloud_sdk_core-3.24.4/test/utils/logger_utils.py

@@ -0,0 +1,34 @@
+# coding: utf-8
+
+# Copyright 2024 IBM All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+from http import client
+from ibm_cloud_sdk_core.logger import (
+    get_logger,
+    LoggingFilter,
+)
+
+
+def setup_test_logger(level: int):
+    """Sets up logging with the specified logging level to assist testcases."""
+    logging.basicConfig(level=level, format='%(asctime)s [%(name)s:%(levelname)s] %(message)s', force=True)
+    logger = get_logger()
+    logger.setLevel(level)
+
+    # If debug logging is requested, then trigger HTTP message logging as well.
+    if logger.isEnabledFor(logging.DEBUG):
+        client.HTTPConnection.debuglevel = 1
+        client.print = lambda *args: logger.debug(LoggingFilter.filter_message(" ".join(args)))

ibm_cloud_sdk_core-3.24.2/MANIFEST.in

@@ -1 +0,0 @@
-include LICENSE

ibm_cloud_sdk_core-3.24.2/ibm_cloud_sdk_core/version.py

@@ -1 +0,0 @@
-__version__ = '3.24.2'