refactor: replace all occurences of deprecated method datetime.utcnow…

…() with datetime.now(tz=timezone.utc)

Update imports to accomodate this change

Resolves issue saltstack#65604

.github/workflows/scripts/label-and-assign.py

@@ -72,7 +72,7 @@ def label_and_assign_issue(options):
         json.dumps(
             {
                 "username": next_triage_account.login,
-                "when": str(datetime.datetime.utcnow()),
+                "when": str(datetime.datetime.now(tz=timezone.utc)),
             }
         )
     )

salt/beacons/cert_info.py

@@ -8,7 +8,7 @@
 :depends: OpenSSL
 """
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.beacons
 import salt.utils.files

salt/beacons/status.py

@@ -117,7 +117,7 @@ def beacon(config):
     Return status for requested information
     """
     log.debug(config)
-    ctime = datetime.datetime.utcnow().isoformat()
+    ctime = datetime.datetime.now(tz=timezone.utc).isoformat()
 
     whitelist = []
     config = salt.utils.beacons.remove_hidden_options(config, whitelist)

salt/cli/batch.py

@@ -6,7 +6,7 @@
 import logging
 import math
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timezone, timedelta
 
 import salt.client
 import salt.exceptions

salt/client/__init__.py

@@ -23,7 +23,7 @@
 import random
 import sys
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import tornado.gen
 

salt/client/ssh/__init__.py

@@ -408,7 +408,7 @@ def _update_roster(self):
                         '# Automatically added by "{s_user}" at {s_time}\n{hostname}:\n'
                         "    host: {hostname}\n    user: {user}\n    passwd: {passwd}\n".format(
                             s_user=getpass.getuser(),
-                            s_time=datetime.datetime.utcnow().isoformat(),
+                            s_time=datetime.datetime.now(tz=timezone.utc).isoformat(),
                             hostname=self.opts.get("tgt", ""),
                             user=self.opts.get("ssh_user", ""),
                             passwd=self.opts.get("ssh_passwd", ""),

salt/cloud/clouds/ec2.py

@@ -290,7 +290,7 @@ def query(
     attempts = 0
     while attempts < aws.AWS_MAX_RETRIES:
         params_with_headers = params.copy()
-        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
+        timestamp = datetime.datetime.now(tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
 
         if not location:
             location = get_location()
@@ -327,7 +327,7 @@ def query(
         host = endpoint.strip()
 
         # Create a date for headers and the credential string
-        t = datetime.datetime.utcnow()
+        t = datetime.datetime.now(tz=timezone.utc)
         amz_date = t.strftime("%Y%m%dT%H%M%SZ")  # Format date as YYYYMMDD'T'HHMMSS'Z'
         datestamp = t.strftime("%Y%m%d")  # Date w/o time, used in credential scope
 

salt/cloud/clouds/joyent.py

@@ -1159,7 +1159,7 @@ def query(action=None, command=None, args=None, method="GET", location=None, dat
     if (not user) or (not ssh_keyfile) or (not ssh_keyname) or (not location):
         return None
 
-    timenow = datetime.datetime.utcnow()
+    timenow = datetime.datetime.now(tz=timezone.utc)
     timestamp = timenow.strftime("%a, %d %b %Y %H:%M:%S %Z").strip()
     rsa_key = salt.crypt.get_rsa_key(ssh_keyfile, None)
     if HAS_M2:

salt/cloud/clouds/xen.py

@@ -59,7 +59,7 @@
 
 import logging
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.config as config
 import salt.utils.cloud

salt/fileserver/hgfs.py

@@ -44,7 +44,7 @@
 import logging
 import os
 import shutil
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.fileserver
 import salt.utils.data

salt/fileserver/svnfs.py

@@ -38,7 +38,7 @@
 import logging
 import os
 import shutil
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.fileserver
 import salt.utils.data

salt/grains/core.py

@@ -2810,11 +2810,11 @@ def ip_fqdn():
             ret[key] = []
         else:
             try:
-                start_time = datetime.datetime.utcnow()
+                start_time = datetime.datetime.now(tz=timezone.utc)
                 info = socket.getaddrinfo(_fqdn, None, socket_type)
                 ret[key] = list({item[4][0] for item in info})
             except (OSError, UnicodeError):
-                timediff = datetime.datetime.utcnow() - start_time
+                timediff = datetime.datetime.now(tz=timezone.utc) - start_time
                 if timediff.seconds > 5 and __opts__["__role"] == "master":
                     log.warning(
                         'Unable to find IPv%s record for "%s" causing a %s '

salt/modules/inspectlib/fsdb.py

@@ -72,7 +72,7 @@ def _label(self):
 
         :return:
         """
-        return datetime.datetime.utcnow().strftime("%Y%m%d-%H%M%S")
+        return datetime.datetime.now(tz=timezone.utc).strftime("%Y%m%d-%H%M%S")
 
     def new(self):
         """

salt/modules/keystore.py

@@ -5,7 +5,7 @@
 
 import logging
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 
 from salt.exceptions import CommandExecutionError, SaltInvocationError
 

salt/modules/lxd.py

@@ -34,7 +34,7 @@
 
 import logging
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.decorators.path
 import salt.utils.files

salt/modules/mac_shadow.py

@@ -10,7 +10,7 @@
 # https://developer.apple.com/library/mac/documentation/Networking/Conceptual/Open_Directory/openDirectoryConcepts/openDirectoryConcepts.html#//apple_ref/doc/uid/TP40000917-CH3-CIFCAIBB
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.mac_utils
 import salt.utils.platform

salt/modules/mac_timezone.py

@@ -4,7 +4,7 @@
  .. versionadded:: 2016.3.0
 """
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.mac_utils
 import salt.utils.platform

salt/modules/purefa.py

@@ -52,7 +52,7 @@
 
 import os
 import platform
-from datetime import datetime
+from datetime import datetime, timezone
 
 from salt.exceptions import CommandExecutionError
 
@@ -235,7 +235,7 @@ def snap_create(name, suffix=None):
     array = _get_system()
     if suffix is None:
         suffix = "snap-" + str(
-            (datetime.utcnow() - datetime(1970, 1, 1, 0, 0, 0, 0)).total_seconds()
+            (datetime.now(tz=timezone.utc) - datetime(1970, 1, 1, 0, 0, 0, 0)).total_seconds()
         )
         suffix = suffix.replace(".", "")
     if _get_volume(name, array) is not None:

salt/modules/purefb.py

@@ -51,7 +51,7 @@
 
 
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 
 from salt.exceptions import CommandExecutionError
 
@@ -195,7 +195,7 @@ def snap_create(name, suffix=None):
     blade = _get_blade()
     if suffix is None:
         suffix = "snap-" + str(
-            (datetime.utcnow() - datetime(1970, 1, 1, 0, 0, 0, 0)).total_seconds()
+            (datetime.now(tz=timezone.utc) - datetime(1970, 1, 1, 0, 0, 0, 0)).total_seconds()
         )
         suffix = suffix.replace(".", "")
     if _get_fs(name, blade) is not None:

salt/modules/system.py

@@ -14,7 +14,7 @@
 
 import os.path
 import re
-from datetime import datetime, timedelta, tzinfo
+from datetime import datetime, timezone, timedelta, tzinfo
 
 import salt.utils.files
 import salt.utils.path
@@ -255,7 +255,7 @@ def _get_offset_time(utc_offset):
     if utc_offset is not None:
         minutes = _offset_to_min(utc_offset)
         offset = timedelta(minutes=minutes)
-        offset_time = datetime.utcnow() + offset
+        offset_time = datetime.now(tz=timezone.utc) + offset
         offset_time = offset_time.replace(tzinfo=_FixedOffset(minutes))
     else:
         offset_time = datetime.now()

salt/modules/tls.py

@@ -105,7 +105,7 @@
 import os
 import re
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.data
 import salt.utils.files
@@ -357,7 +357,7 @@ def maybe_fix_ssl_version(ca_name, cacert_path=None, ca_filename=None):
                 try:
                     days = (
                         datetime.strptime(cert.get_notAfter(), "%Y%m%d%H%M%SZ")
-                        - datetime.utcnow()
+                        - datetime.now(tz=timezone.utc)
                     ).days
                 except (ValueError, TypeError):
                     days = 365
@@ -763,7 +763,7 @@ def create_ca(
                     err,
                 )
                 bck = "{}.unloadable.{}".format(
-                    ca_keyp, datetime.utcnow().strftime("%Y%m%d%H%M%S")
+                    ca_keyp, datetime.now(tz=timezone.utc).strftime("%Y%m%d%H%M%S")
                 )
                 log.info("Saving unloadable CA ssl key in %s", bck)
                 os.rename(ca_keyp, bck)
@@ -821,7 +821,7 @@ def create_ca(
     keycontent = OpenSSL.crypto.dump_privatekey(OpenSSL.crypto.FILETYPE_PEM, key)
     write_key = True
     if os.path.exists(ca_keyp):
-        bck = "{}.{}".format(ca_keyp, datetime.utcnow().strftime("%Y%m%d%H%M%S"))
+        bck = "{}.{}".format(ca_keyp, datetime.now(tz=timezone.utc).strftime("%Y%m%d%H%M%S"))
         with salt.utils.files.fopen(ca_keyp) as fic:
             old_key = salt.utils.stringutils.to_unicode(fic.read()).strip()
             if old_key.strip() == keycontent.strip():
@@ -1912,7 +1912,7 @@ def revoke_cert(
     )
     index_r_data = "R\t{}\t{}\t{}".format(
         expire_date,
-        _four_digit_year_to_two_digit(datetime.utcnow()),
+        _four_digit_year_to_two_digit(datetime.now(tz=timezone.utc)),
         index_serial_subject,
     )
 

salt/modules/vsphere.py

@@ -3878,7 +3878,7 @@ def update_host_datetime(
         host_ref = _get_host_ref(service_instance, host, host_name=host_name)
         date_time_manager = _get_date_time_mgr(host_ref)
         try:
-            date_time_manager.UpdateDateTime(datetime.datetime.utcnow())
+            date_time_manager.UpdateDateTime(datetime.datetime.now(tz=timezone.utc))
         except vim.fault.HostConfigFault as err:
             msg = "'vsphere.update_date_time' failed for host {}: {}".format(
                 host_name, err

salt/modules/win_system.py

@@ -14,7 +14,7 @@
 import logging
 import platform
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.functools
 import salt.utils.locales

salt/modules/win_task.py

@@ -11,7 +11,7 @@
 
 import logging
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.platform
 import salt.utils.winapi

salt/modules/win_timezone.py

@@ -2,7 +2,7 @@
 Module for managing timezone on Windows systems.
 """
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from salt.exceptions import CommandExecutionError
 
@@ -240,7 +240,7 @@ def get_offset():
     """
     # http://craigglennie.com/programming/python/2013/07/21/working-with-timezones-using-Python-and-pytz-localize-vs-normalize/
     tz_object = pytz.timezone(get_zone())
-    utc_time = pytz.utc.localize(datetime.utcnow())
+    utc_time = pytz.utc.localize(datetime.now(tz=timezone.utc))
     loc_time = utc_time.astimezone(tz_object)
     norm_time = tz_object.normalize(loc_time)
     return norm_time.strftime("%z")
@@ -260,7 +260,7 @@ def get_zonecode():
         salt '*' timezone.get_zonecode
     """
     tz_object = pytz.timezone(get_zone())
-    loc_time = tz_object.localize(datetime.utcnow())
+    loc_time = tz_object.localize(datetime.now(tz=timezone.utc))
     return loc_time.tzname()
 
 

salt/modules/win_useradd.py

@@ -25,7 +25,7 @@
 import logging
 import shlex
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import salt.utils.args
 import salt.utils.dateutils

salt/modules/x509.py

@@ -1959,7 +1959,7 @@ def expired(certificate):
             ret["path"] = certificate
             cert = _get_certificate_obj(certificate)
 
-            _now = datetime.datetime.utcnow()
+            _now = datetime.datetime.now(tz=timezone.utc)
             _expiration_date = cert.get_not_after().get_datetime()
 
             ret["cn"] = _parse_subject(cert.get_subject())["CN"]
@@ -2003,7 +2003,7 @@ def will_expire(certificate, days):
 
             cert = _get_certificate_obj(certificate)
 
-            _check_time = datetime.datetime.utcnow() + datetime.timedelta(days=days)
+            _check_time = datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(days=days)
             _expiration_date = cert.get_not_after().get_datetime()
 
             ret["cn"] = _parse_subject(cert.get_subject())["CN"]

salt/modules/x509_v2.py

@@ -1374,7 +1374,7 @@ def expires(certificate, days=0):
     """
     cert = x509util.load_cert(certificate)
     # dates are encoded in UTC/GMT, they are returned as a naive datetime object
-    return cert.not_valid_after <= datetime.datetime.utcnow() + datetime.timedelta(
+    return cert.not_valid_after <= datetime.datetime.now(tz=timezone.utc) + datetime.timedelta(
         days=days
     )
 

salt/spm/pkgdb/sqlite3.py

@@ -167,7 +167,7 @@ def register_pkg(name, formula_def, conn=None):
             name,
             formula_def["version"],
             formula_def["release"],
-            datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT"),
+            datetime.datetime.now(tz=timezone.utc).strftime("%a, %d %b %Y %H:%M:%S GMT"),
             formula_def.get("os", None),
             formula_def.get("os_family", None),
             formula_def.get("dependencies", None),