Replace datetime.utcnow() with datetime.now(timezone.utc)

python/cpython#103857

Author: hanwen-cluster

cli/src/pcluster/cli/commands/configure/networking.py

@@ -31,7 +31,7 @@
 
 DEFAULT_AWS_REGION_NAME = "us-east-1"
 LOGGER = logging.getLogger(__name__)
-TIMESTAMP = "-{:%Y%m%d%H%M%S}".format(datetime.datetime.utcnow())
+TIMESTAMP = "-{:%Y%m%d%H%M%S}".format(datetime.datetime.now(datetime.timezone.utc))
 HEAD_NODE_SUBNET_IPS = 250
 
 if sys.version_info >= (3, 4):

cli/src/pcluster/templates/awsbatch_builder.py

@@ -8,7 +8,7 @@
 # or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
-from datetime import datetime
+from datetime import datetime, timezone
 
 from aws_cdk import aws_batch as batch
 from aws_cdk import aws_cloudformation as cfn
@@ -524,7 +524,7 @@ def _add_code_build_policy(self):
         )
 
     def _add_code_build_docker_image_builder_project(self):
-        timestamp = f"{datetime.utcnow().strftime('%Y%m%d%H%M')}"
+        timestamp = f"{datetime.now(timezone.utc).strftime('%Y%m%d%H%M')}"
         log_group_name = (
             f"{CW_LOG_GROUP_NAME_PREFIX}codebuild/{self.stack_name}-CodeBuildDockerImageBuilderProject-{timestamp}"
         )

cli/src/pcluster/templates/cluster_stack.py

@@ -18,7 +18,7 @@
 #
 import json
 from collections import defaultdict, namedtuple
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Union
 
 from aws_cdk import aws_cloudformation as cfn
@@ -128,15 +128,15 @@ def __init__(
         self._launch_template_builder = CdkLaunchTemplateBuilder()
         self.config = cluster_config
         self.bucket = bucket
-        self.timestamp = datetime.utcnow().strftime("%Y%m%d%H%M%S")
+        self.timestamp = datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")
         if self.config.is_cw_logging_enabled:
             if log_group_name:
                 # pcluster update keep the log group,
                 # It has to be passed in order to avoid the change of log group name because of the suffix.
                 self.log_group_name = log_group_name
             else:
                 # pcluster create create a log group with timestamp suffix
-                timestamp = f"{datetime.utcnow().strftime('%Y%m%d%H%M')}"
+                timestamp = f"{datetime.now(timezone.utc).strftime('%Y%m%d%H%M')}"
                 self.log_group_name = f"{CW_LOG_GROUP_NAME_PREFIX}{self.stack.stack_name}-{timestamp}"
 
         self.shared_storage_infos = {storage_type: [] for storage_type in SharedStorageType}

cli/src/pcluster/utils.py

@@ -199,7 +199,7 @@ def to_utc_datetime(time_in, default_timezone=datetime.timezone.utc) -> datetime
     if isinstance(time_in, int):
         if time_in > 1e12:
             time_in /= 1000
-        time_ = datetime.datetime.utcfromtimestamp(time_in)
+        time_ = datetime.datetime.fromtimestamp(time_in, tz=datetime.timezone.utc)
         time_ = time_.replace(tzinfo=datetime.timezone.utc)
     elif isinstance(time_in, str):
         time_ = dateutil.parser.parse(time_in)

cli/tests/pcluster/templates/test_cluster_stack.py

@@ -13,7 +13,7 @@
 import os
 import re
 from abc import ABC, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List
 
 import pytest
@@ -970,7 +970,7 @@ def test_head_node_bootstrap_timeout(mocker, config_file_name, expected_head_nod
     )
     assert_that(
         generated_template["Resources"]
-        .get("HeadNodeWaitCondition" + datetime.utcnow().strftime("%Y%m%d%H%M%S"))
+        .get("HeadNodeWaitCondition" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S"))
         .get("Properties")
         .get("Timeout")
     ).is_equal_to(expected_head_node_bootstrap_timeout)

tests/integration-tests/benchmarks/common/metrics_reporter.py

@@ -29,7 +29,7 @@ def publish_compute_nodes_metric(scheduler_commands, max_monitoring_time, region
     metrics_pub = MetricsPublisher(region)
     compute_nodes_time_series = []
     ec2_nodes_time_series = []
-    timestamps = [datetime.datetime.utcnow()]
+    timestamps = [datetime.datetime.now(datetime.timezone.utc)]
 
     @retry(
         # Retry until EC2 and Scheduler capacities scale down to 0
@@ -61,7 +61,7 @@ def _watch_compute_nodes_allocation():
             ):
                 ec2_nodes_time_series.append(ec2_instances_count)
                 compute_nodes_time_series.append(compute_nodes)
-                timestamps.append(datetime.datetime.utcnow())
+                timestamps.append(datetime.datetime.now(datetime.timezone.utc))
         except Exception as e:
             logging.warning("Failed while watching nodes allocation with exception: %s", e)
             raise
@@ -72,7 +72,7 @@ def _watch_compute_nodes_allocation():
         # ignoring this error in order to perform assertions on the collected data.
         pass
 
-    end_time = datetime.datetime.utcnow()
+    end_time = datetime.datetime.now(datetime.timezone.utc)
     logging.info(
         "Monitoring completed: compute_nodes_time_series [ %s ], timestamps [ %s ]",
         " ".join(map(str, compute_nodes_time_series)),

tests/integration-tests/benchmarks/test_scaling_performance.py

@@ -47,7 +47,7 @@ def test_scaling_performance(
     scheduler_commands = scheduler_commands_factory(remote_command_executor)
 
     logging.info("Starting benchmark with following parameters: %s", benchmark_params)
-    start_time = datetime.datetime.utcnow()
+    start_time = datetime.datetime.now(datetime.timezone.utc)
     kwargs = {"nodes": benchmark_params["scaling_target"]}
     result = scheduler_commands.submit_command("sleep {0}".format(benchmark_params["job_duration"]), **kwargs)
     scheduler_commands.assert_job_submitted(result.stdout)

tests/integration-tests/benchmarks/test_scheduler_performance.py

@@ -52,7 +52,7 @@ def test_scheduler_performance(
     scheduler_commands = scheduler_commands_factory(remote_command_executor)
 
     logging.info("Starting benchmark with following parameters: %s", benchmark_params)
-    start_time = datetime.datetime.utcnow()
+    start_time = datetime.datetime.now(datetime.timezone.utc)
     _submit_jobs(benchmark_params, scheduler_commands, cluster, scheduler_commands_factory)
     compute_nodes_time_series, timestamps, end_time = publish_compute_nodes_metric(
         scheduler_commands,

tests/integration-tests/reports_generator.py

@@ -38,9 +38,9 @@ def generate_cw_report(test_results_dir, namespace, aws_region, timestamp_day_st
     if start_timestamp is not None:
         timestamp = datetime.datetime.fromtimestamp(start_timestamp)
     elif timestamp_day_start:
-        timestamp = datetime.datetime.combine(datetime.datetime.utcnow(), datetime.time())
+        timestamp = datetime.datetime.combine(datetime.datetime.now(datetime.timezone.utc), datetime.time())
     else:
-        timestamp = datetime.datetime.utcnow()
+        timestamp = datetime.datetime.now(datetime.timezone.utc)
     for category, dictionary in report.items():
         if category == "all":
             _put_metrics(metric_pub, namespace, dictionary, [], timestamp)

tests/integration-tests/tests/storage/test_fsx_lustre.py

@@ -93,7 +93,9 @@ def test_fsx_lustre_configuration_options(
         bucket_name = s3_bucket_factory()
         bucket = boto3.resource("s3", region_name=region).Bucket(bucket_name)
         bucket.upload_file(str(test_datadir / "s3_test_file"), "s3_test_file")
-    weekly_maintenance_start_time = (datetime.datetime.utcnow() + datetime.timedelta(minutes=60)).strftime("%u:%H:%M")
+    weekly_maintenance_start_time = (
+        datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=60)
+    ).strftime("%u:%H:%M")
     cluster_config = pcluster_config_reader(
         bucket_name=bucket_name,
         mount_dir=mount_dir,
@@ -247,7 +249,7 @@ def test_fsx_lustre_backup(region, pcluster_config_reader, clusters_factory, sch
 
     """
     mount_dir = "/fsx_mount_dir"
-    daily_automatic_backup_start_time = datetime.datetime.utcnow() + datetime.timedelta(minutes=15)
+    daily_automatic_backup_start_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(minutes=15)
     logging.info(f"daily_automatic_backup_start_time: {daily_automatic_backup_start_time}")
     cluster_config = pcluster_config_reader(
         mount_dir=mount_dir, daily_automatic_backup_start_time=daily_automatic_backup_start_time.strftime("%H:%M")
@@ -670,7 +672,7 @@ def monitor_automatic_backup_creation(fsx_fs_id, region, backup_start_time):
 def sleep_until_automatic_backup_creation_start_time(fsx_fs_id, backup_start_time):
     """Wait for the automatic backup of the given file system to start."""
     logging.info(f"Sleeping until time when {fsx_fs_id}'s backup creation should start at {backup_start_time}")
-    remaining_time = (backup_start_time - datetime.datetime.utcnow()).total_seconds()
+    remaining_time = (backup_start_time - datetime.datetime.now(datetime.timezone.utc)).total_seconds()
     if remaining_time > 0:
         time.sleep(remaining_time)