volcengine-python-sdk 4.0.21__py2.py3-none-any.whl → 4.0.22__py2.py3-none-any.whl

volcenginesdkcloudmonitor/models/update_webhook_request.py

@@ -0,0 +1,205 @@
+# coding: utf-8
+
+"""
+    cloudmonitor
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: common-version
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from volcenginesdkcore.configuration import Configuration
+
+
+class UpdateWebhookRequest(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'id': 'str',
+        'name': 'str',
+        'type': 'str',
+        'url': 'str'
+    }
+
+    attribute_map = {
+        'id': 'Id',
+        'name': 'Name',
+        'type': 'Type',
+        'url': 'Url'
+    }
+
+    def __init__(self, id=None, name=None, type=None, url=None, _configuration=None):  # noqa: E501
+        """UpdateWebhookRequest - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._id = None
+        self._name = None
+        self._type = None
+        self._url = None
+        self.discriminator = None
+
+        self.id = id
+        self.name = name
+        self.type = type
+        self.url = url
+
+    @property
+    def id(self):
+        """Gets the id of this UpdateWebhookRequest.  # noqa: E501
+
+
+        :return: The id of this UpdateWebhookRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this UpdateWebhookRequest.
+
+
+        :param id: The id of this UpdateWebhookRequest.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this UpdateWebhookRequest.  # noqa: E501
+
+
+        :return: The name of this UpdateWebhookRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this UpdateWebhookRequest.
+
+
+        :param name: The name of this UpdateWebhookRequest.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def type(self):
+        """Gets the type of this UpdateWebhookRequest.  # noqa: E501
+
+
+        :return: The type of this UpdateWebhookRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this UpdateWebhookRequest.
+
+
+        :param type: The type of this UpdateWebhookRequest.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+
+        self._type = type
+
+    @property
+    def url(self):
+        """Gets the url of this UpdateWebhookRequest.  # noqa: E501
+
+
+        :return: The url of this UpdateWebhookRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url):
+        """Sets the url of this UpdateWebhookRequest.
+
+
+        :param url: The url of this UpdateWebhookRequest.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and url is None:
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
+
+        self._url = url
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UpdateWebhookRequest, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UpdateWebhookRequest):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, UpdateWebhookRequest):
+            return True
+
+        return self.to_dict() != other.to_dict()

volcenginesdkcloudmonitor/models/update_webhook_response.py

@@ -0,0 +1,123 @@
+# coding: utf-8
+
+"""
+    cloudmonitor
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: common-version
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from volcenginesdkcore.configuration import Configuration
+
+
+class UpdateWebhookResponse(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'data': 'list[str]'
+    }
+
+    attribute_map = {
+        'data': 'Data'
+    }
+
+    def __init__(self, data=None, _configuration=None):  # noqa: E501
+        """UpdateWebhookResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._data = None
+        self.discriminator = None
+
+        if data is not None:
+            self.data = data
+
+    @property
+    def data(self):
+        """Gets the data of this UpdateWebhookResponse.  # noqa: E501
+
+
+        :return: The data of this UpdateWebhookResponse.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._data
+
+    @data.setter
+    def data(self, data):
+        """Sets the data of this UpdateWebhookResponse.
+
+
+        :param data: The data of this UpdateWebhookResponse.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._data = data
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UpdateWebhookResponse, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UpdateWebhookResponse):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, UpdateWebhookResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()

volcenginesdkcore/api_client.py

@@ -3,7 +3,6 @@
 from __future__ import absolute_import
 
 import datetime
-import logging
 from multiprocessing.pool import ThreadPool
 from time import sleep
 
@@ -17,9 +16,7 @@ from volcenginesdkcore.interceptor import BuildRequestInterceptor, SignRequestIn
 from volcenginesdkcore.interceptor import DeserializedResponseInterceptor
 from volcenginesdkcore.interceptor import InterceptorChain, InterceptorContext
 from volcenginesdkcore.interceptor import Request, Response
-
-logger = logging.getLogger(__name__)
-
+from volcenginesdkcore.observability.debugger import sdk_core_logger, LogLevel
 
 class ApiClient(object):
     """Generic API client for Swagger client library builds.
@@ -67,7 +64,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/4.0.21'
+        self.user_agent = 'volcstack-python-sdk/4.0.22'
         self.client_side_validation = configuration.client_side_validation
 
         self.interceptor_chain = InterceptorChain()
@@ -126,6 +123,8 @@ class ApiClient(object):
 
         interceptor_context = self.interceptor_chain.execute_request(interceptor_context)
 
+        self._log_config(interceptor_context.get_request())
+
         retry_count = 0
         response_data = None
         retry_err = None
@@ -145,7 +144,7 @@ class ApiClient(object):
                     _request_timeout=interceptor_context.request.request_timeout)
                 self.last_response = response_data
             except Exception as e:
-                logger.warning("request error: {}".format(e))
+                sdk_core_logger.warning("request error: {}".format(e))
                 retry_err = e
                 if retry_count >= num_max_retries:
                     raise e
@@ -171,7 +170,7 @@ class ApiClient(object):
             delay = retryer.get_backoff_delay(retry_count)
             sleep(delay / 1000)
             if self.configuration.debug:
-                logger.debug(
+                sdk_core_logger.debug_config(
                     "retry backoff strategy:%s, retry condition: %s, max retry count:%d, current retry count: %d, retry delay(ms):%f",
                     type(retryer.backoff_strategy).__name__, type(retryer.retry_condition).__name__,
                     retryer.num_max_retries, retry_count + 1, delay)
@@ -331,6 +330,74 @@ class ApiClient(object):
         else:
             return content_types[0]
 
+    def _log_config(self, request):
+
+        if not sdk_core_logger.is_enabled_for_loglevel(LogLevel.LOG_DEBUG_WITH_CONFIG):
+            return
+
+        sb = []
+
+        sb.append("SDK Version        : ")
+        sb.append(self.user_agent + "\n")
+
+        # 连接池配置
+        sb.append("[Connection Pool]" + "\n")
+        sb.append("  Number of pools           : ")
+        sb.append(str(self.configuration.num_pools) + "\n")
+        sb.append("  Connection pool maxsize   : ")
+        sb.append(str(self.configuration.connection_pool_maxsize) + "\n")
+
+        # SSL设置
+        sb.append("[Scheme]" + "\n")
+        sb.append("  Scheme      : ")
+        sb.append(str(request.scheme) + "\n")
+
+        # 代理设置（隐藏部分信息避免敏感泄露）
+        sb.append("[Proxy]" + "\n");
+        sb.append("  HTTP Proxy       : ")
+        sb.append(str(self.configuration.http_proxy) + "\n")
+        sb.append("  HTTPS Proxy      : ")
+        sb.append(str(self.configuration.https_proxy) + "\n")
+
+        # 超时设置
+        sb.append("[Timeout]" + "\n");
+        sb.append("  Connect Timeout(ms)  : ")
+        sb.append(str(self.configuration.connect_timeout) + "\n")
+        sb.append("  Read Timeout(ms)     : ")
+        sb.append(str(self.configuration.read_timeout) + "\n")
+
+        # 重试设置
+        sb.append("[Retry]" + "\n");
+        sb.append("  Auto Retry       : ")
+        sb.append(str(request.auto_retry) + "\n")
+        if request.auto_retry and request.retryer is not None:
+            sb.append("  Max Retries      : ")
+            sb.append(str(request.retryer.num_max_retries) + "\n")
+            sb.append("  Min Delay (ms)   : ")
+            sb.append(str(request.retryer.backoff_strategy.min_retry_delay_ms) + "\n")
+            sb.append("  Max Delay (ms)   : ")
+            sb.append(str(request.retryer.backoff_strategy.max_retry_delay_ms) + "\n")
+            sb.append("  Retry Condition  : ")
+            sb.append(type(request.retryer.retry_condition).__name__ if request.retryer.retry_condition is not None else "None" + "\n")
+            sb.append("  Backoff Strategy : ")
+            sb.append(type(request.retryer.backoff_strategy).__name__ if request.retryer.backoff_strategy is not None else "None" + "\n")
+            sb.append("  Retry ErrorCodes : ")
+            sb.append(str(request.retryer.retry_condition.retry_error_codes) + "\n")
+
+        # EndpointResolver设置
+        sb.append("[Endpoint Resolver]" + "\n")
+        sb.append("  Region           : ")
+        sb.append(str(request.region) + "\n")
+        sb.append("  Endpoint         : ")
+        sb.append(str(request.host) + "\n")
+        sb.append("  Use DualStack    : ")
+        sb.append(str(request.use_dual_stack) + "\n")
+        sb.append("  Bootstrap Region : ")
+        sb.append(str(request.custom_bootstrap_region) + "\n")
+        sb.append("  Resolver Class   : ")
+        sb.append(type(request.endpoint_provider).__name__ if request.endpoint_provider is not None else "None" + "\n")
+
+        sdk_core_logger.debug_config("".join(sb))
 
 def metadata(self):
     return self._metadata

volcenginesdkcore/auth/__init__.py

@@ -1,2 +1,2 @@
 from .credential import Credential
-from .providers import StsCredentialProvider, StaticCredentialProvider
+from .providers import StsCredentialProvider, StsOidcCredentialProvider,StaticCredentialProvider

volcenginesdkcore/auth/providers/__init__.py

@@ -1,2 +1,4 @@
 from .static_provider import StaticCredentialProvider
 from .sts_provider import StsCredentialProvider
+from .sts_oidc_provider import StsOidcCredentialProvider
+from .sts_saml_provider import StsSamlCredentialProvider

volcenginesdkcore/auth/providers/provider.py

@@ -23,3 +23,7 @@ class Provider(object):
     @abc.abstractmethod
     def refresh(self):
         raise NotImplementedError()
+
+    @abc.abstractmethod
+    def get_credentials(self):
+        raise NotImplementedError()

volcenginesdkcore/auth/providers/sts_oidc_provider.py

@@ -0,0 +1,96 @@
+import threading
+import time
+import uuid
+from datetime import datetime
+
+import dateutil.parser
+
+from volcenginesdkcore import UniversalApi, UniversalInfo, ApiClient, Configuration
+from .provider import Provider, CredentialValue
+
+
+class AssumeRoleOidcCredentials:
+    def __init__(self, ak, sk, session_token, current_time, expired_time):
+        self.ak = ak
+        self.sk = sk
+        self.session_token = session_token
+        self.current_time = current_time
+        self.expired_time = expired_time
+
+
+class StsOidcCredentialProvider(Provider):
+    def __init__(self, role_name, account_id, oidc_token, duration_seconds=3600, scheme='https',
+                 host='sts.volcengineapi.com', region='cn-beijing', timeout=30, expired_buffer_seconds=60, policy=None):
+
+        self.role_name = role_name
+        self.account_id = account_id
+        self.oidc_token = oidc_token
+
+        self.timeout = timeout
+        self.duration_seconds = duration_seconds
+
+        self.host = host
+        self.region = region
+        self.scheme = scheme
+        self.policy = policy
+        self.expired_time = None
+        if expired_buffer_seconds > 600:
+            raise ValueError('expired_buffer_seconds must be less than or equal to 600')
+        self.expired_buffer_seconds = expired_buffer_seconds
+
+        self.credentials = None
+
+        self._lock = threading.Lock()
+
+    def retrieve(self):
+        return self.credentials
+
+    def is_expired(self):
+        return (self.credentials is None or
+                (self.expired_time and self.expired_time < time.time() + self.expired_buffer_seconds))
+
+    def refresh(self):
+        with self._lock:
+            if self.is_expired():
+                self._assume_role_oidc()
+
+    def get_credentials(self):
+        self.refresh()
+        return self.credentials
+
+    def _assume_role_oidc(self):
+        params = {
+            'DurationSeconds': self.duration_seconds,
+            'RoleSessionName': uuid.uuid4().hex,
+            'RoleTrn': 'trn:iam::' + self.account_id + ':role/' + self.role_name,
+            'OIDCToken': self.oidc_token,
+        }
+        if self.policy is not None:
+            params['Policy'] = self.policy
+        configuration = type.__call__(Configuration)
+
+        # configuration.ak = self.ak
+        # configuration.sk = self.sk
+        configuration.host = self.host
+        configuration.region = self.region
+        configuration.scheme = self.scheme
+        configuration.read_timeout = self.timeout
+        c = UniversalApi(ApiClient(configuration))
+        info = UniversalInfo(method='POST', service='sts', version='2018-01-01', action='AssumeRoleWithOIDC',
+                             content_type='application/x-www-form-urlencoded')
+
+        resp, status_code, resp_header = c.do_call_with_http_info(info=info, body=params)
+        if 'Credentials' not in resp:
+            raise RuntimeError('failed to retrieve credentials from sts' + str(resp_header))
+        resp_cred = resp['Credentials']
+
+        # Parse the ISO string
+        dt = dateutil.parser.parse(resp_cred['Expiration'])
+
+        # Convert to timestamp (seconds since epoch)
+        self.expired_time = (dt - datetime(1970, 1, 1, tzinfo=dateutil.tz.tzutc())).total_seconds()
+
+        self.credentials = CredentialValue(ak=resp_cred['AccessKeyId'],
+                                           sk=resp_cred['SecretAccessKey'],
+                                           session_token=resp_cred['SessionToken'],
+                                           provider_name='StsOidcCredentialProvider')

volcenginesdkcore/auth/providers/sts_provider.py

@@ -8,7 +8,6 @@ import dateutil.parser, dateutil.tz
 from volcenginesdkcore import UniversalApi, UniversalInfo, ApiClient, Configuration
 from .provider import Provider, CredentialValue
 
-
 class AssumeRoleCredentials:
     def __init__(self, ak, sk, session_token, current_time, expired_time):
         self.ak = ak
@@ -20,7 +19,7 @@ class AssumeRoleCredentials:
 
 class StsCredentialProvider(Provider):
     def __init__(self, ak, sk, role_name, account_id, duration_seconds=3600, scheme='https',
-                 host='sts.volcengineapi.com', region='cn-north-1', timeout=30, expired_buffer_seconds=60):
+                 host='sts.volcengineapi.com', region='cn-north-1', timeout=30, expired_buffer_seconds=60, policy=None):
         self.ak = ak
         self.sk = sk
         self.role_name = role_name
@@ -32,7 +31,7 @@ class StsCredentialProvider(Provider):
         self.host = host
         self.region = region
         self.scheme = scheme
-
+        self.policy = policy
         self.expired_time = None
         if expired_buffer_seconds > 600:
             raise ValueError('expired_buffer_seconds must be less than or equal to 600')
@@ -54,13 +53,19 @@ class StsCredentialProvider(Provider):
             if self.is_expired():
                 self._assume_role()
 
+    def get_credentials(self):
+        self.refresh()
+        return self.credentials
+
     def _assume_role(self):
         params = {
             'DurationSeconds': self.duration_seconds,
             'RoleSessionName': uuid.uuid4().hex,
             'RoleTrn': 'trn:iam::' + self.account_id + ':role/' + self.role_name,
         }
-        configuration = Configuration()
+        if self.policy is not None:
+            params['Policy'] = self.policy
+        configuration = type.__call__(Configuration)
         configuration.ak = self.ak
         configuration.sk = self.sk
         configuration.host = self.host