ops-cli 2.3.1__tar.gz → 2.4.0__tar.gz

{ops_cli-2.3.1/src/ops_cli.egg-info → ops_cli-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ops-cli
-Version: 2.3.1
+Version: 2.4.0
 Summary: Ops - wrapper for Terraform, Ansible, and SSH for cloud automation
 Home-page: https://github.com/adobe/ops-cli
 Author: Adobe
@@ -26,12 +26,12 @@ 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: awscli==1.42.30; python_version >= "3.9"
 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-core==1.38.0; python_version >= "3.9"
 Requires-Dist: azure-cosmosdb-nspkg==2.0.2
 Requires-Dist: azure-cosmosdb-table==1.0.6
 Requires-Dist: azure-datalake-store==0.0.53
@@ -110,58 +110,55 @@ 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: boto3==1.40.30; python_version >= "3.9"
+Requires-Dist: botocore==1.40.30; python_version >= "3.9"
+Requires-Dist: certifi==2026.1.4; python_version >= "3.7"
+Requires-Dist: cffi==2.0.0; python_version >= "3.9"
+Requires-Dist: charset-normalizer==3.4.4; python_version >= "3.7"
+Requires-Dist: colorama==0.4.6; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6"
+Requires-Dist: cryptography==46.0.4; python_version >= "3.8" and python_full_version not in "3.9.0, 3.9.1"
+Requires-Dist: deepmerge==2.0; python_version >= "3.8"
+Requires-Dist: docutils==0.19; python_version >= "3.7"
+Requires-Dist: durationpy==0.10
 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: gitpython==3.1.46; python_version >= "3.7"
+Requires-Dist: google-auth==2.48.0; python_version >= "3.8"
 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: himl==0.18.0; python_version >= "3.9"
 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: idna==3.11; python_version >= "3.8"
 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: jinja2==3.1.6; python_version >= "3.7"
+Requires-Dist: jmespath==1.1.0; python_version >= "3.9"
+Requires-Dist: kubernetes==33.1.0; python_version >= "3.6"
+Requires-Dist: markupsafe==3.0.3; python_version >= "3.9"
+Requires-Dist: msal==1.34.0; python_version >= "3.8"
 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: oauthlib==3.3.1; python_version >= "3.8"
+Requires-Dist: packaging==26.0; 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: pyasn1==0.6.2; python_version >= "3.8"
+Requires-Dist: pyasn1-modules==0.4.2; python_version >= "3.8"
+Requires-Dist: pycparser==3.0; python_version >= "3.10"
 Requires-Dist: pyhcl==0.4.5
-Requires-Dist: pyjwt[crypto]==2.10.1; python_version >= "3.9"
+Requires-Dist: pyjwt[crypto]==2.11.0; 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==2.32.5; python_version >= "3.9"
 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: s3transfer==0.14.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"
+Requires-Dist: typing-extensions==4.15.0; python_version >= "3.9"
+Requires-Dist: urllib3==2.6.0; python_version >= "3.9"
+Requires-Dist: websocket-client==1.9.0; python_version >= "3.9"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -169,6 +166,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -326,7 +324,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.3.1 stable release
+# install ops-cli v2.4.0 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -342,7 +340,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.3.1 bash
+docker run -it ghcr.io/adobe/ops-cli:2.4.0 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -713,6 +711,23 @@ If there are connection issues double check that the proxy is running.
 ...
 ```
 
+#### Teleport
+Teleport (https://goteleport.com/) provides secretless SSH.
+`ops` has support for using Teleport as ssh  for the following operations: `ssh, tunnel, proxy, ansible play, run and sync`
+
+In order to use Teleport an extra section needs to be added to the cluster config file:
+***
+```
+inventory:
+  - plugin: cns
+    args:
+      teleport_enabled: True -> add this to existing configuration
+
+
+teleport:
+  enabled: true -> add this whole block
+```
+
 ### Play
 
 Run an ansible playbook.
@@ -937,7 +952,7 @@ env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/
 
 ## Running tests
 
-- on your machine: `py.test tests`
+- on your machine: `python -m pytest tests` or `build_scripts/run_tests.sh`
 
 # Troubleshooting
 

{ops_cli-2.3.1 → ops_cli-2.4.0}/README.md

@@ -151,7 +151,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.3.1 stable release
+# install ops-cli v2.4.0 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -167,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.3.1 bash
+docker run -it ghcr.io/adobe/ops-cli:2.4.0 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -538,6 +538,23 @@ If there are connection issues double check that the proxy is running.
 ...
 ```
 
+#### Teleport
+Teleport (https://goteleport.com/) provides secretless SSH.
+`ops` has support for using Teleport as ssh  for the following operations: `ssh, tunnel, proxy, ansible play, run and sync`
+
+In order to use Teleport an extra section needs to be added to the cluster config file:
+***
+```
+inventory:
+  - plugin: cns
+    args:
+      teleport_enabled: True -> add this to existing configuration
+
+
+teleport:
+  enabled: true -> add this whole block
+```
+
 ### Play
 
 Run an ansible playbook.
@@ -762,7 +779,7 @@ env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/
 
 ## Running tests
 
-- on your machine: `py.test tests`
+- on your machine: `python -m pytest tests` or `build_scripts/run_tests.sh`
 
 # Troubleshooting
 

{ops_cli-2.3.1 → ops_cli-2.4.0}/requirements.txt

@@ -1,12 +1,12 @@
 adal==1.2.7
 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'
+awscli==1.42.30; python_version >= '3.9'
 azure==4.0.0
 azure-applicationinsights==0.1.1
 azure-batch==4.1.3
 azure-common==1.1.28
-azure-core==1.32.0; python_version >= '3.8'
+azure-core==1.38.0; python_version >= '3.9'
 azure-cosmosdb-nspkg==2.0.2
 azure-cosmosdb-table==1.0.6
 azure-datalake-store==0.0.53
@@ -85,55 +85,52 @@ 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'
-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==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'
+boto3==1.40.30; python_version >= '3.9'
+botocore==1.40.30; python_version >= '3.9'
+certifi==2026.1.4; python_version >= '3.7'
+cffi==2.0.0; python_version >= '3.9'
+charset-normalizer==3.4.4; python_version >= '3.7'
+colorama==0.4.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
+cryptography==46.0.4; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1'
+deepmerge==2.0; python_version >= '3.8'
+docutils==0.19; python_version >= '3.7'
+durationpy==0.10
 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'
+gitpython==3.1.46; python_version >= '3.7'
+google-auth==2.48.0; python_version >= '3.8'
 hashmerge==0.2
-himl==0.15.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+himl==0.18.0; python_version >= '3.9'
 hvac==1.2.1; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
-idna==3.10; python_version >= '3.6'
+idna==3.11; python_version >= '3.8'
 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; python_version >= '3.6'
-lru-cache==0.2.3
-markupsafe==3.0.2; python_version >= '3.9'
-msal==1.31.1; python_version >= '3.7'
+jinja2==3.1.6; python_version >= '3.7'
+jmespath==1.1.0; python_version >= '3.9'
+kubernetes==33.1.0; python_version >= '3.6'
+markupsafe==3.0.3; python_version >= '3.9'
+msal==1.34.0; python_version >= '3.8'
 msrest==0.7.1; python_version >= '3.6'
 msrestazure==0.6.4
-oauthlib==3.2.2; python_version >= '3.6'
-packaging==24.2; python_version >= '3.8'
+oauthlib==3.3.1; python_version >= '3.8'
+packaging==26.0; python_version >= '3.8'
 passgen==1.1.1
 pathlib2==2.3.7.post1
-pyasn1==0.6.1; python_version >= '3.8'
-pyasn1-modules==0.4.1; python_version >= '3.8'
-pycparser==2.22; python_version >= '3.8'
+pyasn1==0.6.2; python_version >= '3.8'
+pyasn1-modules==0.4.2; python_version >= '3.8'
+pycparser==3.0; python_version >= '3.10'
 pyhcl==0.4.5
-pyjwt[crypto]==2.10.1; python_version >= '3.9'
+pyjwt[crypto]==2.11.0; python_version >= '3.9'
 python-consul==1.1.0
 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.32.3; python_version >= '3.8'
+requests==2.32.5; python_version >= '3.9'
 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.10.4; python_version >= '3.8'
-setuptools==75.8.0; python_version >= '3.9'
+s3transfer==0.14.0; python_version >= '3.9'
 simpledi==0.4.1
 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'
+typing-extensions==4.15.0; python_version >= '3.9'
+urllib3==2.6.0; python_version >= '3.9'
+websocket-client==1.9.0; python_version >= '3.9'

{ops_cli-2.3.1 → ops_cli-2.4.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.3.1',
+    version='2.4.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.3.1 → ops_cli-2.4.0}/src/ops/cli/__init__.py

@@ -11,6 +11,7 @@
 import os
 from subprocess import Popen, PIPE
 import sys
+from shutil import which
 
 
 def get_output(command, trim=True):
@@ -41,3 +42,8 @@ def get_config_value(config, key):
         err("You must set the %s value in %s.yaml or in the cli as an extra variable: -e %s=value" %
             (e.message, config['cluster'], e.message))
         sys.exit(1)
+
+def check_if_teleport_binary_installed():
+    if which("tsh") is None:
+        err('tsh binary needs to be installed for Teleport to work!')
+        sys.exit(2)

{ops_cli-2.3.1 → ops_cli-2.4.0}/src/ops/cli/parser.py

@@ -112,5 +112,7 @@ def configure_common_ansible_args(parser):
     parser.add_argument('--noscb', action='store_false', dest='use_scb',
                         help='Disable use of Shell Control Box (SCB) even if '
                              'it is enabled in the cluster config')
+    parser.add_argument('--teleport', action='store_false', dest='use_teleport',
+                        help='Use Teleport for SSH')
 
     return parser

{ops_cli-2.3.1 → ops_cli-2.4.0}/src/ops/cli/playbook.py

@@ -73,9 +73,11 @@ class PlaybookRunner(object):
     def run(self, args, extra_args):
         logger.info("Found extra_args %s", extra_args)
         inventory_path, ssh_config_paths = self.inventory_generator.generate()
-        ssh_config_path = SshConfigGenerator.get_ssh_config_path(self.cluster_config,
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        ssh_config_path = ssh_config_generator.get_ssh_config_path(self.cluster_config,
                                                                  ssh_config_paths,
-                                                                 args.use_scb)
+                                                                 args)
+                                                                 
         ssh_config = f"ANSIBLE_SSH_ARGS='-F {ssh_config_path}'"
 
         ansible_config = "ANSIBLE_CONFIG=%s" % self.ops_config.ansible_config_path

{ops_cli-2.3.1 → ops_cli-2.4.0}/src/ops/cli/run.py

@@ -68,9 +68,10 @@ class CommandRunner(object):
         logger.info("Found extra_args %s", extra_args)
         inventory_path, ssh_config_paths = self.inventory_generator.generate()
         limit = args.host_pattern
-        ssh_config_path = SshConfigGenerator.get_ssh_config_path(self.cluster_config,
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        ssh_config_path = ssh_config_generator.get_ssh_config_path(self.cluster_config,
                                                                  ssh_config_paths,
-                                                                 args.use_scb)
+                                                                 args)
         extra_args = ' '.join(args.extra_args)
         command = """cd {root_dir}
 ANSIBLE_SSH_ARGS='-F {ssh_config}' ANSIBLE_CONFIG={ansible_config_path} ansible -i {inventory_path} '{limit}' \\