From 33e75fb42209f2a43ef0449534907bfd893c3eb7 Mon Sep 17 00:00:00 2001 From: Shreyas Govinda Raju Date: Mon, 18 Apr 2022 13:23:16 -0700 Subject: [PATCH] Release 1.14.3. For changelog, check CHANGELOG.rst --- ask-smapi-model/CHANGELOG.rst | 15 +++++ .../ask_smapi_model/__version__.py | 2 +- .../v1/skill/manifest/__init__.py | 1 + .../v1/skill/manifest/lambda_endpoint.py | 16 +++-- .../manifest/lambda_ssl_certificate_type.py | 67 +++++++++++++++++++ 5 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_ssl_certificate_type.py diff --git a/ask-smapi-model/CHANGELOG.rst b/ask-smapi-model/CHANGELOG.rst index 01dbf094..163b4297 100644 --- a/ask-smapi-model/CHANGELOG.rst +++ b/ask-smapi-model/CHANGELOG.rst @@ -229,3 +229,18 @@ This release contains the following changes : This release contains the following changes : - Enable TSB APL Extension in skill manifest + +1.14.2 +^^^^^^ + +This release contains the following changes : + +- Updating model definitions +- Added new model definitions for Knowledge APIs + +1.14.3 +^^^^^^ + +This release contains the following changes : + +- Updating model definitions \ No newline at end of file diff --git a/ask-smapi-model/ask_smapi_model/__version__.py b/ask-smapi-model/ask_smapi_model/__version__.py index 238e0d82..7585c0e1 100644 --- a/ask-smapi-model/ask_smapi_model/__version__.py +++ b/ask-smapi-model/ask_smapi_model/__version__.py @@ -14,7 +14,7 @@ __pip_package_name__ = 'ask-smapi-model' __description__ = 'The SMAPI SDK Model package provides model definitions for making Skill Management API calls.' __url__ = 'https://github.com/alexa/alexa-apis-for-python' -__version__ = '1.14.1' +__version__ = '1.14.3' __author__ = 'Alexa Skills Kit' __author_email__ = 'ask-sdk-dynamic@amazon.com' __license__ = 'Apache 2.0' diff --git a/ask-smapi-model/ask_smapi_model/v1/skill/manifest/__init__.py b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/__init__.py index 4d6b6a83..c4a42f1b 100644 --- a/ask-smapi-model/ask_smapi_model/v1/skill/manifest/__init__.py +++ b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/__init__.py @@ -79,6 +79,7 @@ from .android_custom_intent import AndroidCustomIntent from .ssl_certificate_type import SSLCertificateType from .music_request import MusicRequest +from .lambda_ssl_certificate_type import LambdaSSLCertificateType from .video_catalog_info import VideoCatalogInfo from .custom_apis import CustomApis from .dialog_manager import DialogManager diff --git a/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_endpoint.py b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_endpoint.py index b6701cb0..67399046 100644 --- a/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_endpoint.py +++ b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_endpoint.py @@ -23,6 +23,7 @@ if typing.TYPE_CHECKING: from typing import Dict, List, Optional, Union, Any from datetime import datetime + from ask_smapi_model.v1.skill.manifest.lambda_ssl_certificate_type import LambdaSSLCertificateType as LambdaSSLCertificateType_50ec1486 class LambdaEndpoint(object): @@ -32,27 +33,34 @@ class LambdaEndpoint(object): :param uri: Amazon Resource Name (ARN) of the Lambda function. :type uri: (optional) str + :param ssl_certificate_type: + :type ssl_certificate_type: (optional) ask_smapi_model.v1.skill.manifest.lambda_ssl_certificate_type.LambdaSSLCertificateType """ deserialized_types = { - 'uri': 'str' + 'uri': 'str', + 'ssl_certificate_type': 'ask_smapi_model.v1.skill.manifest.lambda_ssl_certificate_type.LambdaSSLCertificateType' } # type: Dict attribute_map = { - 'uri': 'uri' + 'uri': 'uri', + 'ssl_certificate_type': 'sslCertificateType' } # type: Dict supports_multiple_types = False - def __init__(self, uri=None): - # type: (Optional[str]) -> None + def __init__(self, uri=None, ssl_certificate_type=None): + # type: (Optional[str], Optional[LambdaSSLCertificateType_50ec1486]) -> None """Contains the uri field. This sets the global default endpoint. :param uri: Amazon Resource Name (ARN) of the Lambda function. :type uri: (optional) str + :param ssl_certificate_type: + :type ssl_certificate_type: (optional) ask_smapi_model.v1.skill.manifest.lambda_ssl_certificate_type.LambdaSSLCertificateType """ self.__discriminator_value = None # type: str self.uri = uri + self.ssl_certificate_type = ssl_certificate_type def to_dict(self): # type: () -> Dict[str, object] diff --git a/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_ssl_certificate_type.py b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_ssl_certificate_type.py new file mode 100644 index 00000000..b12b61e1 --- /dev/null +++ b/ask-smapi-model/ask_smapi_model/v1/skill/manifest/lambda_ssl_certificate_type.py @@ -0,0 +1,67 @@ +# coding: utf-8 + +# +# Copyright 2019 Amazon.com, Inc. or its affiliates. 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. A copy of the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file 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 pprint +import re # noqa: F401 +import six +import typing +from enum import Enum + + +if typing.TYPE_CHECKING: + from typing import Dict, List, Optional, Union, Any + from datetime import datetime + + +class LambdaSSLCertificateType(Enum): + """ + The SSL certificate type of the skill's HTTPS endpoint. Only valid for HTTPS endpoint not for AWS Lambda ARN. + + + + Allowed enum values: [SelfSigned, Wildcard, Trusted] + """ + SelfSigned = "SelfSigned" + Wildcard = "Wildcard" + Trusted = "Trusted" + + def to_dict(self): + # type: () -> Dict[str, Any] + """Returns the model properties as a dict""" + result = {self.name: self.value} + return result + + def to_str(self): + # type: () -> str + """Returns the string representation of the model""" + return pprint.pformat(self.value) + + def __repr__(self): + # type: () -> str + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + # type: (Any) -> bool + """Returns true if both objects are equal""" + if not isinstance(other, LambdaSSLCertificateType): + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + # type: (Any) -> bool + """Returns true if both objects are not equal""" + return not self == other