ops-cli 2.1.7__tar.gz → 2.2.1__tar.gz

{ops-cli-2.1.7/src/ops_cli.egg-info → ops-cli-2.2.1}/PKG-INFO

@@ -1,23 +1,20 @@
 Metadata-Version: 2.1
 Name: ops-cli
-Version: 2.1.7
+Version: 2.2.1
 Summary: Ops - wrapper for Terraform, Ansible, and SSH for cloud automation
 Home-page: https://github.com/adobe/ops-cli
 Author: Adobe
 Author-email: noreply@adobe.com
 License: Apache2
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
@@ -26,6 +23,146 @@ Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: adal==1.2.7
+Requires-Dist: ansible==8.2.0; python_version >= "3.9"
+Requires-Dist: ansible-core==2.15.5; python_version >= "3.9"
+Requires-Dist: awscli==1.29.12; python_version >= "3.7"
+Requires-Dist: azure==4.0.0
+Requires-Dist: azure-applicationinsights==0.1.1
+Requires-Dist: azure-batch==4.1.3
+Requires-Dist: azure-common==1.1.28
+Requires-Dist: azure-core==1.29.4; python_version >= "3.7"
+Requires-Dist: azure-cosmosdb-nspkg==2.0.2
+Requires-Dist: azure-cosmosdb-table==1.0.6
+Requires-Dist: azure-datalake-store==0.0.53
+Requires-Dist: azure-eventgrid==1.3.0
+Requires-Dist: azure-graphrbac==0.40.0
+Requires-Dist: azure-keyvault==1.1.0
+Requires-Dist: azure-loganalytics==0.1.1
+Requires-Dist: azure-mgmt==4.0.0
+Requires-Dist: azure-mgmt-advisor==1.0.1
+Requires-Dist: azure-mgmt-applicationinsights==0.1.1
+Requires-Dist: azure-mgmt-authorization==0.50.0
+Requires-Dist: azure-mgmt-batch==5.0.1
+Requires-Dist: azure-mgmt-batchai==2.0.0
+Requires-Dist: azure-mgmt-billing==0.2.0
+Requires-Dist: azure-mgmt-cdn==3.1.0
+Requires-Dist: azure-mgmt-cognitiveservices==3.0.0
+Requires-Dist: azure-mgmt-commerce==1.0.1
+Requires-Dist: azure-mgmt-compute==4.6.2
+Requires-Dist: azure-mgmt-consumption==2.0.0
+Requires-Dist: azure-mgmt-containerinstance==1.5.0
+Requires-Dist: azure-mgmt-containerregistry==2.8.0
+Requires-Dist: azure-mgmt-containerservice==4.4.0
+Requires-Dist: azure-mgmt-cosmosdb==0.4.1
+Requires-Dist: azure-mgmt-datafactory==0.6.0
+Requires-Dist: azure-mgmt-datalake-analytics==0.6.0
+Requires-Dist: azure-mgmt-datalake-nspkg==3.0.1
+Requires-Dist: azure-mgmt-datalake-store==0.5.0
+Requires-Dist: azure-mgmt-datamigration==1.0.0
+Requires-Dist: azure-mgmt-devspaces==0.1.0
+Requires-Dist: azure-mgmt-devtestlabs==2.2.0
+Requires-Dist: azure-mgmt-dns==2.1.0
+Requires-Dist: azure-mgmt-eventgrid==1.0.0
+Requires-Dist: azure-mgmt-eventhub==2.6.0
+Requires-Dist: azure-mgmt-hanaonazure==0.1.1
+Requires-Dist: azure-mgmt-iotcentral==0.1.0
+Requires-Dist: azure-mgmt-iothub==0.5.0
+Requires-Dist: azure-mgmt-iothubprovisioningservices==0.2.0
+Requires-Dist: azure-mgmt-keyvault==1.1.0
+Requires-Dist: azure-mgmt-loganalytics==0.2.0
+Requires-Dist: azure-mgmt-logic==3.0.0
+Requires-Dist: azure-mgmt-machinelearningcompute==0.4.1
+Requires-Dist: azure-mgmt-managementgroups==0.1.0
+Requires-Dist: azure-mgmt-managementpartner==0.1.1
+Requires-Dist: azure-mgmt-maps==0.1.0
+Requires-Dist: azure-mgmt-marketplaceordering==0.1.0
+Requires-Dist: azure-mgmt-media==1.0.1
+Requires-Dist: azure-mgmt-monitor==0.5.2
+Requires-Dist: azure-mgmt-msi==0.2.0
+Requires-Dist: azure-mgmt-network==2.7.0
+Requires-Dist: azure-mgmt-notificationhubs==2.1.0
+Requires-Dist: azure-mgmt-nspkg==3.0.2
+Requires-Dist: azure-mgmt-policyinsights==0.1.0
+Requires-Dist: azure-mgmt-powerbiembedded==2.0.0
+Requires-Dist: azure-mgmt-rdbms==1.9.0
+Requires-Dist: azure-mgmt-recoveryservices==0.3.0
+Requires-Dist: azure-mgmt-recoveryservicesbackup==0.3.0
+Requires-Dist: azure-mgmt-redis==5.0.0
+Requires-Dist: azure-mgmt-relay==0.1.0
+Requires-Dist: azure-mgmt-reservations==0.2.1
+Requires-Dist: azure-mgmt-resource==2.2.0
+Requires-Dist: azure-mgmt-scheduler==2.0.0
+Requires-Dist: azure-mgmt-search==2.1.0
+Requires-Dist: azure-mgmt-servicebus==0.5.3
+Requires-Dist: azure-mgmt-servicefabric==0.2.0
+Requires-Dist: azure-mgmt-signalr==0.1.1
+Requires-Dist: azure-mgmt-sql==0.9.1
+Requires-Dist: azure-mgmt-storage==2.0.0
+Requires-Dist: azure-mgmt-subscription==0.2.0
+Requires-Dist: azure-mgmt-trafficmanager==0.50.0
+Requires-Dist: azure-mgmt-web==0.35.0
+Requires-Dist: azure-nspkg==3.0.2
+Requires-Dist: azure-servicebus==0.21.1
+Requires-Dist: azure-servicefabric==6.3.0.0
+Requires-Dist: azure-servicemanagement-legacy==0.20.7
+Requires-Dist: azure-storage-blob==1.5.0
+Requires-Dist: azure-storage-common==1.4.2
+Requires-Dist: azure-storage-file==1.4.0
+Requires-Dist: azure-storage-queue==1.4.0
+Requires-Dist: backports.functools-lru-cache==1.6.6; python_version >= "2.6"
+Requires-Dist: boto==2.49.0
+Requires-Dist: boto3==1.28.12; python_version >= "3.7"
+Requires-Dist: botocore==1.31.12; python_version >= "3.7"
+Requires-Dist: cachetools==5.3.1; python_version >= "3.7"
+Requires-Dist: certifi==2023.7.22; python_version >= "3.6"
+Requires-Dist: cffi==1.16.0; python_version >= "3.8"
+Requires-Dist: charset-normalizer==3.3.0; python_full_version >= "3.7.0"
+Requires-Dist: colorama==0.4.4; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
+Requires-Dist: cryptography==41.0.4; python_version >= "3.7"
+Requires-Dist: deepmerge==1.1.0
+Requires-Dist: docutils==0.16; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
+Requires-Dist: gitdb==4.0.10; python_version >= "3.7"
+Requires-Dist: gitpython==3.1.37; python_version >= "3.7"
+Requires-Dist: google-auth==2.23.3; python_version >= "3.7"
+Requires-Dist: hashmerge==0.2
+Requires-Dist: himl==0.15.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: hvac==1.1.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0"
+Requires-Dist: idna==3.4; python_version >= "3.5"
+Requires-Dist: inflection==0.5.1; python_version >= "3.5"
+Requires-Dist: isodate==0.6.1
+Requires-Dist: jinja2==3.1.2; python_version >= "3.7"
+Requires-Dist: jmespath==1.0.1; python_version >= "3.7"
+Requires-Dist: kubernetes==26.1.0; python_version >= "3.6"
+Requires-Dist: lru-cache==0.2.3
+Requires-Dist: markupsafe==2.1.3; python_version >= "3.7"
+Requires-Dist: msal==1.24.1; python_version >= "2.7"
+Requires-Dist: msrest==0.7.1; python_version >= "3.6"
+Requires-Dist: msrestazure==0.6.4
+Requires-Dist: oauthlib==3.2.2; python_version >= "3.6"
+Requires-Dist: packaging==23.2; python_version >= "3.7"
+Requires-Dist: passgen==1.1.1
+Requires-Dist: pathlib2==2.3.7.post1
+Requires-Dist: pyasn1==0.5.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
+Requires-Dist: pyasn1-modules==0.3.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
+Requires-Dist: pycparser==2.21
+Requires-Dist: pyhcl==0.4.5
+Requires-Dist: pyjwt==2.8.0; python_version >= "3.7"
+Requires-Dist: python-consul==1.1.0
+Requires-Dist: python-dateutil==2.8.2; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
+Requires-Dist: pyyaml==6.0.1; python_version >= "3.6"
+Requires-Dist: requests==2.31.0; python_version >= "3.7"
+Requires-Dist: requests-oauthlib==1.3.1; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: resolvelib==1.0.1
+Requires-Dist: rsa==4.7.2; python_version >= "3.5" and python_version < "4"
+Requires-Dist: s3transfer==0.6.2; python_version >= "3.7"
+Requires-Dist: setuptools==68.2.2; python_version >= "3.8"
+Requires-Dist: simpledi==0.4.1
+Requires-Dist: six==1.16.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
+Requires-Dist: smmap==5.0.1; python_version >= "3.7"
+Requires-Dist: typing-extensions==4.8.0; python_version >= "3.8"
+Requires-Dist: urllib3==1.26.17; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
+Requires-Dist: websocket-client==1.6.4; python_version >= "3.8"
 
 # Ops CLI
 [![Build status](https://github.com/adobe/ops-cli/actions/workflows/release.yml/badge.svg)](https://github.com/adobe/ops-cli/actions/workflows/release.yml) [![Docker image](https://img.shields.io/badge/Docker-ghcr.io/adobe/opscli-brightgreen.svg?style=flat-square)](https://github.com/adobe/ops-cli/pkgs/container/ops-cli) [![License](https://img.shields.io/github/license/adobe/ops-cli)](https://github.com/adobe/ops-cli/blob/master/LICENSE)
@@ -71,6 +208,7 @@ It can be used to add a layer of templating (using jinja2) on top of Terraform f
             * [Terraform landscape](#terraform-landscape)
          * [SSH](#ssh)
             * [SSHPass](#sshpass)
+            * [Balabit SCB](#scb)
          * [Play](#play)
          * [Run command](#run-command)
          * [Sync files](#sync-files)
@@ -179,7 +317,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.1.7 stable release
+# install ops-cli v2.2.1 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -195,7 +333,7 @@ You can try out `ops-cli`, by using docker. The docker image has all required pr
 
 To start out a container, running the latest `ops-cli` docker image run:
 ```sh
-docker run -it ghcr.io/adobe/ops-cli:2.1.7 bash
+docker run -it ghcr.io/adobe/ops-cli:2.2.1 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -810,5 +948,3 @@ Either install the tool in a virtualenv or:
 [Apache License 2.0](/LICENSE)
 
 
-
-

{ops-cli-2.1.7 → ops-cli-2.2.1}/README.md

@@ -42,6 +42,7 @@ It can be used to add a layer of templating (using jinja2) on top of Terraform f
             * [Terraform landscape](#terraform-landscape)
          * [SSH](#ssh)
             * [SSHPass](#sshpass)
+            * [Balabit SCB](#scb)
          * [Play](#play)
          * [Run command](#run-command)
          * [Sync files](#sync-files)
@@ -150,7 +151,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.1.7 stable release
+# install ops-cli v2.2.1 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -166,7 +167,7 @@ You can try out `ops-cli`, by using docker. The docker image has all required pr
 
 To start out a container, running the latest `ops-cli` docker image run:
 ```sh
-docker run -it ghcr.io/adobe/ops-cli:2.1.7 bash
+docker run -it ghcr.io/adobe/ops-cli:2.2.1 bash
 ```
 
 After the container has started, you can start using `ops-cli`:

{ops-cli-2.1.7 → ops-cli-2.2.1}/requirements.txt

@@ -1,16 +1,20 @@
 adal==1.2.7
-ansible==2.9.25
-awscli==1.20.33
-azure-applicationinsights==0.1.0
+ansible==8.2.0; python_version >= '3.9'
+ansible-core==2.15.5; python_version >= '3.9'
+awscli==1.29.12; python_version >= '3.7'
+azure==4.0.0
+azure-applicationinsights==0.1.1
 azure-batch==4.1.3
-azure-common==1.1.27
+azure-common==1.1.28
+azure-core==1.29.4; python_version >= '3.7'
 azure-cosmosdb-nspkg==2.0.2
 azure-cosmosdb-table==1.0.6
-azure-datalake-store==0.0.52
+azure-datalake-store==0.0.53
 azure-eventgrid==1.3.0
 azure-graphrbac==0.40.0
 azure-keyvault==1.1.0
-azure-loganalytics==0.1.0
+azure-loganalytics==0.1.1
+azure-mgmt==4.0.0
 azure-mgmt-advisor==1.0.1
 azure-mgmt-applicationinsights==0.1.1
 azure-mgmt-authorization==0.50.0
@@ -48,7 +52,7 @@ azure-mgmt-managementgroups==0.1.0
 azure-mgmt-managementpartner==0.1.1
 azure-mgmt-maps==0.1.0
 azure-mgmt-marketplaceordering==0.1.0
-azure-mgmt-media==1.0.0
+azure-mgmt-media==1.0.1
 azure-mgmt-monitor==0.5.2
 azure-mgmt-msi==0.2.0
 azure-mgmt-network==2.7.0
@@ -73,7 +77,6 @@ azure-mgmt-storage==2.0.0
 azure-mgmt-subscription==0.2.0
 azure-mgmt-trafficmanager==0.50.0
 azure-mgmt-web==0.35.0
-azure-mgmt==4.0.0
 azure-nspkg==3.0.2
 azure-servicebus==0.21.1
 azure-servicefabric==6.3.0.0
@@ -82,52 +85,56 @@ azure-storage-blob==1.5.0
 azure-storage-common==1.4.2
 azure-storage-file==1.4.0
 azure-storage-queue==1.4.0
-azure==4.0.0
-backports.functools-lru-cache==1.6.4; python_version >= '2.6'
-boto3==1.18.33
+backports.functools-lru-cache==1.6.6; python_version >= '2.6'
 boto==2.49.0
-botocore==1.21.33; python_version >= '3.6'
-cachetools==4.2.4; python_version ~= '3.5'
-certifi==2021.10.8
-cffi==1.15.0
-charset-normalizer==2.0.7; python_version >= '3'
-colorama==0.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-cryptography==35.0.0; python_version >= '3.6'
-deepmerge==0.3.0; python_version >= '3'
-docutils==0.15.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
-gitdb==4.0.7; python_version >= '3.4'
-gitpython==3.1.24
-google-auth==2.3.0; python_version >= '3.6'
+boto3==1.28.12; python_version >= '3.7'
+botocore==1.31.12; python_version >= '3.7'
+cachetools==5.3.1; python_version >= '3.7'
+certifi==2023.7.22; python_version >= '3.6'
+cffi==1.16.0; python_version >= '3.8'
+charset-normalizer==3.3.0; python_full_version >= '3.7.0'
+colorama==0.4.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+cryptography==41.0.4; python_version >= '3.7'
+deepmerge==1.1.0
+docutils==0.16; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+gitdb==4.0.10; python_version >= '3.7'
+gitpython==3.1.37; python_version >= '3.7'
+google-auth==2.23.3; python_version >= '3.7'
 hashmerge==0.2
-himl==0.7.3
-hvac==0.11.0
-idna==3.3; python_version >= '3'
-inflection==0.3.1
-isodate==0.6.0
-jinja2==2.11.3
-jmespath==0.10.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
-kubernetes==18.20.0
+himl==0.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+hvac==1.1.1; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
+idna==3.4; python_version >= '3.5'
+inflection==0.5.1; python_version >= '3.5'
+isodate==0.6.1
+jinja2==3.1.2; python_version >= '3.7'
+jmespath==1.0.1; python_version >= '3.7'
+kubernetes==26.1.0; python_version >= '3.6'
 lru-cache==0.2.3
-markupsafe==2.0.1; python_version >= '3.6'
-msrest==0.6.21
+markupsafe==2.1.3; python_version >= '3.7'
+msal==1.24.1; python_version >= '2.7'
+msrest==0.7.1; python_version >= '3.6'
 msrestazure==0.6.4
-oauthlib==3.1.1; python_version >= '3.6'
+oauthlib==3.2.2; python_version >= '3.6'
+packaging==23.2; python_version >= '3.7'
 passgen==1.1.1
-pathlib2==2.3.6
-pyasn1-modules==0.2.8
-pyasn1==0.4.8
-pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pyjwt==2.2.0; python_version >= '3.6'
+pathlib2==2.3.7.post1
+pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+pyasn1-modules==0.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+pycparser==2.21
+pyhcl==0.4.5
+pyjwt==2.8.0; python_version >= '3.7'
 python-consul==1.1.0
 python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
-pyyaml==5.4.1
-requests-oauthlib==1.3.0
-requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+pyyaml==6.0.1; python_version >= '3.6'
+requests==2.31.0; python_version >= '3.7'
+requests-oauthlib==1.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+resolvelib==1.0.1
 rsa==4.7.2; python_version >= '3.5' and python_version < '4'
-s3transfer==0.5.0; python_version >= '3.6'
-simpledi==0.3
-six==1.16.0
-smmap==4.0.0; python_version >= '3.5'
-typing-extensions==3.10.0.2; python_version < '3.10'
-urllib3==1.26.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-websocket-client==1.2.1; python_version >= '3.6'
+s3transfer==0.6.2; python_version >= '3.7'
+setuptools==68.2.2; python_version >= '3.8'
+simpledi==0.4.1
+six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+smmap==5.0.1; python_version >= '3.7'
+typing-extensions==4.8.0; python_version >= '3.8'
+urllib3==1.26.17; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+websocket-client==1.6.4; python_version >= '3.8'

{ops-cli-2.1.7 → ops-cli-2.2.1}/setup.py

@@ -23,7 +23,7 @@ _mydir = os.path.abspath(os.path.dirname(sys.argv[0]))
 _requires = [r for r in open(os.path.sep.join((_mydir, 'requirements.txt')), "r").read().split('\n') if len(r) > 1]
 setup(
     name='ops-cli',
-    version='2.1.7',
+    version='2.2.1',
     description='Ops - wrapper for Terraform, Ansible, and SSH for cloud automation',
     long_description=_readme + '\n\n',
     long_description_content_type='text/markdown',
@@ -39,11 +39,9 @@ setup(
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',

{ops-cli-2.1.7 → ops-cli-2.2.1}/src/ops/cli/aws.py

@@ -9,13 +9,14 @@
 # governing permissions and limitations under the License.
 
 from . import get_output
+from shlex import quote
 
 
 def access_key(profile):
     return get_output(
-        'aws configure get aws_access_key_id --profile %s' % profile)
+        'aws configure get aws_access_key_id --profile %s' % quote(profile))
 
 
 def secret_key(profile):
     return get_output(
-        'aws configure get aws_secret_access_key --profile %s' % profile)
+        'aws configure get aws_secret_access_key --profile %s' % quote(profile))

{ops-cli-2.1.7 → ops-cli-2.2.1}/src/ops/cli/config.py

@@ -8,21 +8,22 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
-import collections
 import os
-
 import yaml
 
 from ansible.module_utils.common.collections import ImmutableDict
 from ansible.parsing.dataloader import DataLoader
-from ansible.plugins.loader import PluginLoader
 from ansible.template import Templar
-from ansible.utils.vars import load_extra_vars
+from ansible.utils.vars import combine_vars
 from ansible.vars.manager import VariableManager
 from ops.cli import display
 from ansible import constants as C
 from ansible import context
 import logging
+from ansible.errors import AnsibleOptionsError
+from ansible.module_utils._text import to_text
+from ansible.parsing.splitter import parse_kv
+from collections.abc import MutableMapping
 
 logger = logging.getLogger(__name__)
 
@@ -34,6 +35,38 @@ def get_cluster_name(cluster_config_path):
         '/')[-1].replace('.yaml', '').replace('.yml', '')
 
 
+def load_extra_vars(loader):
+    """
+    Overriding Ansible function using version before slight var loading optimization
+    in order to avoid caching issues https://github.com/ansible/ansible/pull/78835/files
+    """
+
+    extra_vars = {}
+    for extra_vars_opt in context.CLIARGS.get('extra_vars', tuple()):
+        data = None
+        extra_vars_opt = to_text(extra_vars_opt, errors='surrogate_or_strict')
+        if extra_vars_opt is None or not extra_vars_opt:
+            continue
+
+        if extra_vars_opt.startswith(u"@"):
+            # Argument is a YAML file (JSON is a subset of YAML)
+            data = loader.load_from_file(extra_vars_opt[1:])
+        elif extra_vars_opt[0] in [u'/', u'.']:
+            raise AnsibleOptionsError("Please prepend extra_vars filename '%s' with '@'" % extra_vars_opt)
+        elif extra_vars_opt[0] in [u'[', u'{']:
+            # Arguments as YAML
+            data = loader.load(extra_vars_opt)
+        else:
+            # Arguments as Key-value
+            data = parse_kv(extra_vars_opt)
+
+        if isinstance(data, MutableMapping):
+            extra_vars = combine_vars(extra_vars, data)
+        else:
+            raise AnsibleOptionsError("Invalid extra vars data supplied. '%s' could not be made into a dictionary" % extra_vars_opt)
+    return extra_vars
+
+
 class ClusterConfig(object):
     def __init__(self, cluster_config_generator,
                  ops_config, cluster_config_path):
@@ -164,6 +197,8 @@ class ClusterConfigGenerator(object):
         read_variables = variable_manager.get_vars()
 
         templar = Templar(data_loader, variables=read_variables)
-        templar._filter_loader = self.template.filter_plugin_loader
+
+        for filter in self.template.filter_plugin_loader.all():
+            templar.environment.filters.update(filter.filters())
 
         return templar.template(read_variables, fail_on_undefined=True)

{ops-cli-2.1.7 → ops-cli-2.2.1}/src/ops/cli/ssh.py

@@ -286,7 +286,7 @@ class SshRunner(object):
         if args.proxy:
             if scb_enabled:
                 proxy_port = args.local or SshConfigGenerator.generate_ssh_scb_proxy_port(
-                    self.ansible_inventory.generated_path.rstrip("/inventory"),
+                    self.ansible_inventory.generated_path.removesuffix("/inventory"),
                     args.auto_scb_port,
                     scb_proxy_port
                 )

{ops-cli-2.1.7 → ops-cli-2.2.1}/src/ops/inventory/sshconfig.py

@@ -90,7 +90,7 @@ class SshConfigGenerator(object):
         ssh_config_content = ssh_config_template.format(
             scb_proxy_port=scb_proxy_port
         )
-        ssh_config_path = ssh_config_tpl_path.rstrip("_tpl")
+        ssh_config_path = ssh_config_tpl_path.removesuffix("_tpl")
         with open(ssh_config_path, 'w') as f:
             f.write(ssh_config_content)
             os.fchmod(f.fileno(), 0o644)