linter appeasement

Author: ramo-j

.pylintrc

@@ -370,7 +370,7 @@ max-statements=50
 # Minimum number of public methods for a class (see R0903).
 min-public-methods=2
 
-max-positional-arguments=10
+max-positional-arguments=12
 
 
 [CLASSES]

libcloudforensics/__init__.py

@@ -16,4 +16,4 @@
 
 # Since moving to poetry, ensure the version number tracked in pyproject.toml is
 # also updated
-__version__ = '20250331'
+__version__ = '20250721'

libcloudforensics/providers/aws/forensics.py

@@ -124,7 +124,7 @@ def CreateVolumeCopy(zone: str,
   try:
     if volume_id:
       volume_to_copy = source_account.ebs.GetVolumeById(volume_id)
-    elif instance_id:
+    else:
       instance = source_account.ec2.GetInstanceById(instance_id)
       volume_to_copy = instance.GetBootVolume()
 
@@ -200,8 +200,7 @@ def CreateVolumeCopy(zone: str,
 
   return new_volume
 
-# pylint: disable=too-many-arguments
-def StartAnalysisVm(
+def StartAnalysisVm(  # pylint: disable=too-many-arguments,too-many-positional-arguments
     vm_name: str,
     default_availability_zone: str,
     boot_volume_size: int,

libcloudforensics/providers/aws/internal/ec2.py

@@ -372,8 +372,7 @@ def ListImages(
 
     return images['Images']
 
-  # pylint: disable=too-many-arguments
-  def GetOrCreateVm(
+  def GetOrCreateVm(  # pylint: disable=too-many-arguments,too-many-positional-arguments
       self,
       vm_name: str,
       boot_volume_size: int,

libcloudforensics/providers/azure/forensics.py

@@ -85,7 +85,7 @@ def CreateDiskCopy(
   try:
     if disk_name:
       disk_to_copy = src_account.compute.GetDisk(disk_name)
-    elif instance_name:
+    else:
       instance = src_account.compute.GetInstance(instance_name)
       disk_to_copy = instance.GetBootDisk()
     logger.info('Disk copy of {0:s} started...'.format(

libcloudforensics/providers/gcp/forensics.py

@@ -78,7 +78,7 @@ def CreateDiskCopy(
   try:
     if disk_name:
       disk_to_copy = src_project.compute.GetDisk(disk_name)
-    elif instance_name:
+    else:
       instance = src_project.compute.GetInstance(instance_name)
       disk_to_copy = instance.GetBootDisk()
 
@@ -713,19 +713,13 @@ def TriageInstance(project_id: str, instance_name: str) -> Dict[str, Any]:
 
   cpu_usage = project.monitoring.GetCpuUsage(
       instance_ids=[instance_info['id']], aggregation_minutes=1)
-  if cpu_usage:
-    parsed_cpu = cpu_usage[0].get('cpu_usage', [])
+  parsed_cpu = cpu_usage[0].get('cpu_usage', []) if cpu_usage else None
 
 
   gce_gpu_usage = project.monitoring.GetInstanceGPUUsage(
-    instance_ids=[instance_info['id']])
-  if gce_gpu_usage:
-    parsed_gce_gpu = gce_gpu_usage
-
+      instance_ids=[instance_info['id']])
 
   gke_gpu_usage = project.monitoring.GetNodeAccelUsage()
-  if gke_gpu_usage:
-    parsed_gke_gpu = gke_gpu_usage
 
   instance_triage = {
       'instance_info': {
@@ -741,25 +735,25 @@ def TriageInstance(project_id: str, instance_name: str) -> Dict[str, Any]:
           'data_type': 'service_accounts',
           'values': instance_info['serviceAccounts']
       },
-                      {
-                          'data_type': 'firewalls',
-                          'values': instance.GetNormalisedFirewalls()
-                      }, {
-                          'data_type': 'cpu_usage', 'values': parsed_cpu
-                      }, {
-                          'data_type': 'gce_gpu_usage', 'values': parsed_gce_gpu
-                      }, {
-                          'data_type': 'gke_gpu_usage', 'values': parsed_gke_gpu
-                      }, {
-                          'data_type':
-                              'ssh_auth',
-                          'values':
-                              CheckInstanceSSHAuth(
-                                  project_id, instance_info['name'])
-                      }, {
-                          'data_type': 'active_services',
-                          'values': parsed_services
-                      }]
+      {
+          'data_type': 'firewalls',
+          'values': instance.GetNormalisedFirewalls()
+      }, {
+          'data_type': 'cpu_usage', 'values': parsed_cpu
+      }, {
+          'data_type': 'gce_gpu_usage', 'values': gce_gpu_usage
+      }, {
+          'data_type': 'gke_gpu_usage', 'values': gke_gpu_usage
+      }, {
+          'data_type':
+              'ssh_auth',
+          'values':
+              CheckInstanceSSHAuth(
+                  project_id, instance_info['name'])
+      }, {
+          'data_type': 'active_services',
+          'values': parsed_services
+      }]
   }
 
   return instance_triage

libcloudforensics/providers/gcp/internal/compute.py

@@ -682,7 +682,7 @@ def CreateInstanceFromRequest(
     return GoogleComputeInstance(
         project_id=self.project_id, zone=compute_zone, name=instance_name)
 
-  def CreateInstanceFromArguments(  #pylint: disable=too-many-arguments
+  def CreateInstanceFromArguments(  # pylint: disable=too-many-arguments,too-many-positional-arguments
       self,
       instance_name: str,
       machine_type: str,
@@ -1288,6 +1288,7 @@ def ImportImageFromStorage(self,
         'windows-8-x86-byol'
     ]
 
+    img_type = None
     if not bootable:
       img_type = '-data_disk'
     elif not os_name:

libcloudforensics/providers/gcp/internal/monitoring.py

@@ -333,6 +333,7 @@ def GetInstanceGPUUsage(
     for response in responses:
       time_series = response.get('timeSeries', [])
       for ts in time_series:
+        gpu_name = 'None'
         if ts['metric'].get('labels', None):
           gpu_name = "{0:s} ({1:s})".format(
               ts['metric']['labels']['model'],

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libcloudforensics"
-version = "20250331"
+version = "20250721"
 description = "libcloudforensics is a set of tools to help acquire forensic evidence from Cloud platforms."
 authors = ["cloud-forensics-utils development team <cloud-forensics-utils-dev@googlegroups.com>"]
 license = "Apache-2.0"