Github Action failure fixes (#188)

* docs: update ask-smapi-sdk readme on using ASK-CLI  util

* fix: fixed the Github actions failures on test_verifier.py

* fix: ask-local-debug code duplicates fixes and mypy upgrade config on tox

Co-authored-by: Shreyas Govinda Raju <shreraju@amazon.com>

Author: Shreyas-vgr

.gitignore

@@ -71,3 +71,5 @@ target/
 # mypy cache
 .mypy_cache/
 
+# VSCode configs
+.vscode/

ask-sdk-local-debug/ask_sdk_local_debug/client/autobahn_client.py

@@ -79,7 +79,7 @@ def invoke(self):
         """
         try:
             connectWS(self.factory, contextFactory=None, timeout=CONNECTION_TIMEOUT_SECONDS)
-            reactor.run()
+            reactor.run()  # type: ignore
         except Exception as e:
             logger.error(
                 'Unable to initiate a socket client connection : {}'.format(

ask-sdk-local-debug/ask_sdk_local_debug/client/autobahn_client_protocol.py

@@ -89,7 +89,7 @@ def onClose(self, was_clean, code, reason):
         :type reason: str or None
         """
         logger.info("WebSocket connection closed: {} ".format(reason))
-        reactor.stop()
+        reactor.stop()  # type: ignore
 
     def send_skill_response(self, local_debug_ask_response):
         # type: (str) -> None

ask-sdk-local-debug/tests/unit/test_autobahn_client_protocol.py

@@ -15,40 +15,11 @@
 # specific language governing permissions and limitations under the
 # License.
 #
-import unittest
 import json
-from mock import patch, Mock
+import unittest
 
 from ask_sdk_local_debug.client.autobahn_client_protocol import AutobahnClientProtocol
-
-TEST_REQUEST_DATA = ("{\n    \"version\": \"fooversion\",\n"
-                     "    \"type\": \"SkillRequestMessage\",\n"
-                     "    \"requestId\": \"foorequestid\",\n"
-                     "    \"requestPayload\": \"foorequestpayload\"\n}")
-
-TEST_SUCCESS_RESPONSE = ("{\n    \"version\": \"fooversion\",\n"
-                         "    \"type\": \"SkillResponseSuccessMessage\",\n"
-                         "    \"originalRequestId\": \"foorequestid\",\n"
-                         "    \"responsePayload\": \"TestPayload\"\n}")
-
-TEST_FAILURE_RESPONSE = ("{\n   \"version\": \"fooversion\",\n"
-                         "    \"type\": \"SkillResponseFailureMessage\",\n"
-                         "    \"originalRequestId\": \"foorequestid\",\n"
-                         "   \"errorCode\": \"500\",\n"
-                         "    \"errorMessage\": \"mock error\"\n}")
-
-TEST_DESERIALIZE_DATA = ("{\"version\": \"fooversion\", "
-                         "\"object_type\": \"SkillRequestMessage\", "
-                         "\"request_id\": \"foorequestid\", "
-                         "\"request_payload\": \"foorequestpayload\"}")
-
-
-def mock_skill_response(local_debug_request, skill_invoker):
-    test_request = json.dumps(local_debug_request.to_dict())
-    if test_request == TEST_DESERIALIZE_DATA:
-        return TEST_SUCCESS_RESPONSE
-    return TEST_FAILURE_RESPONSE
-
+from mock import Mock, patch
 
 TEST_REQUEST_DATA = ("{\n    \"version\": \"fooversion\",\n"
                      "    \"type\": \"SkillRequestMessage\",\n"

ask-sdk-webservice-support/tests/unit/test_verifier.py

@@ -16,30 +16,32 @@
 # License.
 #
 import base64
-import unittest
 import os
-import six
+import unittest
 import warnings
-
 from datetime import datetime, timedelta
-from dateutil.tz import tzutc, tzlocal
-from six.moves.urllib.parse import ParseResult
+
+import six
+from ask_sdk_model import IntentRequest, RequestEnvelope
+from ask_sdk_model.events.skillevents import SkillEnabledRequest
+from ask_sdk_webservice_support.verifier import (RequestVerifier,
+                                                 TimestampVerifier,
+                                                 VerificationException)
+from ask_sdk_webservice_support.verifier_constants import (
+    CERT_CHAIN_DOMAIN, CHARACTER_ENCODING,
+    MAX_NORMAL_REQUEST_TOLERANCE_IN_MILLIS,
+    MAX_SKILL_EVENT_TOLERANCE_IN_MILLIS, SIGNATURE_CERT_CHAIN_URL_HEADER,
+    SIGNATURE_HEADER)
+from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.x509.oid import NameOID
-from cryptography import x509
-from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from ask_sdk_model import RequestEnvelope, IntentRequest
-from ask_sdk_model.events.skillevents import SkillEnabledRequest
-from ask_sdk_webservice_support.verifier import (
-    RequestVerifier, TimestampVerifier, VerificationException)
-from ask_sdk_webservice_support.verifier_constants import (
-    SIGNATURE_CERT_CHAIN_URL_HEADER, SIGNATURE_HEADER,
-    CERT_CHAIN_DOMAIN, CHARACTER_ENCODING, MAX_NORMAL_REQUEST_TOLERANCE_IN_MILLIS,
-    MAX_SKILL_EVENT_TOLERANCE_IN_MILLIS)
-from cryptography.x509 import load_pem_x509_certificate, Certificate
+from cryptography.hazmat.primitives.hashes import SHA1
+from cryptography.x509 import Certificate, load_pem_x509_certificate
+from cryptography.x509.oid import NameOID
+from dateutil.tz import tzlocal, tzutc
 from freezegun import freeze_time
+from six.moves.urllib.parse import ParseResult
 
 try:
     import mock
@@ -96,8 +98,8 @@ def create_self_signed_certificate(self):
             number=x509.random_serial_number()).not_valid_before(
             time=datetime.utcnow() - timedelta(minutes=1)).not_valid_after(
             time=datetime.utcnow() + timedelta(minutes=1)).add_extension(
-            extension=x509.SubjectAlternativeName(
-                [x509.DNSName(u"{}".format(CERT_CHAIN_DOMAIN))]),
+                x509.SubjectAlternativeName(
+                    [x509.DNSName(u"{}".format(CERT_CHAIN_DOMAIN))]),
             critical=False).sign(
             private_key=self.private_key,
             algorithm=SHA1(),

ask-smapi-sdk/README.rst

@@ -37,8 +37,8 @@ Generate Login with Amazon Keys
 - Create a new security profile for your Amazon Developer account by following the instructions
   provided `here <https://developer.amazon.com/en-US/docs/alexa/smapi/get-access-token-smapi.html#configure-lwa-security-profile>`__.
 - This will generate ``Client ID`` and ``Client Secret`` keys.
-- Using the ASK CLI, run: ``ask util generate-lwa-tokens``. You will be asked to provide the ``Client ID``
-  and ``Client Secret`` keys from the previous step. This will return the following JSON with a ``Refresh Token``:
+- Using the ASK CLI v2, run: ``ask util generate-lwa-tokens --client_id <CLIENT_ID> ----client-confirmation <CLIENT_SECRET>``
+  providing the ``Client ID`` and ``Client Secret`` keys from the previous step. This will return the following JSON with a ``Refresh Token``:
 
 .. code-block:: json
 

tox.ini

@@ -28,6 +28,7 @@ commands =
     flake8 .
     python -m pip install --upgrade pip
     python -m pip install --upgrade wheel
+    py{36,37,38}: python -m pip install --upgrade mypy
     {toxinidir}/scripts/ci/sdk_install
     {toxinidir}/scripts/ci/run_tests
     py{36,37,38}: mypy ask-sdk/ask_sdk
@@ -55,6 +56,7 @@ commands =
     flake8 .
     python -m pip install --upgrade pip
     python -m pip install --upgrade wheel
+    py{36,37,38}: python -m pip install --upgrade mypy
     python {toxinidir}\scripts\ci\sdk_install
     python {toxinidir}\scripts\ci\run_tests
     mypy ask-sdk\ask_sdk