Python 3.12+ compatibility

Dockerfile

@@ -1,8 +1,8 @@
 FROM python:3.12.3-alpine3.18 AS compile-image
 ARG TARGETARCH
 ARG TARGETPLATFORM
-ARG TERRAFORM_VERSION="0.12.31"
-ARG AZURE_CLI_VERSION="2.0.67"
+ARG TERRAFORM_VERSION="0.15.5"
+ARG AZURE_CLI_VERSION="2.87.0"
 
 ENV BOTO_CONFIG=/dev/null
 COPY . /sources/
@@ -40,10 +40,9 @@ RUN apk del --purge build
 FROM python:3.12.3-alpine3.18
 ARG TARGETARCH
 ARG TARGETPLATFORM
-ARG TERRAFORM_VERSION="0.12.31"
-ARG VAULT_VERSION="1.1.3"
-ARG KUBECTL_VERSION="v1.17.0"
-ARG AWS_IAM_AUTHENTICATOR_VERSION="1.13.7/2019-06-11"
+ARG TERRAFORM_VERSION="0.15.5"
+ARG VAULT_VERSION="2.0.3"
+ARG KUBECTL_VERSION="v1.34.1"
 ARG HELM_VERSION="v3.16.3"
 ARG HELM_FILE_VERSION="1.1.8"
 ARG HELM_DIFF_VERSION="2.11.0%2B5"
@@ -63,7 +62,7 @@ RUN adduser ops -Du 2342 -h /home/ops \
     && ops --verbose -h \
     && apk del --purge build
 
-RUN wget -q https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl -O /usr/local/bin/kubectl \
+RUN wget -q https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl -O /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubectl
 
 RUN wget -q https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm \
@@ -76,9 +75,6 @@ RUN wget -q -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFOR
 RUN wget -q -O vault.zip https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_${TARGETARCH}.zip \
     && unzip vault.zip -d /usr/local/bin \
     && rm -rf vault.zip
-
-RUN wget -q https://amazon-eks.s3-us-west-2.amazonaws.com/${AWS_IAM_AUTHENTICATOR_VERSION}/bin/linux/${TARGETARCH}/aws-iam-authenticator -O /usr/local/bin/aws-iam-authenticator \
-    && chmod +x /usr/local/bin/aws-iam-authenticator
 
 RUN wget -q https://github.com/helmfile/helmfile/releases/download/v${HELM_FILE_VERSION}/helmfile_${HELM_FILE_VERSION}_linux_${TARGETARCH}.tar.gz -O - | tar -xzO helmfile > /usr/local/bin/helmfile \
     && chmod +x /usr/local/bin/helmfile
@@ -94,7 +90,6 @@ WORKDIR /home/ops
 USER root
 RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.11
 RUN helm plugin install https://github.com/jkroepke/helm-secrets --version v3.8.2
-RUN helm plugin install https://github.com/rimusz/helm-tiller  # Obsolete in Helm 3
 
 
 COPY --from=compile-image /azure-cli /home/ops/.local/azure-cli

requirements.txt

@@ -1,19 +1,20 @@
 simpledi==0.4.1
-awscli==1.42.30
-boto3==1.40.30
-botocore==1.40.30
-urllib3==2.6.0
-ansible==8.7.0
-azure-common==1.1.28
-azure==4.0.0
-msrestazure==0.6.4
+awscli==1.45.36
+boto3==1.43.36
+botocore==1.43.36
+urllib3==2.7.0
+ansible==11.13.0
+azure-identity==1.25.3
+azure-mgmt-compute==38.1.0
+azure-mgmt-network==30.2.0
+azure-mgmt-resource==26.0.0
 Jinja2==3.1.6
-hashmerge
-python-consul
-hvac==1.2.1
-passgen
+hashmerge==0.2
+py-consul==1.7.1
+requests==2.34.2
+hvac==2.4.0
+passgen==1.1.1
 inflection==0.5.1
-kubernetes==33.1.0
-himl==0.18.0
-six
+packaging==26.2
+himl==0.20.0
 GitPython==3.1.*

setup.py

@@ -11,10 +11,7 @@
 import os
 import sys
 
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    from distutils.core import setup, find_packages
+from setuptools import setup, find_packages
 
 with open('README.md') as f:
     _readme = f.read()
@@ -28,7 +25,7 @@
     long_description=_readme + '\n\n',
     long_description_content_type='text/markdown',
     url='https://github.com/adobe/ops-cli',
-    python_requires='>=3.5',
+    python_requires='>=3.12',
     author='Adobe',
     author_email='noreply@adobe.com',
     license='Apache2',
@@ -39,9 +36,9 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',

src/ops/__init__.py

@@ -8,33 +8,30 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
-import pkg_resources
 import re
-from distutils.version import StrictVersion
+from importlib.metadata import version as importlib_version
+from packaging.version import Version
 from subprocess import call, Popen, PIPE
 
-from six import PY3
-
 from .cli import display
 
 
 def validate_ops_version(min_ops_version):
-    current_ops_version = [
-        x.version for x in pkg_resources.working_set if x.project_name == "ops-cli"][0]
-    if StrictVersion(current_ops_version) < StrictVersion(min_ops_version):
+    current_ops_version = importlib_version('ops-cli')
+    if Version(current_ops_version) < Version(min_ops_version):
         raise Exception("The current ops version {0} is lower than the minimum required version {1}. "
                         "Please upgrade by following the instructions seen here: "
                         "https://github.com/adobe/ops-cli#installing".format(current_ops_version, min_ops_version))
 
 
-class Executor(object):
+class Executor:
     """ All cli commands usually return a dict(command=...) that will be executed by this handler"""
 
     def __call__(self, result, pass_trough=True, cwd=None):
         try:
             return self._execute(result, pass_trough, cwd)
         except Exception as ex:
-            display(str(ex) if PY3 else ex.message, stderr=True, color='red')
+            display(str(ex), stderr=True, color='red')
             display(
                 '------- TRACEBACK ----------',
                 stderr=True,

src/ops/ansible/filter_plugins/commonfilters.py

@@ -8,11 +8,8 @@
 #OF ANY KIND, either express or implied. See the License for the specific language
 #governing permissions and limitations under the License.
 
-from __future__ import absolute_import
 import os
 from ops.cli import display
-from six import iteritems
-
 
 def read_file(fname):
     if os.path.exists(fname):
@@ -38,7 +35,7 @@ def read_consul(key_path, consul_url="http://localhost:8500", recurse=True, show
         ret = sc.get(key_path,recurse)
     except Exception as e:
         if show_error:
-            ret['error'] = e.message
+            ret['error'] = str(e)
     return ret
 
 def read_envvar(varname, default=None):
@@ -53,7 +50,7 @@ def read_yaml(fname, show_error=False):
         ret = y.safe_load(f.read())
     except Exception as e:
         if show_error:
-            ret['error'] = e.message
+            ret['error'] = str(e)
     return ret
 
 def flatten_tree(d, parent_key='', sep='/'):
@@ -100,7 +97,7 @@ def write_vault(
         namespace=None, mount_point=None, auto_prompt=auto_prompt)
     new_data = {}
     if isinstance(data, dict):
-        for k,v in iteritems(data):
+        for k, v in data.items():
             new_data[k] = str(v)
     elif key:
         new_data[key] = str(data)
@@ -141,7 +138,7 @@ def escape_json(input):
         return escaped[1:-1]
     return escaped
 
-class FilterModule(object):
+class FilterModule:
 
     def filters(self):
         return {

src/ops/ansible/vars_plugins/clusterconfig.py

@@ -25,13 +25,13 @@ class VarsModule(BaseVarsPlugin):
     def __init__(self, *args):
         """ constructor """
 
-        super(VarsModule, self).__init__(*args)
+        super().__init__(*args)
 
         logger.debug("Running plugin: %s with cluster config %s" % (__file__, os.environ['OPS_CLUSTER_CONFIG']))
 
         app = AppContainer([os.environ['OPS_CLUSTER_CONFIG'], 'noop'])
         self.config = app.cluster_config.all()
 
     def get_vars(self, loader, path, entities, cache=True):
-        super(VarsModule, self).get_vars(loader, path, entities)
+        super().get_vars(loader, path, entities)
         return self.config

src/ops/ansible/vars_plugins/opsconfig.py

@@ -25,7 +25,7 @@ class VarsModule(BaseVarsPlugin):
     def __init__(self, *args):
         """ constructor """
 
-        super(VarsModule, self).__init__(*args)
+        super().__init__(*args)
 
         logger.debug("Running plugin: %s with cluster config %s" % (__file__, os.environ['OPS_CLUSTER_CONFIG']))
 
@@ -37,5 +37,5 @@ def __init__(self, *args):
                             })
 
     def get_vars(self, loader, path, entities, cache=True):
-        super(VarsModule, self).get_vars(loader, path, entities)
+        super().get_vars(loader, path, entities)
         return self.config

src/ops/cli/__init__.py

@@ -40,7 +40,7 @@ def get_config_value(config, key):
         return config[key]
     except KeyError as e:
         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))
+            (str(e), config['cluster'], str(e)))
         sys.exit(1)
 
 def check_if_teleport_binary_installed():

src/ops/cli/config.py

@@ -67,7 +67,7 @@ def load_extra_vars(loader):
     return extra_vars
 
 
-class ClusterConfig(object):
+class ClusterConfig:
     def __init__(self, cluster_config_generator,
                  ops_config, cluster_config_path):
         """
@@ -130,7 +130,7 @@ def load_ssh_keys(self, cluster_config_path):
             self.has_ssh_keys = False
 
 
-class JinjaConfigGenerator(object):
+class JinjaConfigGenerator:
     def __init__(self, console_args, cluster_config_path, template):
         self.cluster_config_path = cluster_config_path
         self.console_args = console_args
@@ -162,7 +162,7 @@ def get(self):
         return yaml.safe_load(rendered)
 
 
-class ClusterConfigGenerator(object):
+class ClusterConfigGenerator:
     def __init__(self, console_args, cluster_config_path, template):
         self.template = template
         self.cluster_config_path = cluster_config_path

src/ops/cli/config_generator.py

@@ -32,7 +32,7 @@ def get_epilog(self):
         '''
 
 
-class ConfigGeneratorRunner(object):
+class ConfigGeneratorRunner:
     def __init__(self, cluster_config_path):
         self.cluster_config_path = cluster_config_path
 

src/ops/cli/helmfile.py

@@ -49,9 +49,9 @@ def get_epilog(self):
         '''
 
 
-class HelmfileRunner(CompositionConfigGenerator, object):
+class HelmfileRunner(CompositionConfigGenerator):
     def __init__(self, ops_config, cluster_config_path, execute):
-        super(HelmfileRunner, self).__init__(["helmfiles"])
+        super().__init__(["helmfiles"])
         logging.basicConfig(level=logging.INFO)
         self.ops_config = ops_config
         self.cluster_config_path = cluster_config_path

src/ops/cli/inventory.py

@@ -39,7 +39,7 @@ def configure(self, parser):
         return parser
 
 
-class InventoryRunner(object):
+class InventoryRunner:
     def __init__(self, ansible_inventory, cluster_name):
         """
         :type ansible_inventory: ops.inventory.generator.AnsibleInventory

src/ops/cli/packer.py

@@ -36,7 +36,7 @@ def get_epilog(self):
         '''
 
 
-class PackerRunner(object):
+class PackerRunner:
     def __init__(self, root_dir, cluster_config):
         self.cluster_config = cluster_config
         self.root_dir = root_dir

src/ops/cli/parser.py

@@ -10,12 +10,8 @@
 
 import argparse
 
-import sys
 
-from six import PY3
-
-
-class RootParser(object):
+class RootParser:
     def __init__(self, sub_parsers=None):
         """
         :type sub_parsers: list[SubParserConfig]
@@ -52,35 +48,14 @@ def _get_parser(self):
 
         return parser
 
-    @staticmethod
-    def _check_args_for_unicode(args):
-        if args is None:
-            args = sys.argv
-
-        try:
-            for value in args:
-                if not PY3 and isinstance(value, unicode):
-                    # Python3 or some Python3 compatibility mode can make
-                    # arguments to be unicode, not str
-                    value.encode('utf-8').encode('utf-8')
-                # Python 2 str, check if it can be represented in utf8
-                elif isinstance(value, str):
-                    value.encode('utf-8')
-        except UnicodeDecodeError as e:
-            print('Invalid character in argument "{0}", most likely an "en dash", replace it with normal dash -'.format(
-                e.args[1]))
-            raise
-
     def parse_args(self, args=None):
-        RootParser._check_args_for_unicode(args)
         return self._get_parser().parse_args(args)
 
     def parse_known_args(self, args=None):
-        RootParser._check_args_for_unicode(args)
         return self._get_parser().parse_known_args(args)
 
 
-class SubParserConfig(object):
+class SubParserConfig:
     def get_name(self):
         pass
 

src/ops/cli/playbook.py

@@ -57,7 +57,7 @@ def get_help(self):
         return 'Run an Ansible playbook'
 
 
-class PlaybookRunner(object):
+class PlaybookRunner:
     def __init__(self, ops_config, root_dir, inventory_generator,
                  cluster_config_path, cluster_config):
         """

src/ops/cli/run.py

@@ -53,7 +53,7 @@ def get_name(self):
         return 'run'
 
 
-class CommandRunner(object):
+class CommandRunner:
 
     def __init__(self, ops_config, root_dir, inventory_generator,
                  cluster_config_path, cluster_config):