oppia · U8NWXD · Dec 19, 2020 · Nov 25, 2020 · Nov 25, 2020 · Nov 25, 2020
@@ -457,7 +457,6 @@
 
 
 # Miscellaneous.
-/auth.json.enc @nithusha21
 /__init__.py @nithusha21
 /core/__init__.py @nithusha21
 /core/controllers/__init__.py @nithusha21

@@ -42,7 +42,6 @@ yarn-error.log
 .env
 .pytest_cache/v/cache/*
 .lighthouseci
-auth.json
 
 # Oppia uses cache slugs for various resources and we need separate resource
 # directories for dev and prod. Resource directories for prod are generated

@@ -2,6 +2,6 @@
 force_single_line=true
 force_sort_within_sections=true
 ignore_whitespace=true
-known_third_party=browsermobproxy,cloudstorage,contextlib2,elasticsearch,google.appengine,google.api_core,google.cloud,google.oauth2,google.protobuf,jinja2,mapreduce,mutagen,pipeline,pylatexenc,pylint,requests,selenium,skulpt,webapp2,webapp2_extras,webtest,yaml
+known_third_party=browsermobproxy,cloudstorage,contextlib2,elasticsearch,google.appengine,google.api_core,google.cloud,google.protobuf,jinja2,mapreduce,mutagen,pipeline,pylatexenc,pylint,requests,selenium,skulpt,webapp2,webapp2_extras,webtest,yaml
 line_length=80
 sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER
@@ -300,12 +300,6 @@ skip_files:
 - third_party/static/bower-material-1.1.19/
 - third_party/python_libs/google/appengine/
 - third_party/python_libs/google/net/
-- third_party/python_libs/google_auth_oauthlib/
-- third_party/python_libs/googleapiclient/
-- third_party/python_libs/httplib2/
-- third_party/python_libs/oauthlib/
-- third_party/python_libs/requests_oauthlib/
-- third_party/python_libs/uritemplate/
 - third_party/python_libs/google/pyglib/
 - third_party/python_libs/grpc/
 # CKEditor-4.12.1 plugins in the download from the CKEditor website include

diff --git a/auth.json.enc b/auth.json.enc
@@ -9,10 +9,6 @@ bleach==3.1.5
 callbacks==0.3.0
 contextlib2==0.6.0.post1
 future==0.18.2
-google-api-python-client==1.11.0
-google-auth==1.21.1
-google-auth-httplib2==0.0.4
-google-auth-oauthlib==0.4.1
 GoogleAppEngineCloudStorageClient==1.9.22.1
 GoogleAppEngineMapReduce==1.9.22.0
 GoogleAppEnginePipeline==1.9.22.1

@@ -21,11 +21,8 @@ enum34==1.1.10            # via google-cloud-tasks, grpcio
 funcsigs==1.0.2           # via mock
 future==0.18.2            # via -r requirements.in
 futures==3.3.0            # via google-api-core, grpcio
-google-api-core[grpc]==1.22.4  # via google-api-python-client, google-cloud-tasks
-google-api-python-client==1.11.0  # via -r requirements.in
-google-auth-httplib2==0.0.4  # via -r requirements.in, google-api-python-client
-google-auth-oauthlib==0.4.1  # via -r requirements.in
-google-auth==1.21.1       # via -r requirements.in, google-api-core, google-api-python-client, google-auth-httplib2, google-auth-oauthlib
+google-api-core[grpc]==1.22.4  # via google-cloud-tasks
+google-auth==1.22.1       # via google-api-core
 google-cloud-tasks==1.5.0  # via -r requirements.in
 googleapis-common-protos[grpc]==1.52.0  # via -r requirements.in, google-api-core, grpc-google-iam-v1
 googleappenginecloudstorageclient==1.9.22.1  # via -r requirements.in, googleappenginemapreduce, googleappenginepipeline
@@ -35,12 +32,10 @@ graphy==1.0.0             # via -r requirements.in, googleappenginemapreduce
 grpc-google-iam-v1==0.12.3  # via google-cloud-tasks
 grpcio==1.32.0            # via google-api-core, googleapis-common-protos, grpc-google-iam-v1
 html5lib==1.0.1           # via -r requirements.in
-httplib2==0.18.1          # via google-api-python-client, google-auth-httplib2
 idna==2.10                # via requests
 mock==3.0.5               # via googleappenginemapreduce
 mox==0.5.3                # via googleappenginemapreduce
 mutagen==1.43.0           # via -r requirements.in
-oauthlib==3.1.0           # via requests-oauthlib
 packaging==20.4           # via -r requirements.in, bleach
 protobuf==3.13.0          # via google-api-core, googleapis-common-protos
 pyasn1-modules==0.2.8     # via google-auth
@@ -50,14 +45,12 @@ pyparsing==2.4.7          # via packaging
 pytz==2020.1              # via google-api-core
 redis==3.5.3              # via -r requirements.in
 requests-mock==1.5.2      # via -r requirements.in
-requests-oauthlib==1.3.0  # via google-auth-oauthlib
 requests-toolbelt==0.9.1  # via -r requirements.in
-requests==2.24.0          # via -r requirements.in, google-api-core, requests-mock, requests-oauthlib, requests-toolbelt
+requests==2.24.0          # via -r requirements.in, google-api-core, requests-mock, requests-toolbelt
 rsa==4.5                  # via google-auth
 simplejson==3.17.0        # via -r requirements.in, googleappenginemapreduce
-six==1.15.0               # via -r requirements.in, bleach, google-api-core, google-api-python-client, google-auth, google-auth-httplib2, grpcio, html5lib, mock, packaging, protobuf, requests-mock, webapp2
+six==1.15.0               # via -r requirements.in, bleach, google-api-core, google-auth, grpcio, html5lib, mock, packaging, protobuf, requests-mock, webapp2
 soupsieve==1.9.5          # via -r requirements.in, beautifulsoup4
-uritemplate==3.0.1        # via google-api-python-client
 urllib3==1.25.11          # via elasticsearch, requests
 webapp2==3.0.0b1          # via -r requirements.in
 webencodings==0.5.1       # via -r requirements.in, bleach, html5lib

@@ -48,7 +48,6 @@
 PYGITHUB_VERSION = '1.45'
 WEBTEST_VERSION = '2.0.35'
 PIP_TOOLS_VERSION = '5.4.0'
-SIMPLE_CRYPT_VERSION = '4.1.7'
 GRPCIO_VERSION = '1.0.0'
 ENUM_VERSION = '1.1.10'
 PROTOBUF_VERSION = '3.13.0'

@@ -0,0 +1,173 @@
+# Copyright 2020 The Oppia Authors. 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.
+
+"""Python execution for checking whether the tests output is flaky."""
+
+from __future__ import absolute_import  # pylint: disable=import-only-modules
+from __future__ import unicode_literals  # pylint: disable=import-only-modules
+
+import datetime
+import os
+
+import python_utils
+
+import requests
+
+FLAKE_CHECK_AND_REPORT_URL = (
+    'https://oppia-e2e-test-results-logger.herokuapp.com'
+    '/check-flake-and-report')
+PASS_REPORT_URL = (
+    'https://oppia-e2e-test-results-logger.herokuapp.com'
+    '/check-flake-and-report')
+REPORT_API_KEY = '7Ccp062JVjv9LUYwnLMqcm5Eu5gYqqhpl3zQmcO3cDQ'
+
+CI_INFO = {
+    'circleCI': {
+        'env': {
+            'identifier': 'CIRCLECI',
+            'user_info': 'CIRCLE_USERNAME',
+            'build_url': 'CIRCLE_BUILD_URL',
+            'build_id': None
+        }
+    },
+    'githubActions': {
+        'env': {
+            'identifier': 'GITHUB_ACTIONS',
+            'user_info': 'GITHUB_ACTOR',
+            'build_url': None,
+            'build_id': 'GITHUB_ACTION'
+        },
+        'build_url_template': 'https://github.com/oppia/oppia/runs/%s'
+    }
+}
+
+REQUEST_EXCEPTIONS = (
+    requests.RequestException, requests.ConnectionError,
+    requests.HTTPError, requests.TooManyRedirects, requests.Timeout)
+
+
+def _print_color_message(message):
+    """Prints the given message in red color.
+
+    Args:
+        message: str. The success message to print.
+    """
+    # \033[91m is the ANSI escape sequences for green color.
+    python_utils.PRINT('\033[92m' + message + '\033[0m\n')
+
+
+def check_if_on_ci():
+    """Check if the script is running on a CI server.
+
+    Returns: bool. Whether we are running on a CI server.
+    """
+    for info in CI_INFO.values():
+        ci_identifier = info['env']['identifier']
+        if os.getenv(ci_identifier):
+            return True
+    return False
+
+
+def _get_build_info():
+    """Returns the info related to the build container."""
+    build_info = {}
+
+    for info in CI_INFO.values():
+        ci_env = info['env']
+
+        if not os.getenv(ci_env['identifier']):
+            continue
+
+        if os.getenv(ci_env['build_url']) is not None:
+            build_url = os.getenv(ci_env['build_url'])
+        else:
+            build_url = info['build_url_template'] % os.getenv(
+                ci_env['build_id'])
+        timestamp = datetime.datetime.utcnow().isoformat() + '+00:00'
+
+        build_info['username'] = os.getenv(ci_env['user_info'])
+        build_info['build_url'] = build_url
+        build_info['timestamp'] = timestamp
+
+        return build_info
+
+    raise Exception('Unknown build environment.')
+
+
+def report_pass(suite_name):
+    """Report a passing test to the logging server."""
+    metadata = _get_build_info()
+    payload = {
+        'suite': suite_name,
+        'metadata': metadata,
+    }
+    try:
+        requests.post(
+            PASS_REPORT_URL, json=payload,
+            allow_redirects=False,
+            headers={'report_key': REPORT_API_KEY})
+    except REQUEST_EXCEPTIONS as e:
+        _print_color_message((
+            'Failed to contact E2E test logging server at %s.'
+            'Please report to E2E team in case server is down.'
+            'Exception: %s') % (FLAKE_CHECK_AND_REPORT_URL, e))
+
+
+def is_test_output_flaky(output_lines, suite_name):
+    """Returns whether the test output matches any flaky test log."""
+    build_info = _get_build_info()
+    payload = {
+        'suite': suite_name,
+        'output_lines': output_lines,
+        'metadata': build_info,
+    }
+    response = None
+    try:
+        response = requests.post(
+            FLAKE_CHECK_AND_REPORT_URL, json=payload,
+            allow_redirects=False,
+            headers={'report_key': REPORT_API_KEY})
+    except REQUEST_EXCEPTIONS as e:
+        _print_color_message((
+            'Failed to contact E2E test logging server at %s.'
+            'Please report to E2E team in case server is down.'
+            'Exception: %s') % (FLAKE_CHECK_AND_REPORT_URL, e))
+
+        return False
+
+    if not response.ok:
+        _print_color_message('Failed request with response code: %s (%s)' % (
+            response.status_code, response.reason))
+        return False
+
+    report = {}
+    try:
+        report = response.json()
+    except ValueError as e:
+        _print_color_message('Unable to convert json response: %s' % e)
+
+    if 'log' in report:
+        log_str = '\n'.join(report['log'])
+        _print_color_message(
+            'Logs from test result logging server:\n %s' % log_str)
+
+    flaky = report['result'] if 'result' in report else False
+    if flaky:
+        flake = report['flake']
+        _print_color_message('Flake Detected:')
+        _print_color_message('    Suite: %s' % flake['suite'])
+        _print_color_message('    Test: %s' % flake['test'])
+        _print_color_message(
+            '    Error Message: %s' % flake['flake_id'])
+    return flaky