|
 |
ac6d36 |
diff -uNr a/awscli/alias.py b/awscli/alias.py
|
|
|
ac6d36 |
--- a/awscli/alias.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/alias.py 2018-01-26 13:10:00.592942535 +0100
|
|
|
ac6d36 |
@@ -15,6 +15,8 @@
|
|
|
ac6d36 |
import shlex
|
|
|
ac6d36 |
import subprocess
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.configloader import raw_config_parse
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.compat import compat_shell_quote
|
|
|
ac6d36 |
diff -uNr a/awscli/argprocess.py b/awscli/argprocess.py
|
|
|
ac6d36 |
--- a/awscli/argprocess.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/argprocess.py 2018-01-26 13:10:20.958750211 +0100
|
|
|
ac6d36 |
@@ -15,6 +15,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
from awscli.compat import six
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import OrderedDict, json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli import SCALAR_TYPES, COMPLEX_TYPES
|
|
|
ac6d36 |
diff -uNr a/awscli/arguments.py b/awscli/arguments.py
|
|
|
ac6d36 |
--- a/awscli/arguments.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/arguments.py 2018-01-26 13:10:57.422405868 +0100
|
|
|
ac6d36 |
@@ -38,6 +38,8 @@
|
|
|
ac6d36 |
"""
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
from botocore.hooks import first_non_none_response
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/clidocs.py b/awscli/clidocs.py
|
|
|
ac6d36 |
--- a/awscli/clidocs.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/clidocs.py 2018-01-26 13:09:41.085126755 +0100
|
|
|
ac6d36 |
@@ -12,6 +12,8 @@
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
from botocore.docs.bcdoc.docevents import DOC_EVENTS
|
|
|
ac6d36 |
from botocore.model import StringShape
|
|
|
ac6d36 |
diff -uNr a/awscli/clidriver.py b/awscli/clidriver.py
|
|
|
ac6d36 |
--- a/awscli/clidriver.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/clidriver.py 2018-01-26 13:10:06.539886375 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,7 @@
|
|
|
ac6d36 |
import signal
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
import botocore.session
|
|
|
ac6d36 |
from botocore import __version__ as botocore_version
|
|
|
ac6d36 |
from botocore.hooks import HierarchicalEmitter
|
|
|
ac6d36 |
diff -uNr a/awscli/compat.py b/awscli/compat.py
|
|
|
ac6d36 |
--- a/awscli/compat.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/compat.py 2018-01-26 13:11:17.419217029 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,7 @@
|
|
|
ac6d36 |
import platform
|
|
|
ac6d36 |
import zipfile
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import six
|
|
|
ac6d36 |
#import botocore.compat
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/assumerole.py b/awscli/customizations/assumerole.py
|
|
|
ac6d36 |
--- a/awscli/customizations/assumerole.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/assumerole.py 2018-01-26 13:05:13.931649607 +0100
|
|
|
ac6d36 |
@@ -1,6 +1,8 @@
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ProfileNotFound
|
|
|
ac6d36 |
from botocore.credentials import JSONFileCache
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/awslambda.py b/awscli/customizations/awslambda.py
|
|
|
ac6d36 |
--- a/awscli/customizations/awslambda.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/awslambda.py 2018-01-26 13:07:06.376587737 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,8 @@
|
|
|
ac6d36 |
import copy
|
|
|
ac6d36 |
from contextlib import closing
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.vendored import six
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.arguments import CustomArgument, CLIArgument
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudformation/deployer.py b/awscli/customizations/cloudformation/deployer.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudformation/deployer.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudformation/deployer.py 2018-01-26 13:08:05.525029173 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,7 @@
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
import time
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
import botocore
|
|
|
ac6d36 |
import collections
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudformation/package.py b/awscli/customizations/cloudformation/package.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudformation/package.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudformation/package.py 2018-01-26 13:07:59.865082622 +0100
|
|
|
ac6d36 |
@@ -17,6 +17,7 @@
|
|
|
ac6d36 |
|
|
|
ac6d36 |
import json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.client import Config
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.customizations.cloudformation.artifact_exporter import Template
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudfront.py b/awscli/customizations/cloudfront.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudfront.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudfront.py 2018-01-26 13:07:51.406162504 +0100
|
|
|
ac6d36 |
@@ -15,6 +15,7 @@
|
|
|
ac6d36 |
from cryptography.hazmat.primitives import serialization, hashes
|
|
|
ac6d36 |
from cryptography.hazmat.primitives.asymmetric import padding
|
|
|
ac6d36 |
from cryptography.hazmat.backends import default_backend
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.utils import parse_to_aware_datetime
|
|
|
ac6d36 |
from botocore.signers import CloudFrontSigner
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudsearch.py b/awscli/customizations/cloudsearch.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudsearch.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudsearch.py 2018-01-26 13:09:14.013382406 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.customizations.flatten import FlattenArguments, SEP
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import OrderedDict
|
|
|
ac6d36 |
|
|
|
ac6d36 |
LOG = logging.getLogger(__name__)
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudtrail/subscribe.py b/awscli/customizations/cloudtrail/subscribe.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudtrail/subscribe.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudtrail/subscribe.py 2018-01-26 13:09:31.120220859 +0100
|
|
|
ac6d36 |
@@ -17,6 +17,7 @@
|
|
|
ac6d36 |
from .utils import get_account_id
|
|
|
ac6d36 |
from awscli.customizations.commands import BasicCommand
|
|
|
ac6d36 |
from awscli.customizations.utils import s3_bucket_exists
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/cloudtrail/validation.py b/awscli/customizations/cloudtrail/validation.py
|
|
|
ac6d36 |
--- a/awscli/customizations/cloudtrail/validation.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/cloudtrail/validation.py 2018-01-26 13:09:24.109287066 +0100
|
|
|
ac6d36 |
@@ -28,6 +28,7 @@
|
|
|
ac6d36 |
from awscli.customizations.cloudtrail.utils import get_trail_by_arn, \
|
|
|
ac6d36 |
get_account_id_from_arn
|
|
|
ac6d36 |
from awscli.customizations.commands import BasicCommand
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/codecommit.py b/awscli/customizations/codecommit.py
|
|
|
ac6d36 |
--- a/awscli/customizations/codecommit.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/codecommit.py 2018-01-26 13:07:32.888337376 +0100
|
|
|
ac6d36 |
@@ -18,6 +18,7 @@
|
|
|
ac6d36 |
import fileinput
|
|
|
ac6d36 |
import datetime
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.auth import SigV4Auth
|
|
|
ac6d36 |
from botocore.awsrequest import AWSRequest
|
|
|
ac6d36 |
from botocore.compat import urlsplit
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/codedeploy/deregister.py b/awscli/customizations/codedeploy/deregister.py
|
|
|
ac6d36 |
--- a/awscli/customizations/codedeploy/deregister.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/codedeploy/deregister.py 2018-01-26 13:08:35.275748222 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,7 @@
|
|
|
ac6d36 |
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.customizations.commands import BasicCommand
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/codedeploy/push.py b/awscli/customizations/codedeploy/push.py
|
|
|
ac6d36 |
--- a/awscli/customizations/codedeploy/push.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/codedeploy/push.py 2018-01-26 13:08:28.662810672 +0100
|
|
|
ac6d36 |
@@ -18,6 +18,7 @@
|
|
|
ac6d36 |
import contextlib
|
|
|
ac6d36 |
from datetime import datetime
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.compat import six
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/commands.py b/awscli/customizations/commands.py
|
|
|
ac6d36 |
--- a/awscli/customizations/commands.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/commands.py 2018-01-26 13:09:04.583471457 +0100
|
|
|
ac6d36 |
@@ -1,6 +1,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import model
|
|
|
ac6d36 |
from botocore.compat import OrderedDict
|
|
|
ac6d36 |
from botocore.validate import validate_parameters
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/configure/addmodel.py b/awscli/customizations/configure/addmodel.py
|
|
|
ac6d36 |
--- a/awscli/customizations/configure/addmodel.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/configure/addmodel.py 2018-01-26 13:06:54.673698254 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,8 @@
|
|
|
ac6d36 |
import json
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.model import ServiceModel
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.customizations.commands import BasicCommand
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/configure/configure.py b/awscli/customizations/configure/configure.py
|
|
|
ac6d36 |
--- a/awscli/customizations/configure/configure.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/configure/configure.py 2018-01-26 13:06:42.425813916 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,8 @@
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ProfileNotFound
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.compat import compat_input
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/configure/__init__.py b/awscli/customizations/configure/__init__.py
|
|
|
ac6d36 |
--- a/awscli/customizations/configure/__init__.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/configure/__init__.py 2018-01-26 13:06:37.421861170 +0100
|
|
|
ac6d36 |
@@ -11,6 +11,8 @@
|
|
|
ac6d36 |
# ANY KIND, either express or implied. See the License for the specific
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
import string
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.vendored.six.moves import shlex_quote
|
|
|
ac6d36 |
|
|
|
ac6d36 |
NOT_SET = '<not set>'
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/datapipeline/createdefaultroles.py b/awscli/customizations/datapipeline/createdefaultroles.py
|
|
|
ac6d36 |
--- a/awscli/customizations/datapipeline/createdefaultroles.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/datapipeline/createdefaultroles.py 2018-01-26 13:09:36.179173085 +0100
|
|
|
ac6d36 |
@@ -24,6 +24,8 @@
|
|
|
ac6d36 |
from awscli.customizations.commands import BasicCommand
|
|
|
ac6d36 |
from awscli.customizations.datapipeline.translator \
|
|
|
ac6d36 |
import display_response, dict_to_string, get_region
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
LOG = logging.getLogger(__name__)
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/ec2/addcount.py b/awscli/customizations/ec2/addcount.py
|
|
|
ac6d36 |
--- a/awscli/customizations/ec2/addcount.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/ec2/addcount.py 2018-01-26 13:08:09.954987338 +0100
|
|
|
ac6d36 |
@@ -12,6 +12,8 @@
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import model
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.arguments import BaseCLIArgument
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/ec2/decryptpassword.py b/awscli/customizations/ec2/decryptpassword.py
|
|
|
ac6d36 |
--- a/awscli/customizations/ec2/decryptpassword.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/ec2/decryptpassword.py 2018-01-26 13:08:15.792932208 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,8 @@
|
|
|
ac6d36 |
from cryptography.hazmat.primitives.asymmetric import padding
|
|
|
ac6d36 |
from awscli.compat import six
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import model
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.arguments import BaseCLIArgument
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/createcluster.py b/awscli/customizations/emr/createcluster.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/createcluster.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/createcluster.py 2018-01-26 13:04:05.229298393 +0100
|
|
|
ac6d36 |
@@ -28,6 +28,8 @@
|
|
|
ac6d36 |
from awscli.customizations.emr.command import Command
|
|
|
ac6d36 |
from awscli.customizations.emr.constants import EC2_ROLE_NAME
|
|
|
ac6d36 |
from awscli.customizations.emr.constants import EMR_ROLE_NAME
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/createdefaultroles.py b/awscli/customizations/emr/createdefaultroles.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/createdefaultroles.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/createdefaultroles.py 2018-01-26 13:04:47.028903661 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,8 @@
|
|
|
ac6d36 |
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
import re
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
import botocore.exceptions
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/describecluster.py b/awscli/customizations/emr/describecluster.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/describecluster.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/describecluster.py 2018-01-26 13:04:12.891226039 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,8 @@
|
|
|
ac6d36 |
from awscli.customizations.emr import emrutils
|
|
|
ac6d36 |
from awscli.customizations.emr import helptext
|
|
|
ac6d36 |
from awscli.customizations.emr.command import Command
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import NoCredentialsError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/emrfsutils.py b/awscli/customizations/emr/emrfsutils.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/emrfsutils.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/emrfsutils.py 2018-01-26 13:03:57.650369965 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,8 @@
|
|
|
ac6d36 |
from awscli.customizations.emr import constants
|
|
|
ac6d36 |
from awscli.customizations.emr import emrutils
|
|
|
ac6d36 |
from awscli.customizations.emr import exceptions
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import OrderedDict
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/emrutils.py b/awscli/customizations/emr/emrutils.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/emrutils.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/emrutils.py 2018-01-26 13:04:20.074158208 +0100
|
|
|
ac6d36 |
@@ -19,6 +19,8 @@
|
|
|
ac6d36 |
from awscli.clidriver import CLIOperationCaller
|
|
|
ac6d36 |
from awscli.customizations.emr import constants
|
|
|
ac6d36 |
from awscli.customizations.emr import exceptions
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import WaiterError, NoCredentialsError
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/emr/sshutils.py b/awscli/customizations/emr/sshutils.py
|
|
|
ac6d36 |
--- a/awscli/customizations/emr/sshutils.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/emr/sshutils.py 2018-01-26 13:03:43.736501361 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,8 @@
|
|
|
ac6d36 |
from awscli.customizations.emr import exceptions
|
|
|
ac6d36 |
from awscli.customizations.emr import emrutils
|
|
|
ac6d36 |
from awscli.customizations.emr import constants
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import WaiterError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
LOG = logging.getLogger(__name__)
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/generatecliskeleton.py b/awscli/customizations/generatecliskeleton.py
|
|
|
ac6d36 |
--- a/awscli/customizations/generatecliskeleton.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/generatecliskeleton.py 2018-01-26 13:08:42.166683149 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,7 @@
|
|
|
ac6d36 |
import json
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
from botocore.stub import Stubber
|
|
|
ac6d36 |
from botocore.utils import ArgumentGenerator
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/globalargs.py b/awscli/customizations/globalargs.py
|
|
|
ac6d36 |
--- a/awscli/customizations/globalargs.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/globalargs.py 2018-01-26 13:08:21.690876511 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,7 @@
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.client import Config
|
|
|
ac6d36 |
from botocore.endpoint import DEFAULT_TIMEOUT
|
|
|
ac6d36 |
from botocore.handlers import disable_signing
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/history/db.py b/awscli/customizations/history/db.py
|
|
|
ac6d36 |
--- a/awscli/customizations/history/db.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/history/db.py 2018-01-26 13:07:46.435209447 +0100
|
|
|
ac6d36 |
@@ -18,6 +18,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
from collections import MutableMapping
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.history import BaseHistoryHandler
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.compat import sqlite3
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/history/__init__.py b/awscli/customizations/history/__init__.py
|
|
|
ac6d36 |
--- a/awscli/customizations/history/__init__.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/history/__init__.py 2018-01-26 13:07:39.310276730 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,7 @@
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.history import get_global_history_recorder
|
|
|
ac6d36 |
from botocore.exceptions import ProfileNotFound
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/opsworks.py b/awscli/customizations/opsworks.py
|
|
|
ac6d36 |
--- a/awscli/customizations/opsworks.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/opsworks.py 2018-01-26 13:05:52.174288464 +0100
|
|
|
ac6d36 |
@@ -22,6 +22,8 @@
|
|
|
ac6d36 |
import tempfile
|
|
|
ac6d36 |
import textwrap
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.compat import shlex_quote, urlopen, ensure_text_type
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/paginate.py b/awscli/customizations/paginate.py
|
|
|
ac6d36 |
--- a/awscli/customizations/paginate.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/paginate.py 2018-01-26 13:08:58.653527456 +0100
|
|
|
ac6d36 |
@@ -26,6 +26,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
from functools import partial
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
from botocore.exceptions import DataNotFoundError, PaginationError
|
|
|
ac6d36 |
from botocore import model
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/s3/filegenerator.py b/awscli/customizations/s3/filegenerator.py
|
|
|
ac6d36 |
--- a/awscli/customizations/s3/filegenerator.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/s3/filegenerator.py 2018-01-26 13:03:20.538720427 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,7 @@
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from dateutil.parser import parse
|
|
|
ac6d36 |
from dateutil.tz import tzlocal
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.customizations.s3.utils import find_bucket_key, get_file_stat
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/subcommands.py
|
|
|
ac6d36 |
--- a/awscli/customizations/s3/subcommands.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/s3/subcommands.py 2018-01-26 13:03:12.534796012 +0100
|
|
|
ac6d36 |
@@ -14,6 +14,7 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.client import Config
|
|
|
ac6d36 |
from dateutil.parser import parse
|
|
|
ac6d36 |
from dateutil.tz import tzlocal
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/s3endpoint.py b/awscli/customizations/s3endpoint.py
|
|
|
ac6d36 |
--- a/awscli/customizations/s3endpoint.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/s3endpoint.py 2018-01-26 13:05:58.240231181 +0100
|
|
|
ac6d36 |
@@ -26,6 +26,8 @@
|
|
|
ac6d36 |
"""
|
|
|
ac6d36 |
from functools import partial
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.utils import fix_s3_host
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/s3uploader.py b/awscli/customizations/s3uploader.py
|
|
|
ac6d36 |
--- a/awscli/customizations/s3uploader.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/s3uploader.py 2018-01-26 13:06:04.494172122 +0100
|
|
|
ac6d36 |
@@ -17,6 +17,7 @@
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
import botocore
|
|
|
ac6d36 |
import botocore.exceptions
|
|
|
ac6d36 |
from s3transfer.manager import TransferManager
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/scalarparse.py b/awscli/customizations/scalarparse.py
|
|
|
ac6d36 |
--- a/awscli/customizations/scalarparse.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/scalarparse.py 2018-01-26 13:05:00.167779585 +0100
|
|
|
ac6d36 |
@@ -27,6 +27,8 @@
|
|
|
ac6d36 |
in the future.
|
|
|
ac6d36 |
|
|
|
ac6d36 |
"""
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.utils import parse_timestamp
|
|
|
ac6d36 |
from botocore.exceptions import ProfileNotFound
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/servicecatalog/generateproduct.py b/awscli/customizations/servicecatalog/generateproduct.py
|
|
|
ac6d36 |
--- a/awscli/customizations/servicecatalog/generateproduct.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/servicecatalog/generateproduct.py 2018-01-26 13:07:18.521473049 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,7 @@
|
|
|
ac6d36 |
from awscli.customizations.servicecatalog import helptext
|
|
|
ac6d36 |
from awscli.customizations.servicecatalog.generatebase \
|
|
|
ac6d36 |
import GenerateBaseCommand
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/servicecatalog/generateprovisioningartifact.py b/awscli/customizations/servicecatalog/generateprovisioningartifact.py
|
|
|
ac6d36 |
--- a/awscli/customizations/servicecatalog/generateprovisioningartifact.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/servicecatalog/generateprovisioningartifact.py 2018-01-26 13:07:12.858526527 +0100
|
|
|
ac6d36 |
@@ -16,6 +16,7 @@
|
|
|
ac6d36 |
from awscli.customizations.servicecatalog import helptext
|
|
|
ac6d36 |
from awscli.customizations.servicecatalog.generatebase \
|
|
|
ac6d36 |
import GenerateBaseCommand
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/streamingoutputarg.py b/awscli/customizations/streamingoutputarg.py
|
|
|
ac6d36 |
--- a/awscli/customizations/streamingoutputarg.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/streamingoutputarg.py 2018-01-26 13:07:00.862639809 +0100
|
|
|
ac6d36 |
@@ -10,6 +10,8 @@
|
|
|
ac6d36 |
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
|
|
|
ac6d36 |
# ANY KIND, either express or implied. See the License for the specific
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.model import Shape
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from awscli.arguments import BaseCLIArgument
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/utils.py b/awscli/customizations/utils.py
|
|
|
ac6d36 |
--- a/awscli/customizations/utils.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/utils.py 2018-01-26 13:03:26.771661567 +0100
|
|
|
ac6d36 |
@@ -17,6 +17,7 @@
|
|
|
ac6d36 |
import copy
|
|
|
ac6d36 |
import sys
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/customizations/waiters.py b/awscli/customizations/waiters.py
|
|
|
ac6d36 |
--- a/awscli/customizations/waiters.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/customizations/waiters.py 2018-01-26 13:05:06.223722396 +0100
|
|
|
ac6d36 |
@@ -10,6 +10,8 @@
|
|
|
ac6d36 |
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
|
|
|
ac6d36 |
# ANY KIND, either express or implied. See the License for the specific
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore import xform_name
|
|
|
ac6d36 |
from botocore.exceptions import DataNotFoundError
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/formatter.py b/awscli/formatter.py
|
|
|
ac6d36 |
--- a/awscli/formatter.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/formatter.py 2018-01-26 13:10:13.129824143 +0100
|
|
|
ac6d36 |
@@ -12,6 +12,8 @@
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.compat import json
|
|
|
ac6d36 |
|
|
|
ac6d36 |
from botocore.utils import set_value_from_jmespath
|
|
|
ac6d36 |
diff -uNr a/awscli/help.py b/awscli/help.py
|
|
|
ac6d36 |
--- a/awscli/help.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/help.py 2018-01-26 13:02:53.873972235 +0100
|
|
|
ac6d36 |
@@ -20,6 +20,7 @@
|
|
|
ac6d36 |
from docutils.core import publish_string
|
|
|
ac6d36 |
from docutils.writers import manpage
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.docs.bcdoc import docevents
|
|
|
ac6d36 |
from botocore.docs.bcdoc.restdoc import ReSTDocument
|
|
|
ac6d36 |
from botocore.docs.bcdoc.textwriter import TextWriter
|
|
|
ac6d36 |
diff -uNr a/awscli/paramfile.py b/awscli/paramfile.py
|
|
|
ac6d36 |
--- a/awscli/paramfile.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/paramfile.py 2018-01-26 13:09:46.469075911 +0100
|
|
|
ac6d36 |
@@ -13,6 +13,8 @@
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
import os
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.vendored import requests
|
|
|
ac6d36 |
from awscli.compat import six
|
|
|
ac6d36 |
|
|
|
ac6d36 |
diff -uNr a/awscli/plugin.py b/awscli/plugin.py
|
|
|
ac6d36 |
--- a/awscli/plugin.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/plugin.py 2018-01-26 13:11:22.716167007 +0100
|
|
|
ac6d36 |
@@ -12,6 +12,8 @@
|
|
|
ac6d36 |
# language governing permissions and limitations under the License.
|
|
|
ac6d36 |
import logging
|
|
|
ac6d36 |
|
|
|
ac6d36 |
+import sys
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.hooks import HierarchicalEmitter
|
|
|
ac6d36 |
|
|
|
ac6d36 |
log = logging.getLogger('awscli.plugin')
|
|
|
ac6d36 |
diff -uNr a/awscli/testutils.py b/awscli/testutils.py
|
|
|
ac6d36 |
--- a/awscli/testutils.py 2018-01-18 02:06:58.000000000 +0100
|
|
|
ac6d36 |
+++ b/awscli/testutils.py 2018-01-26 13:09:52.192021868 +0100
|
|
|
ac6d36 |
@@ -47,6 +47,7 @@
|
|
|
ac6d36 |
# different story.
|
|
|
ac6d36 |
mock = None
|
|
|
ac6d36 |
from awscli.compat import six
|
|
|
ac6d36 |
+sys.path.insert(0, '/usr/lib/fence-agents/bundled')
|
|
|
ac6d36 |
from botocore.hooks import HierarchicalEmitter
|
|
|
ac6d36 |
from botocore.session import Session
|
|
|
ac6d36 |
from botocore.exceptions import ClientError
|