ops-cli 2.2.0__tar.gz → 2.3.0__tar.gz

{ops-cli-2.2.0/src/ops_cli.egg-info → ops_cli-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ops-cli
-Version: 2.2.0
+Version: 2.3.0
 Summary: Ops - wrapper for Terraform, Ansible, and SSH for cloud automation
 Home-page: https://github.com/adobe/ops-cli
 Author: Adobe
@@ -23,6 +23,155 @@ 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.7.0; python_version >= "3.9"
+Requires-Dist: ansible-core==2.15.13; python_version >= "3.9"
+Requires-Dist: awscli==1.32.6; python_version >= "3.8"
+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.32.0; python_version >= "3.8"
+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.8
+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: boto3==1.34.6; python_version >= "3.8"
+Requires-Dist: botocore==1.34.6; python_version >= "3.8"
+Requires-Dist: cachetools==5.5.0; python_version >= "3.7"
+Requires-Dist: certifi==2024.12.14; python_version >= "3.6"
+Requires-Dist: cffi==1.17.1; python_version >= "3.8"
+Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7"
+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==44.0.0; python_version >= "3.7" and python_full_version not in "3.9.0, 3.9.1"
+Requires-Dist: deepmerge==1.1.1
+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.12; python_version >= "3.7"
+Requires-Dist: gitpython==3.1.44; python_version >= "3.7"
+Requires-Dist: google-auth==2.37.0; python_version >= "3.7"
+Requires-Dist: hashmerge==0.2
+Requires-Dist: himl==0.15.2; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: hvac==1.2.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0"
+Requires-Dist: idna==3.10; python_version >= "3.6"
+Requires-Dist: inflection==0.5.1; python_version >= "3.5"
+Requires-Dist: isodate==0.7.2; python_version >= "3.7"
+Requires-Dist: jinja2==3.1.4; 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==3.0.2; python_version >= "3.9"
+Requires-Dist: msal==1.31.1; python_version >= "3.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==24.2; python_version >= "3.8"
+Requires-Dist: passgen==1.1.1
+Requires-Dist: pathlib2==2.3.7.post1
+Requires-Dist: pyasn1==0.6.1; python_version >= "3.8"
+Requires-Dist: pyasn1-modules==0.4.1; python_version >= "3.8"
+Requires-Dist: pycparser==2.22; python_version >= "3.8"
+Requires-Dist: pyhcl==0.4.5
+Requires-Dist: pyjwt[crypto]==2.10.1; python_version >= "3.9"
+Requires-Dist: python-consul==1.1.0
+Requires-Dist: python-dateutil==2.9.0.post0; 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.32.3; python_version >= "3.8"
+Requires-Dist: requests-oauthlib==2.0.0; python_version >= "3.4"
+Requires-Dist: resolvelib==1.0.1
+Requires-Dist: rsa==4.7.2; python_version >= "3.5" and python_version < "4"
+Requires-Dist: s3transfer==0.10.4; python_version >= "3.8"
+Requires-Dist: setuptools==75.8.0; python_version >= "3.9"
+Requires-Dist: simpledi==0.4.1
+Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
+Requires-Dist: smmap==5.0.2; python_version >= "3.7"
+Requires-Dist: typing-extensions==4.12.2; python_version >= "3.8"
+Requires-Dist: urllib3==2.0.7; python_version >= "3.7"
+Requires-Dist: websocket-client==1.8.0; python_version >= "3.8"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # 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)
@@ -68,6 +217,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)
@@ -176,7 +326,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.2.0 stable release
+# install ops-cli v2.3.0 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -192,7 +342,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.2.0 bash
+docker run -it ghcr.io/adobe/ops-cli:2.3.0 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -718,6 +868,12 @@ Which will translate behind the scenes in :
 This allows us to just refer in cluster files a secret that actually exists in vault and make sure we only generate it once - if it was already created by os or any other system, we will just use what is already there.
 The reference is by means of fixed form jinja call  added to the cluster file, which ends up interpreted later during the templating phase.
 
+#### Vault auth
+Ops checks if a valid vault token is present in `~/.vault-token` or in the environment variable `VAULT_TOKEN`. If not, it will try to authenticate using the method defined in `OPS_VAULT_AUTH_METHOD` environment variable.
+The following methods are supported:
+- `okta` - use the Vault Okta auth method (default)
+- `ldap` - use the Vault ldap auth method
+
 ### Amazon Secrets Manager (SSM)
 
 Amazon offers the possibility to use their [Secrets Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/what-is-systems-manager.html) in order to manage configuration data such as credentials, passwords and license keys.

{ops-cli-2.2.0 → ops_cli-2.3.0}/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.2.0 stable release
+# install ops-cli v2.3.0 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.2.0 bash
+docker run -it ghcr.io/adobe/ops-cli:2.3.0 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -692,6 +693,12 @@ Which will translate behind the scenes in :
 This allows us to just refer in cluster files a secret that actually exists in vault and make sure we only generate it once - if it was already created by os or any other system, we will just use what is already there.
 The reference is by means of fixed form jinja call  added to the cluster file, which ends up interpreted later during the templating phase.
 
+#### Vault auth
+Ops checks if a valid vault token is present in `~/.vault-token` or in the environment variable `VAULT_TOKEN`. If not, it will try to authenticate using the method defined in `OPS_VAULT_AUTH_METHOD` environment variable.
+The following methods are supported:
+- `okta` - use the Vault Okta auth method (default)
+- `ldap` - use the Vault ldap auth method
+
 ### Amazon Secrets Manager (SSM)
 
 Amazon offers the possibility to use their [Secrets Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/what-is-systems-manager.html) in order to manage configuration data such as credentials, passwords and license keys.

{ops-cli-2.2.0 → ops_cli-2.3.0}/requirements.txt

@@ -1,12 +1,12 @@
 adal==1.2.7
-ansible==8.2.0
-ansible-core==2.15.2; python_version >= '3.9'
-awscli==1.29.12
+ansible==8.7.0; python_version >= '3.9'
+ansible-core==2.15.13; python_version >= '3.9'
+awscli==1.32.6; python_version >= '3.8'
 azure==4.0.0
 azure-applicationinsights==0.1.1
 azure-batch==4.1.3
 azure-common==1.1.28
-azure-core==1.28.0; python_version >= '3.7'
+azure-core==1.32.0; python_version >= '3.8'
 azure-cosmosdb-nspkg==2.0.2
 azure-cosmosdb-table==1.0.6
 azure-datalake-store==0.0.53
@@ -80,61 +80,60 @@ azure-mgmt-web==0.35.0
 azure-nspkg==3.0.2
 azure-servicebus==0.21.1
 azure-servicefabric==6.3.0.0
-azure-servicemanagement-legacy==0.20.7
+azure-servicemanagement-legacy==0.20.8
 azure-storage-blob==1.5.0
 azure-storage-common==1.4.2
 azure-storage-file==1.4.0
 azure-storage-queue==1.4.0
 backports.functools-lru-cache==1.6.6; python_version >= '2.6'
-boto==2.49.0
-boto3==1.28.12
-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.15.1
-charset-normalizer==3.2.0; python_full_version >= '3.7.0'
+boto3==1.34.6; python_version >= '3.8'
+botocore==1.34.6; python_version >= '3.8'
+cachetools==5.5.0; python_version >= '3.7'
+certifi==2024.12.14; python_version >= '3.6'
+cffi==1.17.1; python_version >= '3.8'
+charset-normalizer==3.4.1; python_version >= '3.7'
 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.2; python_version >= '3.7'
-deepmerge==1.1.0
+cryptography==44.0.0; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
+deepmerge==1.1.1
 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.32
-google-auth==2.22.0; python_version >= '3.6'
+gitdb==4.0.12; python_version >= '3.7'
+gitpython==3.1.44; python_version >= '3.7'
+google-auth==2.37.0; python_version >= '3.7'
 hashmerge==0.2
-himl==0.15.0
-hvac==1.1.1
-idna==3.4; python_version >= '3.5'
-inflection==0.5.1
-isodate==0.6.1
-jinja2==3.1.2
+himl==0.15.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+hvac==1.2.1; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
+idna==3.10; python_version >= '3.6'
+inflection==0.5.1; python_version >= '3.5'
+isodate==0.7.2; python_version >= '3.7'
+jinja2==3.1.4; python_version >= '3.7'
 jmespath==1.0.1; python_version >= '3.7'
-kubernetes==26.1.0
+kubernetes==26.1.0; python_version >= '3.6'
 lru-cache==0.2.3
-markupsafe==2.1.3; python_version >= '3.7'
-msal==1.23.0
+markupsafe==3.0.2; python_version >= '3.9'
+msal==1.31.1; python_version >= '3.7'
 msrest==0.7.1; python_version >= '3.6'
 msrestazure==0.6.4
 oauthlib==3.2.2; python_version >= '3.6'
-packaging==23.1; python_version >= '3.7'
+packaging==24.2; python_version >= '3.8'
 passgen==1.1.1
 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.4
-pyjwt==2.8.0; python_version >= '3.7'
+pyasn1==0.6.1; python_version >= '3.8'
+pyasn1-modules==0.4.1; python_version >= '3.8'
+pycparser==2.22; python_version >= '3.8'
+pyhcl==0.4.5
+pyjwt[crypto]==2.10.1; python_version >= '3.9'
 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'
+python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 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'
+requests==2.32.3; python_version >= '3.8'
+requests-oauthlib==2.0.0; python_version >= '3.4'
 resolvelib==1.0.1
 rsa==4.7.2; python_version >= '3.5' and python_version < '4'
-s3transfer==0.6.1; python_version >= '3.7'
-setuptools==68.0.0; python_version >= '3.7'
+s3transfer==0.10.4; python_version >= '3.8'
+setuptools==75.8.0; python_version >= '3.9'
 simpledi==0.4.1
-six==1.16.0
-smmap==5.0.0; python_version >= '3.6'
-typing-extensions==4.7.1; python_version >= '3.7'
-urllib3==1.26.16; 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.1; python_version >= '3.7'
+six==1.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+smmap==5.0.2; python_version >= '3.7'
+typing-extensions==4.12.2; python_version >= '3.8'
+urllib3==2.0.7; python_version >= '3.7'
+websocket-client==1.8.0; python_version >= '3.8'

{ops-cli-2.2.0 → ops_cli-2.3.0}/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.2.0',
+    version='2.3.0',
     description='Ops - wrapper for Terraform, Ansible, and SSH for cloud automation',
     long_description=_readme + '\n\n',
     long_description_content_type='text/markdown',

{ops-cli-2.2.0 → ops_cli-2.3.0}/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):
@@ -119,7 +152,6 @@ class JinjaConfigGenerator(object):
         context_cliargs['extra_vars'] = tuple(extra_vars)
 
         context.CLIARGS = ImmutableDict(context_cliargs)
-        setattr(load_extra_vars, 'extra_vars', {})
         variable_manager._extra_vars = load_extra_vars(
             loader=data_loader)
 
@@ -159,7 +191,6 @@ class ClusterConfigGenerator(object):
         context_cliargs['extra_vars'] = tuple(extra_vars)
 
         context.CLIARGS = ImmutableDict(context_cliargs)
-        setattr(load_extra_vars, 'extra_vars', {})
         variable_manager._extra_vars = load_extra_vars(
             loader=data_loader)
 

{ops-cli-2.2.0 → ops_cli-2.3.0}/src/ops/cli/inventory.py

@@ -53,7 +53,7 @@ class InventoryRunner(object):
             group_names = [group.name for group in host.get_groups()]
             group_names = sorted(group_names)
             group_string = ", ".join(group_names)
-            host_id = host.vars.get('ec2_id', '')
+            host_id = host.vars.get('ec2_InstanceId', '')
             if host_id != '':
                 name_and_id = "%s -- %s" % (stringc(host.name,
                                                     'blue'), stringc(host_id, 'blue'))

{ops-cli-2.2.0 → ops_cli-2.3.0}/src/ops/cli/ssh.py

@@ -92,6 +92,12 @@ class SshParserConfig(SubParserConfig):
             help='When using Shell Control Box (SCB) and creating a proxy,'
                  'a random port is generated, which will be used in the ssh config '
                  'for all playbook, run and sync operations')
+        parser.add_argument(
+            '--ssh-dest-user',
+            type=str,
+            dest='ssh_dest_user',
+            help='SSH User for the destination host, different from the bastion or SCB user. '
+                 'Useful when LDAP is not working on the destination host.')
 
     def get_help(self):
         return 'SSH or create an SSH tunnel to a server in the cluster'
@@ -260,6 +266,12 @@ class SshRunner(object):
         ssh_config = args.ssh_config or self.ops_config.get(
             'ssh.config') or self.ansible_inventory.get_ssh_config()
 
+        ssh_host_bastion, ssh_host_dest = None, None
+        if args.ssh_dest_user:
+            ssh_host_parts = ssh_host.split('--')
+            ssh_host_bastion = ssh_host_parts[0]
+            ssh_host_dest = ssh_host_parts[1] if len(ssh_host_parts) > 1 else None
+
         scb_ssh_host = None
         if scb_enabled:
             # scb->bastion->host vs scb->bastion
@@ -280,13 +292,19 @@ class SshRunner(object):
         else:
             if scb_enabled:
                 command = f"ssh -F {ssh_config} {ssh_user}@{scb_ssh_host}"
+                if args.ssh_dest_user and ssh_host_dest:
+                    command = (f"ssh -F {ssh_config} -t {ssh_user}@{ssh_host_bastion}@{scb_host} "
+                               f"ssh {args.ssh_dest_user}@{ssh_host_dest}")
             else:
                 command = f"ssh -F {ssh_config} {ssh_host}"
+                if args.ssh_dest_user and ssh_host_dest:
+                    command = (f"ssh -F {ssh_config} -t {ssh_user}@{ssh_host_bastion} "
+                               f"ssh {args.ssh_dest_user}@{ssh_host_dest}")
 
         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
                 )