feat: Switch to string enums for compute (#685)

owlbot.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pathlib import Path
 import synthtool as s
 import synthtool.gcp as gcp
 from synthtool.languages import python
@@ -57,7 +58,8 @@
 python.py_samples(skip_readmes=True)
 
 # ----------------------------------------------------------------------------
-# Run blacken session
+# Run blacken session for all directories with a noxfile
 # ----------------------------------------------------------------------------
 
-s.shell.run(["nox", "-s", "blacken"], hide_output=False)
+for noxfile in Path(".").glob("**/noxfile.py"):
+    s.shell.run(["nox", "-s", "blacken"], cwd=noxfile.parent, hide_output=False)

samples/snippets/quickstart.py

@@ -133,7 +133,7 @@ def create_instance(
     disk.initialize_params = initialize_params
     disk.auto_delete = True
     disk.boot = True
-    disk.type_ = compute_v1.AttachedDisk.Type.PERSISTENT
+    disk.type_ = "PERSISTENT"
 
     # Use the network interface provided in the network_name argument.
     network_interface = compute_v1.NetworkInterface()

samples/snippets/test_sample_start_stop.py

@@ -42,7 +42,7 @@ def _make_disk(raw_key: bytes = None):
     disk.initialize_params = initialize_params
     disk.auto_delete = True
     disk.boot = True
-    disk.type_ = compute_v1.AttachedDisk.Type.PERSISTENT
+    disk.type_ = "PERSISTENT"
     disk.device_name = 'disk-1'
 
     if raw_key:

tests/system/test_smoke.py

@@ -173,7 +173,7 @@ def insert_instance(self):
         disk = AttachedDisk(
             auto_delete=True,
             boot=True,
-            type_=AttachedDisk.Type.PERSISTENT,
+            type_="PERSISTENT",
             initialize_params=initialize_params,
         )
         network_interface = NetworkInterface(name="default")

tests/unit/gapic/compute_v1/test_addresses.py

@@ -747,20 +747,20 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetAddressReques
         # Designate an appropriate value for the returned response.
         return_value = compute.Address(
             address="address_value",
-            address_type=compute.Address.AddressType.EXTERNAL,
+            address_type="address_type_value",
             creation_timestamp="creation_timestamp_value",
             description="description_value",
             id=205,
-            ip_version=compute.Address.IpVersion.IPV4,
+            ip_version="ip_version_value",
             kind="kind_value",
             name="name_value",
             network="network_value",
-            network_tier=compute.Address.NetworkTier.PREMIUM,
+            network_tier="network_tier_value",
             prefix_length=1391,
-            purpose=compute.Address.Purpose.DNS_RESOLVER,
+            purpose="purpose_value",
             region="region_value",
             self_link="self_link_value",
-            status=compute.Address.Status.IN_USE,
+            status="status_value",
             subnetwork="subnetwork_value",
             users=["users_value"],
         )
@@ -776,20 +776,20 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetAddressReques
     # Establish that the response is the type that we expect.
     assert isinstance(response, compute.Address)
     assert response.address == "address_value"
-    assert response.address_type == compute.Address.AddressType.EXTERNAL
+    assert response.address_type == "address_type_value"
     assert response.creation_timestamp == "creation_timestamp_value"
     assert response.description == "description_value"
     assert response.id == 205
-    assert response.ip_version == compute.Address.IpVersion.IPV4
+    assert response.ip_version == "ip_version_value"
     assert response.kind == "kind_value"
     assert response.name == "name_value"
     assert response.network == "network_value"
-    assert response.network_tier == compute.Address.NetworkTier.PREMIUM
+    assert response.network_tier == "network_tier_value"
     assert response.prefix_length == 1391
-    assert response.purpose == compute.Address.Purpose.DNS_RESOLVER
+    assert response.purpose == "purpose_value"
     assert response.region == "region_value"
     assert response.self_link == "self_link_value"
-    assert response.status == compute.Address.Status.IN_USE
+    assert response.status == "status_value"
     assert response.subnetwork == "subnetwork_value"
     assert response.users == ["users_value"]
 

tests/unit/gapic/compute_v1/test_autoscalers.py

@@ -761,7 +761,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetAutoscalerReq
             recommended_size=1693,
             region="region_value",
             self_link="self_link_value",
-            status=compute.Autoscaler.Status.ACTIVE,
+            status="status_value",
             target="target_value",
             zone="zone_value",
         )
@@ -784,7 +784,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetAutoscalerReq
     assert response.recommended_size == 1693
     assert response.region == "region_value"
     assert response.self_link == "self_link_value"
-    assert response.status == compute.Autoscaler.Status.ACTIVE
+    assert response.status == "status_value"
     assert response.target == "target_value"
     assert response.zone == "zone_value"
 

tests/unit/gapic/compute_v1/test_backend_services.py

@@ -1103,17 +1103,17 @@ def test_get_rest(
             health_checks=["health_checks_value"],
             id=205,
             kind="kind_value",
-            load_balancing_scheme=compute.BackendService.LoadBalancingScheme.EXTERNAL,
-            locality_lb_policy=compute.BackendService.LocalityLbPolicy.INVALID_LB_POLICY,
+            load_balancing_scheme="load_balancing_scheme_value",
+            locality_lb_policy="locality_lb_policy_value",
             name="name_value",
             network="network_value",
             port=453,
             port_name="port_name_value",
-            protocol=compute.BackendService.Protocol.GRPC,
+            protocol="protocol_value",
             region="region_value",
             security_policy="security_policy_value",
             self_link="self_link_value",
-            session_affinity=compute.BackendService.SessionAffinity.CLIENT_IP,
+            session_affinity="session_affinity_value",
             timeout_sec=1185,
         )
 
@@ -1137,23 +1137,17 @@ def test_get_rest(
     assert response.health_checks == ["health_checks_value"]
     assert response.id == 205
     assert response.kind == "kind_value"
-    assert (
-        response.load_balancing_scheme
-        == compute.BackendService.LoadBalancingScheme.EXTERNAL
-    )
-    assert (
-        response.locality_lb_policy
-        == compute.BackendService.LocalityLbPolicy.INVALID_LB_POLICY
-    )
+    assert response.load_balancing_scheme == "load_balancing_scheme_value"
+    assert response.locality_lb_policy == "locality_lb_policy_value"
     assert response.name == "name_value"
     assert response.network == "network_value"
     assert response.port == 453
     assert response.port_name == "port_name_value"
-    assert response.protocol == compute.BackendService.Protocol.GRPC
+    assert response.protocol == "protocol_value"
     assert response.region == "region_value"
     assert response.security_policy == "security_policy_value"
     assert response.self_link == "self_link_value"
-    assert response.session_affinity == compute.BackendService.SessionAffinity.CLIENT_IP
+    assert response.session_affinity == "session_affinity_value"
     assert response.timeout_sec == 1185
 
 

tests/unit/gapic/compute_v1/test_disks.py

@@ -1093,7 +1093,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetDiskRequest):
             source_snapshot="source_snapshot_value",
             source_snapshot_id="source_snapshot_id_value",
             source_storage_object="source_storage_object_value",
-            status=compute.Disk.Status.CREATING,
+            status="status_value",
             type_="type__value",
             users=["users_value"],
             zone="zone_value",
@@ -1136,7 +1136,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetDiskRequest):
     assert response.source_snapshot == "source_snapshot_value"
     assert response.source_snapshot_id == "source_snapshot_id_value"
     assert response.source_storage_object == "source_storage_object_value"
-    assert response.status == compute.Disk.Status.CREATING
+    assert response.status == "status_value"
     assert response.type_ == "type__value"
     assert response.users == ["users_value"]
     assert response.zone == "zone_value"

tests/unit/gapic/compute_v1/test_external_vpn_gateways.py

@@ -597,7 +597,7 @@ def test_get_rest(
             kind="kind_value",
             label_fingerprint="label_fingerprint_value",
             name="name_value",
-            redundancy_type=compute.ExternalVpnGateway.RedundancyType.FOUR_IPS_REDUNDANCY,
+            redundancy_type="redundancy_type_value",
             self_link="self_link_value",
         )
 
@@ -617,10 +617,7 @@ def test_get_rest(
     assert response.kind == "kind_value"
     assert response.label_fingerprint == "label_fingerprint_value"
     assert response.name == "name_value"
-    assert (
-        response.redundancy_type
-        == compute.ExternalVpnGateway.RedundancyType.FOUR_IPS_REDUNDANCY
-    )
+    assert response.redundancy_type == "redundancy_type_value"
     assert response.self_link == "self_link_value"
 
 

tests/unit/gapic/compute_v1/test_firewall_policies.py

@@ -1424,7 +1424,7 @@ def test_get_rule_rest(
         return_value = compute.FirewallPolicyRule(
             action="action_value",
             description="description_value",
-            direction=compute.FirewallPolicyRule.Direction.EGRESS,
+            direction="direction_value",
             disabled=True,
             enable_logging=True,
             kind="kind_value",
@@ -1446,7 +1446,7 @@ def test_get_rule_rest(
     assert isinstance(response, compute.FirewallPolicyRule)
     assert response.action == "action_value"
     assert response.description == "description_value"
-    assert response.direction == compute.FirewallPolicyRule.Direction.EGRESS
+    assert response.direction == "direction_value"
     assert response.disabled is True
     assert response.enable_logging is True
     assert response.kind == "kind_value"

tests/unit/gapic/compute_v1/test_firewalls.py

@@ -565,7 +565,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetFirewallReque
             creation_timestamp="creation_timestamp_value",
             description="description_value",
             destination_ranges=["destination_ranges_value"],
-            direction=compute.Firewall.Direction.EGRESS,
+            direction="direction_value",
             disabled=True,
             id=205,
             kind="kind_value",
@@ -593,7 +593,7 @@ def test_get_rest(transport: str = "rest", request_type=compute.GetFirewallReque
     assert response.creation_timestamp == "creation_timestamp_value"
     assert response.description == "description_value"
     assert response.destination_ranges == ["destination_ranges_value"]
-    assert response.direction == compute.Firewall.Direction.EGRESS
+    assert response.direction == "direction_value"
     assert response.disabled is True
     assert response.id == 205
     assert response.kind == "kind_value"

tests/unit/gapic/compute_v1/test_forwarding_rules.py

@@ -791,26 +791,26 @@ def test_get_rest(
         # Designate an appropriate value for the returned response.
         return_value = compute.ForwardingRule(
             I_p_address="I_p_address_value",
-            I_p_protocol=compute.ForwardingRule.IPProtocol.AH,
+            I_p_protocol="I_p_protocol_value",
             all_ports=True,
             allow_global_access=True,
             backend_service="backend_service_value",
             creation_timestamp="creation_timestamp_value",
             description="description_value",
             fingerprint="fingerprint_value",
             id=205,
-            ip_version=compute.ForwardingRule.IpVersion.IPV4,
+            ip_version="ip_version_value",
             is_mirroring_collector=True,
             kind="kind_value",
             label_fingerprint="label_fingerprint_value",
-            load_balancing_scheme=compute.ForwardingRule.LoadBalancingScheme.EXTERNAL,
+            load_balancing_scheme="load_balancing_scheme_value",
             name="name_value",
             network="network_value",
-            network_tier=compute.ForwardingRule.NetworkTier.PREMIUM,
+            network_tier="network_tier_value",
             port_range="port_range_value",
             ports=["ports_value"],
             psc_connection_id=1793,
-            psc_connection_status=compute.ForwardingRule.PscConnectionStatus.ACCEPTED,
+            psc_connection_status="psc_connection_status_value",
             region="region_value",
             self_link="self_link_value",
             service_label="service_label_value",
@@ -830,32 +830,26 @@ def test_get_rest(
     # Establish that the response is the type that we expect.
     assert isinstance(response, compute.ForwardingRule)
     assert response.I_p_address == "I_p_address_value"
-    assert response.I_p_protocol == compute.ForwardingRule.IPProtocol.AH
+    assert response.I_p_protocol == "I_p_protocol_value"
     assert response.all_ports is True
     assert response.allow_global_access is True
     assert response.backend_service == "backend_service_value"
     assert response.creation_timestamp == "creation_timestamp_value"
     assert response.description == "description_value"
     assert response.fingerprint == "fingerprint_value"
     assert response.id == 205
-    assert response.ip_version == compute.ForwardingRule.IpVersion.IPV4
+    assert response.ip_version == "ip_version_value"
     assert response.is_mirroring_collector is True
     assert response.kind == "kind_value"
     assert response.label_fingerprint == "label_fingerprint_value"
-    assert (
-        response.load_balancing_scheme
-        == compute.ForwardingRule.LoadBalancingScheme.EXTERNAL
-    )
+    assert response.load_balancing_scheme == "load_balancing_scheme_value"
     assert response.name == "name_value"
     assert response.network == "network_value"
-    assert response.network_tier == compute.ForwardingRule.NetworkTier.PREMIUM
+    assert response.network_tier == "network_tier_value"
     assert response.port_range == "port_range_value"
     assert response.ports == ["ports_value"]
     assert response.psc_connection_id == 1793
-    assert (
-        response.psc_connection_status
-        == compute.ForwardingRule.PscConnectionStatus.ACCEPTED
-    )
+    assert response.psc_connection_status == "psc_connection_status_value"
     assert response.region == "region_value"
     assert response.self_link == "self_link_value"
     assert response.service_label == "service_label_value"

tests/unit/gapic/compute_v1/test_global_addresses.py

@@ -587,20 +587,20 @@ def test_get_rest(
         # Designate an appropriate value for the returned response.
         return_value = compute.Address(
             address="address_value",
-            address_type=compute.Address.AddressType.EXTERNAL,
+            address_type="address_type_value",
             creation_timestamp="creation_timestamp_value",
             description="description_value",
             id=205,
-            ip_version=compute.Address.IpVersion.IPV4,
+            ip_version="ip_version_value",
             kind="kind_value",
             name="name_value",
             network="network_value",
-            network_tier=compute.Address.NetworkTier.PREMIUM,
+            network_tier="network_tier_value",
             prefix_length=1391,
-            purpose=compute.Address.Purpose.DNS_RESOLVER,
+            purpose="purpose_value",
             region="region_value",
             self_link="self_link_value",
-            status=compute.Address.Status.IN_USE,
+            status="status_value",
             subnetwork="subnetwork_value",
             users=["users_value"],
         )
@@ -616,20 +616,20 @@ def test_get_rest(
     # Establish that the response is the type that we expect.
     assert isinstance(response, compute.Address)
     assert response.address == "address_value"
-    assert response.address_type == compute.Address.AddressType.EXTERNAL
+    assert response.address_type == "address_type_value"
     assert response.creation_timestamp == "creation_timestamp_value"
     assert response.description == "description_value"
     assert response.id == 205
-    assert response.ip_version == compute.Address.IpVersion.IPV4
+    assert response.ip_version == "ip_version_value"
     assert response.kind == "kind_value"
     assert response.name == "name_value"
     assert response.network == "network_value"
-    assert response.network_tier == compute.Address.NetworkTier.PREMIUM
+    assert response.network_tier == "network_tier_value"
     assert response.prefix_length == 1391
-    assert response.purpose == compute.Address.Purpose.DNS_RESOLVER
+    assert response.purpose == "purpose_value"
     assert response.region == "region_value"
     assert response.self_link == "self_link_value"
-    assert response.status == compute.Address.Status.IN_USE
+    assert response.status == "status_value"
     assert response.subnetwork == "subnetwork_value"
     assert response.users == ["users_value"]