remove Go sdk changes

Author: bambadiouf1

sdks/go/pkg/beam/runners/dataflow/dataflow.go

@@ -63,8 +63,6 @@ var (
 	maxNumWorkers          = flag.Int64("max_num_workers", 0, "Maximum number of workers during scaling (optional).")
 	diskSizeGb             = flag.Int64("disk_size_gb", 0, "Size of root disk for VMs, in GB (optional).")
 	diskType               = flag.String("disk_type", "", "Type of root disk for VMs (optional).")
-	diskProvisionedIOPS    = flag.Int64("disk_provisioned_iops", 0, "Provisioned IOPS for the root disk for VMs (optional).")
-	diskProvisionedThroughputMibps = flag.Int64("disk_provisioned_throughput_mibps", 0, "Provisioned throughput for the root disk for VMs (optional).")
 	autoscalingAlgorithm   = flag.String("autoscaling_algorithm", "", "Autoscaling mode to use (optional).")
 	zone                   = flag.String("zone", "", "GCP zone (optional)")
 	kmsKey                 = flag.String("dataflow_kms_key", "", "The Cloud KMS key identifier used to encrypt data at rest (optional).")
@@ -117,8 +115,6 @@ var flagFilter = map[string]bool{
 	"max_num_workers":                true,
 	"disk_size_gb":                   true,
 	"disk_type":                      true,
-	"disk_provisioned_iops":          true,
-	"disk_provisioned_throughput_mibps": true,
 	"autoscaling_algorithm":          true,
 	"zone":                           true,
 	"network":                        true,
@@ -400,8 +396,6 @@ func getJobOptions(ctx context.Context, streaming bool) (*dataflowlib.JobOptions
 		WorkerHarnessThreads:   *workerHarnessThreads,
 		DiskSizeGb:             *diskSizeGb,
 		DiskType:               *diskType,
-		DiskProvisionedIOPS:    *diskProvisionedIOPS,
-		DiskProvisionedThroughputMibps: *diskProvisionedThroughputMibps,
 		Algorithm:              *autoscalingAlgorithm,
 		FlexRSGoal:             *flexRSGoal,
 		MachineType:            *firstNonEmpty(workerMachineType, machineType),

sdks/go/pkg/beam/runners/dataflow/dataflowlib/job.go

@@ -58,8 +58,6 @@ type JobOptions struct {
 	NumWorkers          int64
 	DiskSizeGb          int64
 	DiskType            string
-	DiskProvisionedIOPS int64
-	DiskProvisionedThroughputMibps int64
 	MachineType         string
 	Labels              map[string]string
 	ServiceAccountEmail string
@@ -193,8 +191,6 @@ func Translate(ctx context.Context, p *pipepb.Pipeline, opts *JobOptions, worker
 				},
 				DiskSizeGb:                  opts.DiskSizeGb,
 				DiskType:                    opts.DiskType,
-				DiskProvisionedIops:         opts.DiskProvisionedIOPS,
-				DiskProvisionedThroughputMibps: opts.DiskProvisionedThroughputMibps,
 				IpConfiguration:             ipConfiguration,
 				Kind:                        "harness",
 				Packages:                    packages,

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

@@ -28,28 +28,23 @@
 
 import ast
 import codecs
-from functools import partial
 import getpass
 import hashlib
 import io
 import json
 import logging
 import os
 import random
-import string
-
-from packaging import version
 import re
+import string
 import sys
 import time
 import traceback
 import warnings
 from copy import copy
 from datetime import datetime
 from datetime import timezone
-
-from apitools.base.py import encoding
-from apitools.base.py import exceptions
+from functools import partial
 
 from apache_beam import version as beam_version
 from apache_beam.internal.gcp.auth import get_service_credentials
@@ -73,8 +68,11 @@
 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 retry
 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
 
 # Environment version information. It is passed to the service during a
 # a job submission and is used by the service to establish what features
@@ -209,8 +207,7 @@ def __init__(
       pool.diskProvisionedIops = self.worker_options.disk_provisioned_iops
     if self.worker_options.disk_provisioned_throughput_mibps:
       pool.diskProvisionedThroughputMibps = (
-          self.worker_options.disk_provisioned_throughput_mibps
-      )
+          self.worker_options.disk_provisioned_throughput_mibps)
     if self.worker_options.zone:
       pool.zone = self.worker_options.zone
     if self.worker_options.network: