diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-23 11:28:01 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-23 11:28:01 +0300 |
| commit | bf160fca0164c4407b7f29aeb0cbf68745b71f61 (patch) | |
| tree | 717fd99f6d40f4b707207cb551a4a57ba71e0684 | |
| parent | 12db7f172fd48ffead86b19bff5653a0aaffd0c8 (diff) | |
| download | ydb-bf160fca0164c4407b7f29aeb0cbf68745b71f61.tar.gz | |
intermediate changes
ref:ebdff8c3d54500ffd2411bb148bf63da1d0f4b77
| -rw-r--r-- | build/conf/compilers/msvc_compiler.conf | 1 | ||||
| -rw-r--r-- | build/conf/docs.conf | 1 | ||||
| -rw-r--r-- | build/conf/settings.conf | 1 | ||||
| -rw-r--r-- | build/scripts/run_msvc_wine.py | 30 | ||||
| -rw-r--r-- | build/ymake.core.conf | 5 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 1 | ||||
| -rw-r--r-- | contrib/python/boto3/py2/patches/02-fix-yamake.patch | 5 | ||||
| -rw-r--r-- | contrib/python/boto3/py3/patches/02-fix-yamake.patch | 5 | ||||
| -rw-r--r-- | contrib/python/botocore/py2/patches/04-fix-yamake.patch | 147 | ||||
| -rw-r--r-- | contrib/python/botocore/py3/patches/04-fix-ya.make.patch | 155 |
10 files changed, 179 insertions, 172 deletions
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf index df19d83f62..a79f8928d8 100644 --- a/build/conf/compilers/msvc_compiler.conf +++ b/build/conf/compilers/msvc_compiler.conf @@ -65,7 +65,6 @@ when ($CLANG_CL == "yes") { -Wno-bitwise-op-parentheses \ -Wno-format \ -Wno-logical-op-parentheses \ - -Wno-macro-redefined \ -Wno-parentheses \ -Wno-unknown-warning-option diff --git a/build/conf/docs.conf b/build/conf/docs.conf index 7cb5c2b1e9..d39fb8253f 100644 --- a/build/conf/docs.conf +++ b/build/conf/docs.conf @@ -1,5 +1,4 @@ # tag:docs -TOUCH_UNIT_MF=$TOUCH_UNIT && $GENERATE_MF TOUCH_DOCS=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${kv;hide:"p DC"} ${kv;hide:"pc light-cyan"} $TARGET TOUCH_DOCS_MF=$TOUCH_DOCS && $GENERATE_MF diff --git a/build/conf/settings.conf b/build/conf/settings.conf index 713f12b4df..a1bd72e24c 100644 --- a/build/conf/settings.conf +++ b/build/conf/settings.conf @@ -2,6 +2,7 @@ GLOBAL_SRCS_IN_RESULTS=yes JSON_CACHE_IS_ATTACHED=yes USE_ADDINCL_WITHOUT_FOR_AS_ADDINCL_FOR_C=yes LANGS_REQUIRE_BUILD_AND_SRC_ROOTS=c asm cython proto flatc swig ydl nlg +CHECK_GO_INCORRECT_DEPS=yes CHKPEERS_GLOBAL_SRCS=no when ($AUTOCHECK == "yes") { diff --git a/build/scripts/run_msvc_wine.py b/build/scripts/run_msvc_wine.py index 439d1f8831..69c53068e2 100644 --- a/build/scripts/run_msvc_wine.py +++ b/build/scripts/run_msvc_wine.py @@ -31,6 +31,30 @@ def run_subprocess(*args, **kwargs): return p +def run_subprocess_with_timeout(timeout, args): + attempts_remaining = 5 + delay = 1 + p = None + while True: + try: + p = run_subprocess(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate(timeout=timeout) + return p, stdout, stderr + except subprocess.TimeoutExpired as e: + print >>sys.stderr, 'timeout running {0}, error {1}, delay {2} seconds'.format(args, str(e), delay) + if p is not None: + try: + p.kill() + p.communicate() + except Exception: + pass + attempts_remaining -= 1 + if attempts_remaining == 0: + raise + time.sleep(delay) + delay = min(2 * delay, 4) + + def terminate_slaves(): for p in procs: try: @@ -319,16 +343,14 @@ def colorize(out): def trim_path(path, winepath): - p1 = run_subprocess([winepath, '-w', path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p1_stdout, p1_stderr = p1.communicate() + p1, p1_stdout, p1_stderr = run_subprocess_with_timeout(60, [winepath, '-w', path]) win_path = p1_stdout.strip() if p1.returncode != 0 or not win_path: # Fall back to only winepath -s win_path = path - p2 = run_subprocess([winepath, '-s', win_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p2_stdout, p2_stderr = p2.communicate() + p2, p2_stdout, p2_stderr = run_subprocess_with_timeout(60, [winepath, '-s', win_path]) short_path = p2_stdout.strip() check_path = short_path diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 82bd6adb7d..c8e24c1834 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -3105,6 +3105,9 @@ module CI_GROUP: _BARE_UNIT { PEERDIR_TAGS=CPP_PROTO PY3 PY3_NATIVE YQL_UDF_SHARED __EMPTY__ DOCSBOOK JAR_RUNNABLE DLL } +# tag:generic tag:internal +TOUCH_UNIT_MF=$TOUCH_UNIT && $GENERATE_MF + # tag:proto ### @usage: RESOLVE_PROTO() ### @@ -8035,7 +8038,7 @@ GO_HAS_INTERNAL_TESTS=no ### .go sources for internal tests of a module macro GO_TEST_SRCS(FILES...) { GO_FAKE_OUTPUT($FILES) - SET(GO_HAS_INTERNAL_TESTS yes) + _SET_FIRST_VALUE(GO_HAS_INTERNAL_TESTS ${pre=yes :FILES} ${GO_HAS_INTERNAL_TESTS}) SET_APPEND(_GO_TEST_SRCS_VALUE $FILES) } diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 8a165e31ca..01fb158d67 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -2470,7 +2470,6 @@ class MSVCCompiler(MSVC, Compiler): '-Wno-bitwise-op-parentheses', '-Wno-format', '-Wno-logical-op-parentheses', - '-Wno-macro-redefined', '-Wno-parentheses', '-Wno-unknown-warning-option', )) diff --git a/contrib/python/boto3/py2/patches/02-fix-yamake.patch b/contrib/python/boto3/py2/patches/02-fix-yamake.patch index ad43a9c1d7..f18bb7a452 100644 --- a/contrib/python/boto3/py2/patches/02-fix-yamake.patch +++ b/contrib/python/boto3/py2/patches/02-fix-yamake.patch @@ -18,10 +18,9 @@ boto3/data/ec2/2016-09-15/resources-1.json boto3/data/ec2/2016-11-15/resources-1.json - boto3/data/glacier/2012-06-01/resources-1.json -- boto3/data/iam/2010-05-08/resources-1.json -- boto3/data/opsworks/2013-02-18/resources-1.json + #boto3/data/glacier/2012-06-01/resources-1.json -+ #boto3/data/iam/2010-05-08/resources-1.json + boto3/data/iam/2010-05-08/resources-1.json +- boto3/data/opsworks/2013-02-18/resources-1.json + #boto3/data/opsworks/2013-02-18/resources-1.json boto3/data/s3/2006-03-01/resources-1.json - boto3/data/sns/2010-03-31/resources-1.json diff --git a/contrib/python/boto3/py3/patches/02-fix-yamake.patch b/contrib/python/boto3/py3/patches/02-fix-yamake.patch index a858c0e768..cc2cbf0672 100644 --- a/contrib/python/boto3/py3/patches/02-fix-yamake.patch +++ b/contrib/python/boto3/py3/patches/02-fix-yamake.patch @@ -18,10 +18,9 @@ boto3/data/ec2/2016-09-15/resources-1.json boto3/data/ec2/2016-11-15/resources-1.json - boto3/data/glacier/2012-06-01/resources-1.json -- boto3/data/iam/2010-05-08/resources-1.json -- boto3/data/opsworks/2013-02-18/resources-1.json + #boto3/data/glacier/2012-06-01/resources-1.json -+ #boto3/data/iam/2010-05-08/resources-1.json + boto3/data/iam/2010-05-08/resources-1.json +- boto3/data/opsworks/2013-02-18/resources-1.json + #boto3/data/opsworks/2013-02-18/resources-1.json boto3/data/s3/2006-03-01/resources-1.json - boto3/data/sns/2010-03-31/resources-1.json diff --git a/contrib/python/botocore/py2/patches/04-fix-yamake.patch b/contrib/python/botocore/py2/patches/04-fix-yamake.patch index 4a1fbc2d4a..534a7aeae1 100644 --- a/contrib/python/botocore/py2/patches/04-fix-yamake.patch +++ b/contrib/python/botocore/py2/patches/04-fix-yamake.patch @@ -719,10 +719,65 @@ - botocore/data/honeycode/2020-03-01/paginators-1.json - botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json - botocore/data/honeycode/2020-03-01/service-2.json -- botocore/data/iam/2010-05-08/examples-1.json -- botocore/data/iam/2010-05-08/paginators-1.json -- botocore/data/iam/2010-05-08/service-2.json -- botocore/data/iam/2010-05-08/waiters-2.json ++ #botocore/data/es/2015-01-01/examples-1.json ++ #botocore/data/es/2015-01-01/paginators-1.json ++ #botocore/data/es/2015-01-01/service-2.json ++ #botocore/data/events/2014-02-03/service-2.json ++ #botocore/data/events/2015-10-07/examples-1.json ++ #botocore/data/events/2015-10-07/paginators-1.json ++ #botocore/data/events/2015-10-07/service-2.json ++ #botocore/data/finspace-data/2020-07-13/paginators-1.json ++ #botocore/data/finspace-data/2020-07-13/service-2.json ++ #botocore/data/finspace/2021-03-12/paginators-1.json ++ #botocore/data/finspace/2021-03-12/service-2.json ++ #botocore/data/firehose/2015-08-04/examples-1.json ++ #botocore/data/firehose/2015-08-04/paginators-1.json ++ #botocore/data/firehose/2015-08-04/service-2.json ++ #botocore/data/fis/2020-12-01/paginators-1.json ++ #botocore/data/fis/2020-12-01/service-2.json ++ #botocore/data/fms/2018-01-01/examples-1.json ++ #botocore/data/fms/2018-01-01/paginators-1.json ++ #botocore/data/fms/2018-01-01/service-2.json ++ #botocore/data/forecast/2018-06-26/paginators-1.json ++ #botocore/data/forecast/2018-06-26/service-2.json ++ #botocore/data/forecastquery/2018-06-26/paginators-1.json ++ #botocore/data/forecastquery/2018-06-26/service-2.json ++ #botocore/data/frauddetector/2019-11-15/paginators-1.json ++ #botocore/data/frauddetector/2019-11-15/service-2.json ++ #botocore/data/fsx/2018-03-01/paginators-1.json ++ #botocore/data/fsx/2018-03-01/service-2.json ++ #botocore/data/gamelift/2015-10-01/examples-1.json ++ #botocore/data/gamelift/2015-10-01/paginators-1.json ++ #botocore/data/gamelift/2015-10-01/service-2.json ++ #botocore/data/glacier/2012-06-01/examples-1.json ++ #botocore/data/glacier/2012-06-01/paginators-1.json ++ #botocore/data/glacier/2012-06-01/service-2.json ++ #botocore/data/glacier/2012-06-01/waiters-2.json ++ #botocore/data/globalaccelerator/2018-08-08/paginators-1.json ++ #botocore/data/globalaccelerator/2018-08-08/service-2.json ++ #botocore/data/glue/2017-03-31/examples-1.json ++ #botocore/data/glue/2017-03-31/paginators-1.json ++ #botocore/data/glue/2017-03-31/service-2.json ++ #botocore/data/greengrass/2017-06-07/paginators-1.json ++ #botocore/data/greengrass/2017-06-07/service-2.json ++ #botocore/data/greengrassv2/2020-11-30/paginators-1.json ++ #botocore/data/greengrassv2/2020-11-30/service-2.json ++ #botocore/data/groundstation/2019-05-23/paginators-1.json ++ #botocore/data/groundstation/2019-05-23/service-2.json ++ #botocore/data/guardduty/2017-11-28/paginators-1.json ++ #botocore/data/guardduty/2017-11-28/service-2.json ++ #botocore/data/health/2016-08-04/examples-1.json ++ #botocore/data/health/2016-08-04/paginators-1.json ++ #botocore/data/health/2016-08-04/service-2.json ++ #botocore/data/healthlake/2017-07-01/paginators-1.json ++ #botocore/data/healthlake/2017-07-01/service-2.json ++ #botocore/data/honeycode/2020-03-01/paginators-1.json ++ #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json ++ #botocore/data/honeycode/2020-03-01/service-2.json + botocore/data/iam/2010-05-08/examples-1.json + botocore/data/iam/2010-05-08/paginators-1.json + botocore/data/iam/2010-05-08/service-2.json + botocore/data/iam/2010-05-08/waiters-2.json - botocore/data/identitystore/2020-06-15/paginators-1.json - botocore/data/identitystore/2020-06-15/service-2.json - botocore/data/imagebuilder/2019-12-02/paginators-1.json @@ -780,65 +835,6 @@ - botocore/data/kinesis-video-media/2017-09-30/service-2.json - botocore/data/kinesis-video-signaling/2019-12-04/paginators-1.json - botocore/data/kinesis-video-signaling/2019-12-04/service-2.json -+ #botocore/data/es/2015-01-01/examples-1.json -+ #botocore/data/es/2015-01-01/paginators-1.json -+ #botocore/data/es/2015-01-01/service-2.json -+ #botocore/data/events/2014-02-03/service-2.json -+ #botocore/data/events/2015-10-07/examples-1.json -+ #botocore/data/events/2015-10-07/paginators-1.json -+ #botocore/data/events/2015-10-07/service-2.json -+ #botocore/data/finspace-data/2020-07-13/paginators-1.json -+ #botocore/data/finspace-data/2020-07-13/service-2.json -+ #botocore/data/finspace/2021-03-12/paginators-1.json -+ #botocore/data/finspace/2021-03-12/service-2.json -+ #botocore/data/firehose/2015-08-04/examples-1.json -+ #botocore/data/firehose/2015-08-04/paginators-1.json -+ #botocore/data/firehose/2015-08-04/service-2.json -+ #botocore/data/fis/2020-12-01/paginators-1.json -+ #botocore/data/fis/2020-12-01/service-2.json -+ #botocore/data/fms/2018-01-01/examples-1.json -+ #botocore/data/fms/2018-01-01/paginators-1.json -+ #botocore/data/fms/2018-01-01/service-2.json -+ #botocore/data/forecast/2018-06-26/paginators-1.json -+ #botocore/data/forecast/2018-06-26/service-2.json -+ #botocore/data/forecastquery/2018-06-26/paginators-1.json -+ #botocore/data/forecastquery/2018-06-26/service-2.json -+ #botocore/data/frauddetector/2019-11-15/paginators-1.json -+ #botocore/data/frauddetector/2019-11-15/service-2.json -+ #botocore/data/fsx/2018-03-01/paginators-1.json -+ #botocore/data/fsx/2018-03-01/service-2.json -+ #botocore/data/gamelift/2015-10-01/examples-1.json -+ #botocore/data/gamelift/2015-10-01/paginators-1.json -+ #botocore/data/gamelift/2015-10-01/service-2.json -+ #botocore/data/glacier/2012-06-01/examples-1.json -+ #botocore/data/glacier/2012-06-01/paginators-1.json -+ #botocore/data/glacier/2012-06-01/service-2.json -+ #botocore/data/glacier/2012-06-01/waiters-2.json -+ #botocore/data/globalaccelerator/2018-08-08/paginators-1.json -+ #botocore/data/globalaccelerator/2018-08-08/service-2.json -+ #botocore/data/glue/2017-03-31/examples-1.json -+ #botocore/data/glue/2017-03-31/paginators-1.json -+ #botocore/data/glue/2017-03-31/service-2.json -+ #botocore/data/greengrass/2017-06-07/paginators-1.json -+ #botocore/data/greengrass/2017-06-07/service-2.json -+ #botocore/data/greengrassv2/2020-11-30/paginators-1.json -+ #botocore/data/greengrassv2/2020-11-30/service-2.json -+ #botocore/data/groundstation/2019-05-23/paginators-1.json -+ #botocore/data/groundstation/2019-05-23/service-2.json -+ #botocore/data/guardduty/2017-11-28/paginators-1.json -+ #botocore/data/guardduty/2017-11-28/service-2.json -+ #botocore/data/health/2016-08-04/examples-1.json -+ #botocore/data/health/2016-08-04/paginators-1.json -+ #botocore/data/health/2016-08-04/service-2.json -+ #botocore/data/healthlake/2017-07-01/paginators-1.json -+ #botocore/data/healthlake/2017-07-01/service-2.json -+ #botocore/data/honeycode/2020-03-01/paginators-1.json -+ #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json -+ #botocore/data/honeycode/2020-03-01/service-2.json -+ #botocore/data/iam/2010-05-08/examples-1.json -+ #botocore/data/iam/2010-05-08/paginators-1.json -+ #botocore/data/iam/2010-05-08/service-2.json -+ #botocore/data/iam/2010-05-08/waiters-2.json + #botocore/data/identitystore/2020-06-15/paginators-1.json + #botocore/data/identitystore/2020-06-15/service-2.json + #botocore/data/imagebuilder/2019-12-02/paginators-1.json @@ -908,9 +904,17 @@ - botocore/data/kinesisvideo/2017-09-30/examples-1.json - botocore/data/kinesisvideo/2017-09-30/paginators-1.json - botocore/data/kinesisvideo/2017-09-30/service-2.json -- botocore/data/kms/2014-11-01/examples-1.json -- botocore/data/kms/2014-11-01/paginators-1.json -- botocore/data/kms/2014-11-01/service-2.json ++ #botocore/data/kinesisanalytics/2015-08-14/examples-1.json ++ #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json ++ #botocore/data/kinesisanalytics/2015-08-14/service-2.json ++ #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json ++ #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json ++ #botocore/data/kinesisvideo/2017-09-30/examples-1.json ++ #botocore/data/kinesisvideo/2017-09-30/paginators-1.json ++ #botocore/data/kinesisvideo/2017-09-30/service-2.json + botocore/data/kms/2014-11-01/examples-1.json + botocore/data/kms/2014-11-01/paginators-1.json + botocore/data/kms/2014-11-01/service-2.json - botocore/data/lakeformation/2017-03-31/paginators-1.json - botocore/data/lakeformation/2017-03-31/service-2.json - botocore/data/lambda/2014-11-11/service-2.json @@ -1041,17 +1045,6 @@ - botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json - botocore/data/pinpoint/2016-12-01/examples-1.json - botocore/data/pinpoint/2016-12-01/service-2.json -+ #botocore/data/kinesisanalytics/2015-08-14/examples-1.json -+ #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json -+ #botocore/data/kinesisanalytics/2015-08-14/service-2.json -+ #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json -+ #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json -+ #botocore/data/kinesisvideo/2017-09-30/examples-1.json -+ #botocore/data/kinesisvideo/2017-09-30/paginators-1.json -+ #botocore/data/kinesisvideo/2017-09-30/service-2.json -+ #botocore/data/kms/2014-11-01/examples-1.json -+ #botocore/data/kms/2014-11-01/paginators-1.json -+ #botocore/data/kms/2014-11-01/service-2.json + #botocore/data/lakeformation/2017-03-31/paginators-1.json + #botocore/data/lakeformation/2017-03-31/service-2.json + #botocore/data/lambda/2014-11-11/service-2.json diff --git a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch index df206c1dac..165d8d55e1 100644 --- a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch +++ b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch @@ -769,10 +769,69 @@ - botocore/data/honeycode/2020-03-01/paginators-1.json - botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json - botocore/data/honeycode/2020-03-01/service-2.json -- botocore/data/iam/2010-05-08/examples-1.json -- botocore/data/iam/2010-05-08/paginators-1.json -- botocore/data/iam/2010-05-08/service-2.json -- botocore/data/iam/2010-05-08/waiters-2.json ++ #botocore/data/es/2015-01-01/examples-1.json ++ #botocore/data/es/2015-01-01/paginators-1.json ++ #botocore/data/es/2015-01-01/service-2.json ++ #botocore/data/events/2014-02-03/service-2.json ++ #botocore/data/events/2015-10-07/examples-1.json ++ #botocore/data/events/2015-10-07/paginators-1.json ++ #botocore/data/events/2015-10-07/service-2.json ++ #botocore/data/evidently/2021-02-01/paginators-1.json ++ #botocore/data/evidently/2021-02-01/service-2.json ++ #botocore/data/finspace-data/2020-07-13/paginators-1.json ++ #botocore/data/finspace-data/2020-07-13/service-2.json ++ #botocore/data/finspace/2021-03-12/paginators-1.json ++ #botocore/data/finspace/2021-03-12/service-2.json ++ #botocore/data/firehose/2015-08-04/examples-1.json ++ #botocore/data/firehose/2015-08-04/paginators-1.json ++ #botocore/data/firehose/2015-08-04/service-2.json ++ #botocore/data/fis/2020-12-01/paginators-1.json ++ #botocore/data/fis/2020-12-01/service-2.json ++ #botocore/data/fms/2018-01-01/examples-1.json ++ #botocore/data/fms/2018-01-01/paginators-1.json ++ #botocore/data/fms/2018-01-01/service-2.json ++ #botocore/data/forecast/2018-06-26/paginators-1.json ++ #botocore/data/forecast/2018-06-26/service-2.json ++ #botocore/data/forecastquery/2018-06-26/paginators-1.json ++ #botocore/data/forecastquery/2018-06-26/service-2.json ++ #botocore/data/frauddetector/2019-11-15/paginators-1.json ++ #botocore/data/frauddetector/2019-11-15/service-2.json ++ #botocore/data/fsx/2018-03-01/paginators-1.json ++ #botocore/data/fsx/2018-03-01/service-2.json ++ #botocore/data/gamelift/2015-10-01/examples-1.json ++ #botocore/data/gamelift/2015-10-01/paginators-1.json ++ #botocore/data/gamelift/2015-10-01/service-2.json ++ #botocore/data/glacier/2012-06-01/examples-1.json ++ #botocore/data/glacier/2012-06-01/paginators-1.json ++ #botocore/data/glacier/2012-06-01/service-2.json ++ #botocore/data/glacier/2012-06-01/waiters-2.json ++ #botocore/data/globalaccelerator/2018-08-08/paginators-1.json ++ #botocore/data/globalaccelerator/2018-08-08/service-2.json ++ #botocore/data/glue/2017-03-31/examples-1.json ++ #botocore/data/glue/2017-03-31/paginators-1.json ++ #botocore/data/glue/2017-03-31/service-2.json ++ #botocore/data/grafana/2020-08-18/paginators-1.json ++ #botocore/data/grafana/2020-08-18/service-2.json ++ #botocore/data/greengrass/2017-06-07/paginators-1.json ++ #botocore/data/greengrass/2017-06-07/service-2.json ++ #botocore/data/greengrassv2/2020-11-30/paginators-1.json ++ #botocore/data/greengrassv2/2020-11-30/service-2.json ++ #botocore/data/groundstation/2019-05-23/paginators-1.json ++ #botocore/data/groundstation/2019-05-23/service-2.json ++ #botocore/data/guardduty/2017-11-28/paginators-1.json ++ #botocore/data/guardduty/2017-11-28/service-2.json ++ #botocore/data/health/2016-08-04/examples-1.json ++ #botocore/data/health/2016-08-04/paginators-1.json ++ #botocore/data/health/2016-08-04/service-2.json ++ #botocore/data/healthlake/2017-07-01/paginators-1.json ++ #botocore/data/healthlake/2017-07-01/service-2.json ++ #botocore/data/honeycode/2020-03-01/paginators-1.json ++ #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json ++ #botocore/data/honeycode/2020-03-01/service-2.json + botocore/data/iam/2010-05-08/examples-1.json + botocore/data/iam/2010-05-08/paginators-1.json + botocore/data/iam/2010-05-08/service-2.json + botocore/data/iam/2010-05-08/waiters-2.json - botocore/data/identitystore/2020-06-15/paginators-1.json - botocore/data/identitystore/2020-06-15/service-2.json - botocore/data/imagebuilder/2019-12-02/paginators-1.json @@ -838,69 +897,6 @@ - botocore/data/kinesis-video-media/2017-09-30/service-2.json - botocore/data/kinesis-video-signaling/2019-12-04/paginators-1.json - botocore/data/kinesis-video-signaling/2019-12-04/service-2.json -+ #botocore/data/es/2015-01-01/examples-1.json -+ #botocore/data/es/2015-01-01/paginators-1.json -+ #botocore/data/es/2015-01-01/service-2.json -+ #botocore/data/events/2014-02-03/service-2.json -+ #botocore/data/events/2015-10-07/examples-1.json -+ #botocore/data/events/2015-10-07/paginators-1.json -+ #botocore/data/events/2015-10-07/service-2.json -+ #botocore/data/evidently/2021-02-01/paginators-1.json -+ #botocore/data/evidently/2021-02-01/service-2.json -+ #botocore/data/finspace-data/2020-07-13/paginators-1.json -+ #botocore/data/finspace-data/2020-07-13/service-2.json -+ #botocore/data/finspace/2021-03-12/paginators-1.json -+ #botocore/data/finspace/2021-03-12/service-2.json -+ #botocore/data/firehose/2015-08-04/examples-1.json -+ #botocore/data/firehose/2015-08-04/paginators-1.json -+ #botocore/data/firehose/2015-08-04/service-2.json -+ #botocore/data/fis/2020-12-01/paginators-1.json -+ #botocore/data/fis/2020-12-01/service-2.json -+ #botocore/data/fms/2018-01-01/examples-1.json -+ #botocore/data/fms/2018-01-01/paginators-1.json -+ #botocore/data/fms/2018-01-01/service-2.json -+ #botocore/data/forecast/2018-06-26/paginators-1.json -+ #botocore/data/forecast/2018-06-26/service-2.json -+ #botocore/data/forecastquery/2018-06-26/paginators-1.json -+ #botocore/data/forecastquery/2018-06-26/service-2.json -+ #botocore/data/frauddetector/2019-11-15/paginators-1.json -+ #botocore/data/frauddetector/2019-11-15/service-2.json -+ #botocore/data/fsx/2018-03-01/paginators-1.json -+ #botocore/data/fsx/2018-03-01/service-2.json -+ #botocore/data/gamelift/2015-10-01/examples-1.json -+ #botocore/data/gamelift/2015-10-01/paginators-1.json -+ #botocore/data/gamelift/2015-10-01/service-2.json -+ #botocore/data/glacier/2012-06-01/examples-1.json -+ #botocore/data/glacier/2012-06-01/paginators-1.json -+ #botocore/data/glacier/2012-06-01/service-2.json -+ #botocore/data/glacier/2012-06-01/waiters-2.json -+ #botocore/data/globalaccelerator/2018-08-08/paginators-1.json -+ #botocore/data/globalaccelerator/2018-08-08/service-2.json -+ #botocore/data/glue/2017-03-31/examples-1.json -+ #botocore/data/glue/2017-03-31/paginators-1.json -+ #botocore/data/glue/2017-03-31/service-2.json -+ #botocore/data/grafana/2020-08-18/paginators-1.json -+ #botocore/data/grafana/2020-08-18/service-2.json -+ #botocore/data/greengrass/2017-06-07/paginators-1.json -+ #botocore/data/greengrass/2017-06-07/service-2.json -+ #botocore/data/greengrassv2/2020-11-30/paginators-1.json -+ #botocore/data/greengrassv2/2020-11-30/service-2.json -+ #botocore/data/groundstation/2019-05-23/paginators-1.json -+ #botocore/data/groundstation/2019-05-23/service-2.json -+ #botocore/data/guardduty/2017-11-28/paginators-1.json -+ #botocore/data/guardduty/2017-11-28/service-2.json -+ #botocore/data/health/2016-08-04/examples-1.json -+ #botocore/data/health/2016-08-04/paginators-1.json -+ #botocore/data/health/2016-08-04/service-2.json -+ #botocore/data/healthlake/2017-07-01/paginators-1.json -+ #botocore/data/healthlake/2017-07-01/service-2.json -+ #botocore/data/honeycode/2020-03-01/paginators-1.json -+ #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json -+ #botocore/data/honeycode/2020-03-01/service-2.json -+ #botocore/data/iam/2010-05-08/examples-1.json -+ #botocore/data/iam/2010-05-08/paginators-1.json -+ #botocore/data/iam/2010-05-08/service-2.json -+ #botocore/data/iam/2010-05-08/waiters-2.json + #botocore/data/identitystore/2020-06-15/paginators-1.json + #botocore/data/identitystore/2020-06-15/service-2.json + #botocore/data/imagebuilder/2019-12-02/paginators-1.json @@ -978,9 +974,17 @@ - botocore/data/kinesisvideo/2017-09-30/examples-1.json - botocore/data/kinesisvideo/2017-09-30/paginators-1.json - botocore/data/kinesisvideo/2017-09-30/service-2.json -- botocore/data/kms/2014-11-01/examples-1.json -- botocore/data/kms/2014-11-01/paginators-1.json -- botocore/data/kms/2014-11-01/service-2.json ++ #botocore/data/kinesisanalytics/2015-08-14/examples-1.json ++ #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json ++ #botocore/data/kinesisanalytics/2015-08-14/service-2.json ++ #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json ++ #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json ++ #botocore/data/kinesisvideo/2017-09-30/examples-1.json ++ #botocore/data/kinesisvideo/2017-09-30/paginators-1.json ++ #botocore/data/kinesisvideo/2017-09-30/service-2.json + botocore/data/kms/2014-11-01/examples-1.json + botocore/data/kms/2014-11-01/paginators-1.json + botocore/data/kms/2014-11-01/service-2.json - botocore/data/lakeformation/2017-03-31/paginators-1.json - botocore/data/lakeformation/2017-03-31/paginators-1.sdk-extras.json - botocore/data/lakeformation/2017-03-31/service-2.json @@ -1125,17 +1129,6 @@ - botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json - botocore/data/pinpoint/2016-12-01/examples-1.json - botocore/data/pinpoint/2016-12-01/service-2.json -+ #botocore/data/kinesisanalytics/2015-08-14/examples-1.json -+ #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json -+ #botocore/data/kinesisanalytics/2015-08-14/service-2.json -+ #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json -+ #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json -+ #botocore/data/kinesisvideo/2017-09-30/examples-1.json -+ #botocore/data/kinesisvideo/2017-09-30/paginators-1.json -+ #botocore/data/kinesisvideo/2017-09-30/service-2.json -+ #botocore/data/kms/2014-11-01/examples-1.json -+ #botocore/data/kms/2014-11-01/paginators-1.json -+ #botocore/data/kms/2014-11-01/service-2.json + #botocore/data/lakeformation/2017-03-31/paginators-1.json + #botocore/data/lakeformation/2017-03-31/paginators-1.sdk-extras.json + #botocore/data/lakeformation/2017-03-31/service-2.json |