chore: update templates (#23)

* build(python): enable flakybot on library unit and system tests Source-Author: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Source-Date: Wed Feb 17 14:10:46 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: d17674372e27fb8f23013935e794aa37502071aa Source-Link: googleapis/synthtool@d176743
googleapis · Mar 1, 2021 · 6988587 · 6988587
1 parent dbbc89e
commit 6988587
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 40 deletions.
diff --git a/packages/google-cloud-compute/.gitignore b/packages/google-cloud-compute/.gitignore
@@ -50,8 +50,10 @@ docs.metadata
 
 # Virtual environment
 env/
+
+# Test logs
 coverage.xml
-sponge_log.xml
+*sponge_log.xml
 
 # System test environment variables.
 system_tests/local_test_setup

diff --git a/packages/google-cloud-compute/.kokoro/build.sh b/packages/google-cloud-compute/.kokoro/build.sh
@@ -40,6 +40,16 @@ python3 -m pip uninstall --yes --quiet nox-automation
 python3 -m pip install --upgrade --quiet nox
 python3 -m nox --version
 
+# If this is a continuous build, send the test log to the FlakyBot.
+# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
+  cleanup() {
+    chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
+    $KOKORO_GFILE_DIR/linux_amd64/flakybot
+  }
+  trap cleanup EXIT HUP
+fi
+
 # If NOX_SESSION is set, it only runs the specified session,
 # otherwise run all the sessions.
 if [[ -n "${NOX_SESSION:-}" ]]; then

diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py
@@ -1225,7 +1225,6 @@
     "AutoscalerAggregatedList",
     "AutoscalerList",
     "AutoscalerStatusDetails",
-    "AutoscalersClient",
     "AutoscalersScopedList",
     "AutoscalingPolicy",
     "AutoscalingPolicyCpuUtilization",
@@ -1495,6 +1494,7 @@
     "GetZoneOperationRequest",
     "GetZoneRequest",
     "GlobalAddressesClient",
+    "GlobalForwardingRulesClient",
     "GlobalNetworkEndpointGroupsAttachEndpointsRequest",
     "GlobalNetworkEndpointGroupsClient",
     "GlobalNetworkEndpointGroupsDetachEndpointsRequest",
@@ -2271,5 +2271,5 @@
     "ZoneSetLabelsRequest",
     "ZoneSetPolicyRequest",
     "ZonesClient",
-    "GlobalForwardingRulesClient",
+    "AutoscalersClient",
 )
diff --git a/packages/google-cloud-compute/noxfile.py b/packages/google-cloud-compute/noxfile.py
@@ -93,6 +93,7 @@ def default(session):
     session.run(
         "py.test",
         "--quiet",
+        f"--junitxml=unit_{session.python}_sponge_log.xml",
         "--cov=google/cloud",
         "--cov=tests/unit",
         "--cov-append",
@@ -141,9 +142,21 @@ def system(session):
 
     # Run py.test against the system tests.
     if system_test_exists:
-        session.run("py.test", "--quiet", system_test_path, *session.posargs)
+        session.run(
+            "py.test",
+            "--quiet",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_path,
+            *session.posargs,
+        )
     if system_test_folder_exists:
-        session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
+        session.run(
+            "py.test",
+            "--quiet",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_folder_path,
+            *session.posargs,
+        )
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)

diff --git a/packages/google-cloud-compute/scripts/fixup_compute_v1_keywords.py b/packages/google-cloud-compute/scripts/fixup_compute_v1_keywords.py
@@ -41,7 +41,7 @@ def partition(
 class computeCallTransformer(cst.CSTTransformer):
     CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
     METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
-    'abandon_instances': ('instance_group_manager', 'instance_group_managers_abandon_instances_request_resource', 'project', 'zone', 'request_id', ),
+    'abandon_instances': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_abandon_instances_request_resource', 'request_id', ),
     'add_access_config': ('access_config_resource', 'instance', 'network_interface', 'project', 'zone', 'request_id', ),
     'add_health_check': ('project', 'region', 'target_pool', 'target_pools_add_health_check_request_resource', 'request_id', ),
     'add_instance': ('project', 'region', 'target_pool', 'target_pools_add_instance_request_resource', 'request_id', ),
@@ -52,26 +52,26 @@ class computeCallTransformer(cst.CSTTransformer):
     'add_rule': ('project', 'security_policy', 'security_policy_rule_resource', ),
     'add_signed_url_key': ('backend_service', 'project', 'signed_url_key_resource', 'request_id', ),
     'aggregated_list': ('project', 'filter', 'include_all_scopes', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'apply_updates_to_instances': ('instance_group_manager', 'instance_group_managers_apply_updates_request_resource', 'project', 'zone', ),
+    'apply_updates_to_instances': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_apply_updates_request_resource', ),
     'attach_disk': ('attached_disk_resource', 'instance', 'project', 'zone', 'force_attach', 'request_id', ),
-    'attach_network_endpoints': ('global_network_endpoint_groups_attach_endpoints_request_resource', 'network_endpoint_group', 'project', 'request_id', ),
-    'create_instances': ('instance_group_manager', 'instance_group_managers_create_instances_request_resource', 'project', 'zone', 'request_id', ),
+    'attach_network_endpoints': ('network_endpoint_group', 'network_endpoint_groups_attach_endpoints_request_resource', 'project', 'zone', 'request_id', ),
+    'create_instances': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_create_instances_request_resource', 'request_id', ),
     'create_snapshot': ('disk', 'project', 'snapshot_resource', 'zone', 'guest_flush', 'request_id', ),
-    'delete': ('forwarding_rule', 'project', 'request_id', ),
+    'delete': ('autoscaler', 'project', 'zone', 'request_id', ),
     'delete_access_config': ('access_config', 'instance', 'network_interface', 'project', 'zone', 'request_id', ),
-    'delete_instances': ('instance_group_manager', 'instance_group_managers_delete_instances_request_resource', 'project', 'zone', 'request_id', ),
+    'delete_instances': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_delete_instances_request_resource', 'request_id', ),
     'delete_nodes': ('node_group', 'node_groups_delete_nodes_request_resource', 'project', 'zone', 'request_id', ),
-    'delete_per_instance_configs': ('instance_group_manager', 'instance_group_managers_delete_per_instance_configs_req_resource', 'project', 'zone', ),
+    'delete_per_instance_configs': ('instance_group_manager', 'project', 'region', 'region_instance_group_manager_delete_instance_config_req_resource', ),
     'delete_signed_url_key': ('backend_service', 'key_name', 'project', 'request_id', ),
     'deprecate': ('deprecation_status_resource', 'image', 'project', 'request_id', ),
     'detach_disk': ('device_name', 'instance', 'project', 'zone', 'request_id', ),
-    'detach_network_endpoints': ('global_network_endpoint_groups_detach_endpoints_request_resource', 'network_endpoint_group', 'project', 'request_id', ),
+    'detach_network_endpoints': ('network_endpoint_group', 'network_endpoint_groups_detach_endpoints_request_resource', 'project', 'zone', 'request_id', ),
     'disable_xpn_host': ('project', 'request_id', ),
     'disable_xpn_resource': ('project', 'projects_disable_xpn_resource_request_resource', 'request_id', ),
     'enable_xpn_host': ('project', 'request_id', ),
     'enable_xpn_resource': ('project', 'projects_enable_xpn_resource_request_resource', 'request_id', ),
     'expand_ip_cidr_range': ('project', 'region', 'subnetwork', 'subnetworks_expand_ip_cidr_range_request_resource', 'request_id', ),
-    'get': ('forwarding_rule', 'project', ),
+    'get': ('autoscaler', 'project', 'zone', ),
     'get_diagnostics': ('interconnect', 'project', ),
     'get_from_family': ('family', 'project', ),
     'get_guest_attributes': ('instance', 'project', 'zone', 'query_path', 'variable_key', ),
@@ -86,28 +86,28 @@ class computeCallTransformer(cst.CSTTransformer):
     'get_status': ('project', 'region', 'vpn_gateway', ),
     'get_xpn_host': ('project', ),
     'get_xpn_resources': ('project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'insert': ('forwarding_rule_resource', 'project', 'request_id', ),
+    'insert': ('autoscaler_resource', 'project', 'zone', 'request_id', ),
     'invalidate_cache': ('cache_invalidation_rule_resource', 'project', 'url_map', 'request_id', ),
-    'list': ('project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list': ('project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_available_features': ('project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'list_errors': ('instance_group_manager', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'list_instances': ('instance_group', 'project', 'region', 'region_instance_groups_list_instances_request_resource', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'list_managed_instances': ('instance_group_manager', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
-    'list_network_endpoints': ('network_endpoint_group', 'project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list_errors': ('instance_group_manager', 'project', 'region', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list_instances': ('instance_group', 'instance_groups_list_instances_request_resource', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list_managed_instances': ('instance_group_manager', 'project', 'region', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list_network_endpoints': ('network_endpoint_group', 'network_endpoint_groups_list_endpoints_request_resource', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_nodes': ('node_group', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_peering_routes': ('network', 'project', 'direction', 'filter', 'max_results', 'order_by', 'page_token', 'peering_name', 'region', 'return_partial_success', ),
-    'list_per_instance_configs': ('instance_group_manager', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
+    'list_per_instance_configs': ('instance_group_manager', 'project', 'region', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_preconfigured_expression_sets': ('project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_referrers': ('instance', 'project', 'zone', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_usable': ('project', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'list_xpn_hosts': ('project', 'projects_list_xpn_hosts_request_resource', 'filter', 'max_results', 'order_by', 'page_token', 'return_partial_success', ),
     'move_disk': ('disk_move_request_resource', 'project', 'request_id', ),
     'move_instance': ('instance_move_request_resource', 'project', 'request_id', ),
-    'patch': ('forwarding_rule', 'forwarding_rule_resource', 'project', 'request_id', ),
-    'patch_per_instance_configs': ('instance_group_manager', 'instance_group_managers_patch_per_instance_configs_req_resource', 'project', 'zone', 'request_id', ),
+    'patch': ('autoscaler_resource', 'project', 'zone', 'autoscaler', 'request_id', ),
+    'patch_per_instance_configs': ('instance_group_manager', 'project', 'region', 'region_instance_group_manager_patch_instance_config_req_resource', 'request_id', ),
     'patch_rule': ('project', 'security_policy', 'security_policy_rule_resource', 'priority', ),
     'preview': ('project', 'region', 'router', 'router_resource', ),
-    'recreate_instances': ('instance_group_manager', 'instance_group_managers_recreate_instances_request_resource', 'project', 'zone', 'request_id', ),
+    'recreate_instances': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_recreate_request_resource', 'request_id', ),
     'remove_health_check': ('project', 'region', 'target_pool', 'target_pools_remove_health_check_request_resource', 'request_id', ),
     'remove_instance': ('project', 'region', 'target_pool', 'target_pools_remove_instance_request_resource', 'request_id', ),
     'remove_instances': ('instance_group', 'instance_groups_remove_instances_request_resource', 'project', 'zone', 'request_id', ),
@@ -116,50 +116,50 @@ class computeCallTransformer(cst.CSTTransformer):
     'remove_rule': ('project', 'security_policy', 'priority', ),
     'reset': ('instance', 'project', 'zone', 'request_id', ),
     'resize': ('disk', 'disks_resize_request_resource', 'project', 'zone', 'request_id', ),
-    'set_backend_service': ('project', 'target_tcp_proxies_set_backend_service_request_resource', 'target_tcp_proxy', 'request_id', ),
+    'set_backend_service': ('project', 'target_ssl_proxies_set_backend_service_request_resource', 'target_ssl_proxy', 'request_id', ),
     'set_backup': ('project', 'region', 'target_pool', 'target_reference_resource', 'failover_ratio', 'request_id', ),
     'set_common_instance_metadata': ('metadata_resource', 'project', 'request_id', ),
     'set_default_network_tier': ('project', 'projects_set_default_network_tier_request_resource', 'request_id', ),
     'set_deletion_protection': ('project', 'resource', 'zone', 'deletion_protection', 'request_id', ),
     'set_disk_auto_delete': ('auto_delete', 'device_name', 'instance', 'project', 'zone', 'request_id', ),
     'set_iam_policy': ('project', 'resource', 'zone', 'zone_set_policy_request_resource', ),
-    'set_instance_template': ('instance_group_manager', 'instance_group_managers_set_instance_template_request_resource', 'project', 'zone', 'request_id', ),
+    'set_instance_template': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_set_template_request_resource', 'request_id', ),
     'set_labels': ('project', 'resource', 'zone', 'zone_set_labels_request_resource', 'request_id', ),
     'set_machine_resources': ('instance', 'instances_set_machine_resources_request_resource', 'project', 'zone', 'request_id', ),
     'set_machine_type': ('instance', 'instances_set_machine_type_request_resource', 'project', 'zone', 'request_id', ),
     'set_metadata': ('instance', 'metadata_resource', 'project', 'zone', 'request_id', ),
     'set_min_cpu_platform': ('instance', 'instances_set_min_cpu_platform_request_resource', 'project', 'zone', 'request_id', ),
-    'set_named_ports': ('instance_group', 'project', 'region', 'region_instance_groups_set_named_ports_request_resource', 'request_id', ),
+    'set_named_ports': ('instance_group', 'instance_groups_set_named_ports_request_resource', 'project', 'zone', 'request_id', ),
     'set_node_template': ('node_group', 'node_groups_set_node_template_request_resource', 'project', 'zone', 'request_id', ),
     'set_private_ip_google_access': ('project', 'region', 'subnetwork', 'subnetworks_set_private_ip_google_access_request_resource', 'request_id', ),
-    'set_proxy_header': ('project', 'target_tcp_proxies_set_proxy_header_request_resource', 'target_tcp_proxy', 'request_id', ),
+    'set_proxy_header': ('project', 'target_ssl_proxies_set_proxy_header_request_resource', 'target_ssl_proxy', 'request_id', ),
     'set_quic_override': ('project', 'target_https_proxies_set_quic_override_request_resource', 'target_https_proxy', 'request_id', ),
     'set_scheduling': ('instance', 'project', 'scheduling_resource', 'zone', 'request_id', ),
     'set_security_policy': ('backend_service', 'project', 'security_policy_reference_resource', 'request_id', ),
     'set_service_account': ('instance', 'instances_set_service_account_request_resource', 'project', 'zone', 'request_id', ),
     'set_shielded_instance_integrity_policy': ('instance', 'project', 'shielded_instance_integrity_policy_resource', 'zone', 'request_id', ),
-    'set_ssl_certificates': ('project', 'target_https_proxies_set_ssl_certificates_request_resource', 'target_https_proxy', 'request_id', ),
-    'set_ssl_policy': ('project', 'ssl_policy_reference_resource', 'target_https_proxy', 'request_id', ),
+    'set_ssl_certificates': ('project', 'target_ssl_proxies_set_ssl_certificates_request_resource', 'target_ssl_proxy', 'request_id', ),
+    'set_ssl_policy': ('project', 'ssl_policy_reference_resource', 'target_ssl_proxy', 'request_id', ),
     'set_tags': ('instance', 'project', 'tags_resource', 'zone', 'request_id', ),
-    'set_target': ('forwarding_rule', 'project', 'target_reference_resource', 'request_id', ),
-    'set_target_pools': ('instance_group_manager', 'instance_group_managers_set_target_pools_request_resource', 'project', 'zone', 'request_id', ),
-    'set_url_map': ('project', 'target_http_proxy', 'url_map_reference_resource', 'request_id', ),
+    'set_target': ('forwarding_rule', 'project', 'region', 'target_reference_resource', 'request_id', ),
+    'set_target_pools': ('instance_group_manager', 'project', 'region', 'region_instance_group_managers_set_target_pools_request_resource', 'request_id', ),
+    'set_url_map': ('project', 'region', 'target_http_proxy', 'url_map_reference_resource', 'request_id', ),
     'set_usage_export_bucket': ('project', 'usage_export_location_resource', 'request_id', ),
     'simulate_maintenance_event': ('instance', 'project', 'zone', ),
     'start': ('instance', 'project', 'zone', 'request_id', ),
     'start_with_encryption_key': ('instance', 'instances_start_with_encryption_key_request_resource', 'project', 'zone', 'request_id', ),
     'stop': ('instance', 'project', 'zone', 'request_id', ),
     'switch_to_custom_mode': ('network', 'project', 'request_id', ),
     'test_iam_permissions': ('project', 'resource', 'test_permissions_request_resource', 'zone', ),
-    'update': ('health_check', 'health_check_resource', 'project', 'request_id', ),
+    'update': ('autoscaler_resource', 'project', 'zone', 'autoscaler', 'request_id', ),
     'update_access_config': ('access_config_resource', 'instance', 'network_interface', 'project', 'zone', 'request_id', ),
     'update_display_device': ('display_device_resource', 'instance', 'project', 'zone', 'request_id', ),
     'update_network_interface': ('instance', 'network_interface', 'network_interface_resource', 'project', 'zone', 'request_id', ),
     'update_peering': ('network', 'networks_update_peering_request_resource', 'project', 'request_id', ),
-    'update_per_instance_configs': ('instance_group_manager', 'instance_group_managers_update_per_instance_configs_req_resource', 'project', 'zone', 'request_id', ),
+    'update_per_instance_configs': ('instance_group_manager', 'project', 'region', 'region_instance_group_manager_update_instance_config_req_resource', 'request_id', ),
     'update_shielded_instance_config': ('instance', 'project', 'shielded_instance_config_resource', 'zone', 'request_id', ),
-    'validate': ('project', 'region', 'region_url_maps_validate_request_resource', 'url_map', ),
-    'wait': ('operation', 'project', 'zone', ),
+    'validate': ('project', 'url_map', 'url_maps_validate_request_resource', ),
+    'wait': ('operation', 'project', ),
 
     }
 

diff --git a/packages/google-cloud-compute/synth.metadata b/packages/google-cloud-compute/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/python-compute.git",
-        "sha": "2122dbbcc78180246f7ea70f05bc7ef7af6149df"
+        "sha": "5fb6ac47a153e7d407e1a164ee1dbf3ce34ffe77"
       }
     },
     {
@@ -18,14 +18,14 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4679e7e415221f03ff2a71e3ffad75b9ec41d87e"
+        "sha": "d17674372e27fb8f23013935e794aa37502071aa"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "4679e7e415221f03ff2a71e3ffad75b9ec41d87e"
+        "sha": "d17674372e27fb8f23013935e794aa37502071aa"
       }
     }
   ],