From 6a70577f36e0bd5a2025c90b81fdbba684345857 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Mar 2025 10:24:27 -0700 Subject: [PATCH 1/9] Support fog-core 2.5 and up --- fog-google.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fog-google.gemspec b/fog-google.gemspec index d5f1ecd3f..387afbd80 100644 --- a/fog-google.gemspec +++ b/fog-google.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| # As of 0.1.1 spec.required_ruby_version = ">= 2.0" - spec.add_dependency "fog-core", "< 2.5" + spec.add_dependency "fog-core", "~> 2.5" spec.add_dependency "fog-json", "~> 1.2" spec.add_dependency "fog-xml", "~> 0.1.0" From 3a1163bf98f64e270c14a6f1573ac8e396fd02e1 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Mar 2025 10:46:31 -0700 Subject: [PATCH 2/9] Rename Fog::Compute::Google to Fog::Google::Compute This is needed to support fog-core 2.2 and up due to this change: https://github.com/fog/fog-core/pull/241 --- CHANGELOG.md | 74 +++++++++---------- CONTRIBUTING.md | 22 +++--- README.md | 12 +-- .../create_instance_and_attach_disk_later.rb | 13 ++-- lib/fog/bin/google.rb | 45 +++++------ lib/fog/google.rb | 5 +- .../{compute/google.rb => google/compute.rb} | 12 +-- .../google => google/compute}/mock.rb | 4 +- .../compute}/models/address.rb | 16 ++-- .../compute}/models/addresses.rb | 6 +- .../compute}/models/backend_service.rb | 8 +- .../compute}/models/backend_services.rb | 6 +- .../google => google/compute}/models/disk.rb | 10 +-- .../compute}/models/disk_type.rb | 4 +- .../compute}/models/disk_types.rb | 6 +- .../google => google/compute}/models/disks.rb | 6 +- .../compute}/models/firewall.rb | 12 +-- .../compute}/models/firewalls.rb | 6 +- .../compute}/models/forwarding_rule.rb | 8 +- .../compute}/models/forwarding_rules.rb | 6 +- .../compute}/models/global_address.rb | 8 +- .../compute}/models/global_addresses.rb | 6 +- .../compute}/models/global_forwarding_rule.rb | 8 +- .../models/global_forwarding_rules.rb | 6 +- .../compute}/models/http_health_check.rb | 10 +-- .../compute}/models/http_health_checks.rb | 6 +- .../google => google/compute}/models/image.rb | 8 +- .../compute}/models/images.rb | 6 +- .../compute}/models/instance_group.rb | 4 +- .../compute}/models/instance_group_manager.rb | 6 +- .../models/instance_group_managers.rb | 6 +- .../compute}/models/instance_groups.rb | 10 +-- .../compute}/models/instance_template.rb | 8 +- .../compute}/models/instance_templates.rb | 6 +- .../compute}/models/machine_type.rb | 4 +- .../compute}/models/machine_types.rb | 6 +- .../compute}/models/network.rb | 8 +- .../compute}/models/networks.rb | 6 +- .../compute}/models/operation.rb | 4 +- .../compute}/models/operations.rb | 6 +- .../compute}/models/project.rb | 6 +- .../compute}/models/projects.rb | 6 +- .../compute}/models/region.rb | 4 +- .../compute}/models/regions.rb | 6 +- .../google => google/compute}/models/route.rb | 8 +- .../compute}/models/routes.rb | 6 +- .../compute}/models/server.rb | 36 ++++----- .../compute}/models/servers.rb | 6 +- .../compute}/models/snapshot.rb | 6 +- .../compute}/models/snapshots.rb | 6 +- .../compute}/models/ssl_certificate.rb | 8 +- .../compute}/models/ssl_certificates.rb | 6 +- .../compute}/models/subnetwork.rb | 12 +-- .../compute}/models/subnetworks.rb | 6 +- .../compute}/models/target_http_proxies.rb | 6 +- .../compute}/models/target_http_proxy.rb | 10 +-- .../compute}/models/target_https_proxies.rb | 6 +- .../compute}/models/target_https_proxy.rb | 14 ++-- .../compute}/models/target_instance.rb | 8 +- .../compute}/models/target_instances.rb | 6 +- .../compute}/models/target_pool.rb | 16 ++-- .../compute}/models/target_pools.rb | 6 +- .../compute}/models/url_map.rb | 14 ++-- .../compute}/models/url_maps.rb | 6 +- .../google => google/compute}/models/zone.rb | 4 +- .../google => google/compute}/models/zones.rb | 6 +- .../google => google/compute}/real.rb | 4 +- .../compute}/requests/abandon_instances.rb | 4 +- .../requests/add_backend_service_backends.rb | 4 +- .../requests/add_instance_group_instances.rb | 4 +- .../requests/add_server_access_config.rb | 4 +- .../requests/add_target_pool_health_checks.rb | 4 +- .../requests/add_target_pool_instances.rb | 4 +- .../compute}/requests/attach_disk.rb | 4 +- .../compute}/requests/create_disk_snapshot.rb | 4 +- .../compute}/requests/delete_address.rb | 4 +- .../requests/delete_backend_service.rb | 4 +- .../compute}/requests/delete_disk.rb | 4 +- .../compute}/requests/delete_firewall.rb | 4 +- .../requests/delete_forwarding_rule.rb | 4 +- .../requests/delete_global_address.rb | 4 +- .../requests/delete_global_forwarding_rule.rb | 4 +- .../requests/delete_global_operation.rb | 4 +- .../requests/delete_http_health_check.rb | 4 +- .../compute}/requests/delete_image.rb | 4 +- .../requests/delete_instance_group.rb | 4 +- .../requests/delete_instance_group_manager.rb | 4 +- .../requests/delete_instance_template.rb | 4 +- .../compute}/requests/delete_network.rb | 4 +- .../requests/delete_region_operation.rb | 4 +- .../compute}/requests/delete_route.rb | 4 +- .../compute}/requests/delete_server.rb | 4 +- .../requests/delete_server_access_config.rb | 4 +- .../compute}/requests/delete_snapshot.rb | 4 +- .../requests/delete_ssl_certificate.rb | 4 +- .../compute}/requests/delete_subnetwork.rb | 4 +- .../requests/delete_target_http_proxy.rb | 4 +- .../requests/delete_target_https_proxy.rb | 4 +- .../requests/delete_target_instance.rb | 4 +- .../compute}/requests/delete_target_pool.rb | 4 +- .../compute}/requests/delete_url_map.rb | 4 +- .../requests/delete_zone_operation.rb | 4 +- .../compute}/requests/deprecate_image.rb | 4 +- .../compute}/requests/detach_disk.rb | 4 +- .../expand_subnetwork_ip_cidr_range.rb | 4 +- .../compute}/requests/get_address.rb | 4 +- .../compute}/requests/get_backend_service.rb | 4 +- .../requests/get_backend_service_health.rb | 4 +- .../compute}/requests/get_disk.rb | 4 +- .../compute}/requests/get_disk_type.rb | 4 +- .../compute}/requests/get_firewall.rb | 4 +- .../compute}/requests/get_forwarding_rule.rb | 4 +- .../compute}/requests/get_global_address.rb | 4 +- .../requests/get_global_forwarding_rule.rb | 4 +- .../compute}/requests/get_global_operation.rb | 4 +- .../requests/get_http_health_check.rb | 4 +- .../compute}/requests/get_image.rb | 4 +- .../requests/get_image_from_family.rb | 4 +- .../compute}/requests/get_instance_group.rb | 4 +- .../requests/get_instance_group_manager.rb | 4 +- .../requests/get_instance_template.rb | 4 +- .../compute}/requests/get_machine_type.rb | 4 +- .../compute}/requests/get_network.rb | 4 +- .../compute}/requests/get_project.rb | 4 +- .../compute}/requests/get_region.rb | 4 +- .../compute}/requests/get_region_operation.rb | 4 +- .../compute}/requests/get_route.rb | 4 +- .../compute}/requests/get_server.rb | 4 +- .../requests/get_server_serial_port_output.rb | 4 +- .../compute}/requests/get_snapshot.rb | 4 +- .../compute}/requests/get_ssl_certificate.rb | 4 +- .../compute}/requests/get_subnetwork.rb | 4 +- .../requests/get_target_http_proxy.rb | 4 +- .../requests/get_target_https_proxy.rb | 4 +- .../compute}/requests/get_target_instance.rb | 4 +- .../compute}/requests/get_target_pool.rb | 4 +- .../requests/get_target_pool_health.rb | 4 +- .../compute}/requests/get_url_map.rb | 4 +- .../compute}/requests/get_zone.rb | 4 +- .../compute}/requests/get_zone_operation.rb | 4 +- .../compute}/requests/insert_address.rb | 4 +- .../requests/insert_backend_service.rb | 4 +- .../compute}/requests/insert_disk.rb | 4 +- .../compute}/requests/insert_firewall.rb | 4 +- .../requests/insert_forwarding_rule.rb | 4 +- .../requests/insert_global_address.rb | 4 +- .../requests/insert_global_forwarding_rule.rb | 4 +- .../requests/insert_http_health_check.rb | 4 +- .../compute}/requests/insert_image.rb | 4 +- .../requests/insert_instance_group.rb | 4 +- .../requests/insert_instance_group_manager.rb | 4 +- .../requests/insert_instance_template.rb | 4 +- .../compute}/requests/insert_network.rb | 4 +- .../compute}/requests/insert_route.rb | 4 +- .../compute}/requests/insert_server.rb | 6 +- .../requests/insert_ssl_certificate.rb | 4 +- .../compute}/requests/insert_subnetwork.rb | 4 +- .../requests/insert_target_http_proxy.rb | 4 +- .../requests/insert_target_https_proxy.rb | 4 +- .../requests/insert_target_instance.rb | 4 +- .../compute}/requests/insert_target_pool.rb | 4 +- .../compute}/requests/insert_url_map.rb | 4 +- .../requests/invalidate_url_map_cache.rb | 4 +- .../compute}/requests/list_addresses.rb | 4 +- .../requests/list_aggregated_addresses.rb | 4 +- .../requests/list_aggregated_disk_types.rb | 4 +- .../requests/list_aggregated_disks.rb | 4 +- .../list_aggregated_forwarding_rules.rb | 4 +- ...list_aggregated_instance_group_managers.rb | 4 +- .../list_aggregated_instance_groups.rb | 4 +- .../requests/list_aggregated_machine_types.rb | 4 +- .../requests/list_aggregated_servers.rb | 4 +- .../requests/list_aggregated_subnetworks.rb | 4 +- .../list_aggregated_target_instances.rb | 4 +- .../requests/list_aggregated_target_pools.rb | 4 +- .../requests/list_backend_services.rb | 4 +- .../compute}/requests/list_disk_types.rb | 4 +- .../compute}/requests/list_disks.rb | 4 +- .../compute}/requests/list_firewalls.rb | 4 +- .../requests/list_forwarding_rules.rb | 4 +- .../requests/list_global_addresses.rb | 4 +- .../requests/list_global_forwarding_rules.rb | 4 +- .../requests/list_global_operations.rb | 4 +- .../requests/list_http_health_checks.rb | 4 +- .../compute}/requests/list_images.rb | 4 +- .../requests/list_instance_group_instances.rb | 4 +- .../requests/list_instance_group_managers.rb | 4 +- .../compute}/requests/list_instance_groups.rb | 4 +- .../requests/list_instance_templates.rb | 4 +- .../compute}/requests/list_machine_types.rb | 4 +- .../compute}/requests/list_networks.rb | 4 +- .../requests/list_region_operations.rb | 4 +- .../compute}/requests/list_regions.rb | 4 +- .../compute}/requests/list_routes.rb | 4 +- .../compute}/requests/list_servers.rb | 4 +- .../compute}/requests/list_snapshots.rb | 4 +- .../requests/list_ssl_certificates.rb | 4 +- .../compute}/requests/list_subnetworks.rb | 4 +- .../requests/list_target_http_proxies.rb | 4 +- .../requests/list_target_https_proxies.rb | 4 +- .../requests/list_target_instances.rb | 4 +- .../compute}/requests/list_target_pools.rb | 4 +- .../compute}/requests/list_url_maps.rb | 4 +- .../compute}/requests/list_zone_operations.rb | 4 +- .../compute}/requests/list_zones.rb | 4 +- .../compute}/requests/patch_firewall.rb | 4 +- .../compute}/requests/patch_url_map.rb | 4 +- .../compute}/requests/recreate_instances.rb | 4 +- .../remove_instance_group_instances.rb | 4 +- .../remove_target_pool_health_checks.rb | 4 +- .../requests/remove_target_pool_instance.rb | 4 +- .../requests/remove_target_pool_instances.rb | 4 +- .../compute}/requests/reset_server.rb | 4 +- .../requests/reset_windows_password.rb | 4 +- .../requests/set_common_instance_metadata.rb | 4 +- .../requests/set_forwarding_rule_target.rb | 4 +- .../set_global_forwarding_rule_target.rb | 4 +- .../requests/set_instance_template.rb | 4 +- .../requests/set_server_disk_auto_delete.rb | 4 +- .../requests/set_server_machine_type.rb | 4 +- .../compute}/requests/set_server_metadata.rb | 4 +- .../requests/set_server_scheduling.rb | 4 +- .../compute}/requests/set_server_tags.rb | 4 +- .../compute}/requests/set_snapshot_labels.rb | 4 +- ...set_subnetwork_private_ip_google_access.rb | 4 +- .../requests/set_target_http_proxy_url_map.rb | 4 +- ...set_target_https_proxy_ssl_certificates.rb | 4 +- .../set_target_https_proxy_url_map.rb | 4 +- .../requests/set_target_pool_backup.rb | 4 +- .../compute}/requests/start_server.rb | 4 +- .../compute}/requests/stop_server.rb | 4 +- .../compute}/requests/update_firewall.rb | 4 +- .../requests/update_http_health_check.rb | 4 +- .../compute}/requests/update_url_map.rb | 4 +- .../compute}/requests/validate_url_map.rb | 4 +- lib/fog/google/shared.rb | 9 ++- .../core_compute/test_client_options.rb | 2 +- .../compute/core_compute/test_disks.rb | 4 +- .../compute/core_compute/test_snapshots.rb | 2 +- .../factories/collection_factory.rb | 4 +- test/integration/test_authentication.rb | 12 +-- test/unit/compute/test_common_collections.rb | 6 +- test/unit/compute/test_common_models.rb | 18 ++--- test/unit/compute/test_disk.rb | 16 ++-- test/unit/compute/test_server.rb | 4 +- test/unit/dns/test_common_collections.rb | 2 +- .../unit/monitoring/test_comon_collections.rb | 2 +- test/unit/pubsub/test_common_collections.rb | 2 +- test/unit/sql/test_common_collections.rb | 2 +- .../storage/test_common_json_collections.rb | 2 +- .../storage/test_common_xml_collections.rb | 6 +- 251 files changed, 703 insertions(+), 705 deletions(-) rename lib/fog/{compute/google.rb => google/compute.rb} (96%) rename lib/fog/{compute/google => google/compute}/mock.rb (99%) rename lib/fog/{compute/google => google/compute}/models/address.rb (91%) rename lib/fog/{compute/google => google/compute}/models/addresses.rb (96%) rename lib/fog/{compute/google => google/compute}/models/backend_service.rb (93%) rename lib/fog/{compute/google => google/compute}/models/backend_services.rb (85%) rename lib/fog/{compute/google => google/compute}/models/disk.rb (96%) rename lib/fog/{compute/google => google/compute}/models/disk_type.rb (95%) rename lib/fog/{compute/google => google/compute}/models/disk_types.rb (95%) rename lib/fog/{compute/google => google/compute}/models/disks.rb (98%) rename lib/fog/{compute/google => google/compute}/models/firewall.rb (90%) rename lib/fog/{compute/google => google/compute}/models/firewalls.rb (91%) rename lib/fog/{compute/google => google/compute}/models/forwarding_rule.rb (93%) rename lib/fog/{compute/google => google/compute}/models/forwarding_rules.rb (94%) rename lib/fog/{compute/google => google/compute}/models/global_address.rb (89%) rename lib/fog/{compute/google => google/compute}/models/global_addresses.rb (94%) rename lib/fog/{compute/google => google/compute}/models/global_forwarding_rule.rb (93%) rename lib/fog/{compute/google => google/compute}/models/global_forwarding_rules.rb (90%) rename lib/fog/{compute/google => google/compute}/models/http_health_check.rb (92%) rename lib/fog/{compute/google => google/compute}/models/http_health_checks.rb (90%) rename lib/fog/{compute/google => google/compute}/models/image.rb (94%) rename lib/fog/{compute/google => google/compute}/models/images.rb (97%) rename lib/fog/{compute/google => google/compute}/models/instance_group.rb (98%) rename lib/fog/{compute/google => google/compute}/models/instance_group_manager.rb (94%) rename lib/fog/{compute/google => google/compute}/models/instance_group_managers.rb (95%) rename lib/fog/{compute/google => google/compute}/models/instance_groups.rb (91%) rename lib/fog/{compute/google => google/compute}/models/instance_template.rb (89%) rename lib/fog/{compute/google => google/compute}/models/instance_templates.rb (90%) rename lib/fog/{compute/google => google/compute}/models/machine_type.rb (95%) rename lib/fog/{compute/google => google/compute}/models/machine_types.rb (95%) rename lib/fog/{compute/google => google/compute}/models/network.rb (93%) rename lib/fog/{compute/google => google/compute}/models/networks.rb (91%) rename lib/fog/{compute/google => google/compute}/models/operation.rb (98%) rename lib/fog/{compute/google => google/compute}/models/operations.rb (95%) rename lib/fog/{compute/google => google/compute}/models/project.rb (88%) rename lib/fog/{compute/google => google/compute}/models/projects.rb (81%) rename lib/fog/{compute/google => google/compute}/models/region.rb (95%) rename lib/fog/{compute/google => google/compute}/models/regions.rb (91%) rename lib/fog/{compute/google => google/compute}/models/route.rb (90%) rename lib/fog/{compute/google => google/compute}/models/routes.rb (91%) rename lib/fog/{compute/google => google/compute}/models/server.rb (95%) rename lib/fog/{compute/google => google/compute}/models/servers.rb (98%) rename lib/fog/{compute/google => google/compute}/models/snapshot.rb (95%) rename lib/fog/{compute/google => google/compute}/models/snapshots.rb (90%) rename lib/fog/{compute/google => google/compute}/models/ssl_certificate.rb (88%) rename lib/fog/{compute/google => google/compute}/models/ssl_certificates.rb (90%) rename lib/fog/{compute/google => google/compute}/models/subnetwork.rb (89%) rename lib/fog/{compute/google => google/compute}/models/subnetworks.rb (95%) rename lib/fog/{compute/google => google/compute}/models/target_http_proxies.rb (90%) rename lib/fog/{compute/google => google/compute}/models/target_http_proxy.rb (89%) rename lib/fog/{compute/google => google/compute}/models/target_https_proxies.rb (90%) rename lib/fog/{compute/google => google/compute}/models/target_https_proxy.rb (89%) rename lib/fog/{compute/google => google/compute}/models/target_instance.rb (91%) rename lib/fog/{compute/google => google/compute}/models/target_instances.rb (95%) rename lib/fog/{compute/google => google/compute}/models/target_pool.rb (93%) rename lib/fog/{compute/google => google/compute}/models/target_pools.rb (95%) rename lib/fog/{compute/google => google/compute}/models/url_map.rb (91%) rename lib/fog/{compute/google => google/compute}/models/url_maps.rb (91%) rename lib/fog/{compute/google => google/compute}/models/zone.rb (93%) rename lib/fog/{compute/google => google/compute}/models/zones.rb (91%) rename lib/fog/{compute/google => google/compute}/real.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/abandon_instances.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/add_backend_service_backends.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/add_instance_group_instances.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/add_server_access_config.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/add_target_pool_health_checks.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/add_target_pool_instances.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/attach_disk.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/create_disk_snapshot.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/delete_address.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/delete_backend_service.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/delete_disk.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/delete_firewall.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/delete_forwarding_rule.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/delete_global_address.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_global_forwarding_rule.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_global_operation.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/delete_http_health_check.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_image.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_instance_group.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_instance_group_manager.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_instance_template.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/delete_network.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/delete_region_operation.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/delete_route.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/delete_server.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_server_access_config.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/delete_snapshot.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/delete_ssl_certificate.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_subnetwork.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/delete_target_http_proxy.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_target_https_proxy.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/delete_target_instance.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/delete_target_pool.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/delete_url_map.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/delete_zone_operation.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/deprecate_image.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/detach_disk.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/expand_subnetwork_ip_cidr_range.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/get_address.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/get_backend_service.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_backend_service_health.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/get_disk.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/get_disk_type.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_firewall.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_forwarding_rule.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_global_address.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_global_forwarding_rule.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_global_operation.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/get_http_health_check.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_image.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_image_from_family.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/get_instance_group.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_instance_group_manager.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_instance_template.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_machine_type.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_network.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_project.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_region.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_region_operation.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/get_route.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/get_server.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_server_serial_port_output.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/get_snapshot.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_ssl_certificate.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_subnetwork.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/get_target_http_proxy.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_target_https_proxy.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/get_target_instance.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_target_pool.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/get_target_pool_health.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/get_url_map.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_zone.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/get_zone_operation.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_address.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/insert_backend_service.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/insert_disk.rb (98%) rename lib/fog/{compute/google => google/compute}/requests/insert_firewall.rb (98%) rename lib/fog/{compute/google => google/compute}/requests/insert_forwarding_rule.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_global_address.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_global_forwarding_rule.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_http_health_check.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/insert_image.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/insert_instance_group.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/insert_instance_group_manager.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/insert_instance_template.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/insert_network.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/insert_route.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/insert_server.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/insert_ssl_certificate.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_subnetwork.rb (98%) rename lib/fog/{compute/google => google/compute}/requests/insert_target_http_proxy.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/insert_target_https_proxy.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/insert_target_instance.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/insert_target_pool.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/insert_url_map.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/invalidate_url_map_cache.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_addresses.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_addresses.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_disk_types.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_disks.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_forwarding_rules.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_instance_group_managers.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_instance_groups.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_machine_types.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_servers.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_subnetworks.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_target_instances.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_aggregated_target_pools.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_backend_services.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_disk_types.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_disks.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_firewalls.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_forwarding_rules.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_global_addresses.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/list_global_forwarding_rules.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_global_operations.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_http_health_checks.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_images.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_instance_group_instances.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/list_instance_group_managers.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_instance_groups.rb (90%) rename lib/fog/{compute/google => google/compute}/requests/list_instance_templates.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_machine_types.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_networks.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_region_operations.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/list_regions.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/list_routes.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_servers.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_snapshots.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_ssl_certificates.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_subnetworks.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/list_target_http_proxies.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_target_https_proxies.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_target_instances.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_target_pools.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_url_maps.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/list_zone_operations.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/list_zones.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/patch_firewall.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/patch_url_map.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/recreate_instances.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/remove_instance_group_instances.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/remove_target_pool_health_checks.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/remove_target_pool_instance.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/remove_target_pool_instances.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/reset_server.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/reset_windows_password.rb (99%) rename lib/fog/{compute/google => google/compute}/requests/set_common_instance_metadata.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_forwarding_rule_target.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_global_forwarding_rule_target.rb (93%) rename lib/fog/{compute/google => google/compute}/requests/set_instance_template.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/set_server_disk_auto_delete.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_server_machine_type.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/set_server_metadata.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/set_server_scheduling.rb (96%) rename lib/fog/{compute/google => google/compute}/requests/set_server_tags.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_snapshot_labels.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_subnetwork_private_ip_google_access.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/set_target_http_proxy_url_map.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_target_https_proxy_ssl_certificates.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_target_https_proxy_url_map.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/set_target_pool_backup.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/start_server.rb (91%) rename lib/fog/{compute/google => google/compute}/requests/stop_server.rb (92%) rename lib/fog/{compute/google => google/compute}/requests/update_firewall.rb (97%) rename lib/fog/{compute/google => google/compute}/requests/update_http_health_check.rb (94%) rename lib/fog/{compute/google => google/compute}/requests/update_url_map.rb (95%) rename lib/fog/{compute/google => google/compute}/requests/validate_url_map.rb (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87df40024..d0a8e5990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html #### Fixed - #609 Fixed missing paging on all models [agrare] -- #608 Fixed `Fog::Compute::Google::Servers#all` paging [agrare] +- #608 Fixed `Fog::Google::Compute::Servers#all` paging [agrare] ### Development changes @@ -323,8 +323,8 @@ Drop travis usage #### Fixed -- \#448 Add `:google_application_default` as recognized argument in - Fog::Compute::Google client [mavin] +- \#448 Add `:google_application_default` as recognized argument in + Fog::Google::Compute client [mavin] ### Development changes @@ -339,14 +339,14 @@ Drop travis usage #### Added - \#442 Add support for Application Default credentials [mavin] - - This change allows the use of Application Default Credentials so that end + - This change allows the use of Application Default Credentials so that end users can authenticate without a service account for development, testing, - and one-off interactions by using `:google_application_default`client + and one-off interactions by using `:google_application_default`client option. See README for more details. ### Fixed -- \#444 Remove deprecated `google_client_email` option from client parameters +- \#444 Remove deprecated `google_client_email` option from client parameters [temikus] - \#446 Updating service parameters to avoid "unrecognised parameter" warnings when initializing Fog client with application default auth [temikus] @@ -371,7 +371,7 @@ Drop travis usage #### Fixed -- \#433 Allow the api to close Tempfiles inline, improving disk utilization. +- \#433 Allow the api to close Tempfiles inline, improving disk utilization. [itopalov] ### Development changes @@ -413,12 +413,12 @@ Drop travis usage - \#419 Locked down fog upstream dependencies to alleviate deprecation warnings until they can be properly dealt with. [temikus] - \#400 Small `%Collection%.get` and `%Collection%.all` behaviour fixes [temikus] - - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid + - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid `sql#instancesList` object. - - `Fog::Compute::Google::InstanceGroups.get` and `.all` methods now support + - `Fog::Google::Compute::InstanceGroups.get` and `.all` methods now support more than just `:filter` option, fixed `.all` output without `zone` option. - Fix a typo causing `Operations.get(region:REGION)` to fail. - - `Fog::Compute::Google::Images.get(IMAGE, PROJECT)`, now returns `nil` if + - `Fog::Google::Compute::Images.get(IMAGE, PROJECT)`, now returns `nil` if image is not found rather than throwing `Google::Apis::ClientError`. ### Development changes @@ -426,13 +426,13 @@ Drop travis usage #### Added - \#400 Additional test coverage [temikus] - - Expanded tests for `%Collection%.get` behavior - scoped requests - (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also + - Expanded tests for `%Collection%.get` behavior - scoped requests + (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also properly tested. - - Increase `Fog::Compute::Google::Images` integration test coverage. + - Increase `Fog::Google::Compute::Images` integration test coverage. - Unit tests now work without a `~/.fog` config file set up. - Expanded unit test coverage. -- \#424 Add simple integration tests to check client proxy options being +- \#424 Add simple integration tests to check client proxy options being applied. #### Changed @@ -449,7 +449,7 @@ Drop travis usage #### Fixed -- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url` +- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url` request ## 1.7.0 @@ -459,17 +459,17 @@ Drop travis usage #### Added - \#409 Support query parameters in `Fog::Storage::Google` GET requests [stanhu] -- \#394 Add some helper methods to `Fog::Compute::Google::Server` [temikus] +- \#394 Add some helper methods to `Fog::Google::Compute::Server` [temikus] - `.private_ip_address` - `.stopped?` - \#375 Add timeout options to `Fog::Storage::GoogleJSON` client [dosuken123] #### Changed -- \#394 `save/update/destroy` and other operations now wait until they are in a - DONE state, instead of !PENDING. This should be a no-op for users but should +- \#394 `save/update/destroy` and other operations now wait until they are in a + DONE state, instead of !PENDING. This should be a no-op for users but should safeguard from issues in the future. [temikus] -- \#383 `Fog::Compute::Google::Address` resources are now created synchronously +- \#383 `Fog::Google::Compute::Address` resources are now created synchronously by default. [temikus] ### Development changes @@ -485,7 +485,7 @@ Drop travis usage - \#376 Add doc coverage tracking. [temikus] - \#383 Increase integration test coverage further. [temikus] - Add collection tests and factories (when mutable) for following resources: - - Addresses + - Addresses - Disks - Projects - Routes @@ -509,23 +509,23 @@ Drop travis usage #### Changed -- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default. +- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default. You can override it in a standard manner by passing a parameter to async method, e.g.: `Fog::Google::SQL::Instance.create(true)` [temikus] -- \#367 `Fog::Compute::Google::Server.bootstrap` changes [temikus] +- \#367 `Fog::Google::Compute::Server.bootstrap` changes [temikus] - Now creates instances with disks that automatically delete on instance shutdown. - Now creates instances with a public IP address by default. #### Added -- \#361 `Fog::Compute::Google::Server` now recognises `network_ip` attribute to specify internal IP. [mattimatti] +- \#361 `Fog::Google::Compute::Server` now recognises `network_ip` attribute to specify internal IP. [mattimatti] #### Fixed - \#338 Fixed SQL Users model workflow [temikus] - \#359 Fix whitespace escaping in XML Storage methods [temikus] - \#366 Fixing `Server` model to properly accept `:private_key_path` and `:public_key_path` attributes again. [temikus] -- \#367 `Fog::Compute::Google::Server.bootstrap` parameters are now properly merged with default ones. [tesmikus] +- \#367 `Fog::Google::Compute::Server.bootstrap` parameters are now properly merged with default ones. [tesmikus] ### Development changes @@ -544,7 +544,7 @@ You can override it in a standard manner by passing a parameter to async method, - \#348 Added Instance Group Manager and Instance Templates [bpaquet] - - `Fog::Compute::Google::InstanceGroupManager` model and associated requests: + - `Fog::Google::Compute::InstanceGroupManager` model and associated requests: - `:get_instance_group_manager` - `:insert_instance_group_manager` - `:delete_instance_group_manager` @@ -553,7 +553,7 @@ You can override it in a standard manner by passing a parameter to async method, - `:recreate_instances` - `:abandon_instances` - - `Fog::Compute::Google::InstanceTemplate` model and associated requests: + - `Fog::Google::Compute::InstanceTemplate` model and associated requests: - `:list_instance_templates` - `:get_instance_template` - `:insert_instance_template` @@ -577,31 +577,31 @@ You can override it in a standard manner by passing a parameter to async method, #### Added -- \#336 `Fog::Compute::Google::Server.set_metadata` is now working properly and adopted a simpler format, e.g. `{'foo' => 'bar', 'baz'=>'foo'}` -- \#334 Added a new helper method: `Fog::Compute::Google::Server.public_ip_address` [temikus] -- \#314 Added `Fog::Compute::Google::InstanceGroup.add_instance` method back [temikus] +- \#336 `Fog::Google::Compute::Server.set_metadata` is now working properly and adopted a simpler format, e.g. `{'foo' => 'bar', 'baz'=>'foo'}` +- \#334 Added a new helper method: `Fog::Google::Compute::Server.public_ip_address` [temikus] +- \#314 Added `Fog::Google::Compute::InstanceGroup.add_instance` method back [temikus] - \#326 Added support for using predefined ACLs, refactor valid ACLs [vimutter] - \#318 Added fog_public support in Storage JSON API [jayhsu21] #### Fixed -- \#354 Bump Google API client to 0.23 [temikus] -- \#346 Fixed get_health when called with an instance name [bpaquet] -- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] -- \#321 Fix string key instead of symbol for subnetworks listing [tumido] -- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter] +- \#354 Bump Google API client to 0.23 [temikus] +- \#346 Fixed get_health when called with an instance name [bpaquet] +- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] +- \#321 Fix string key instead of symbol for subnetworks listing [tumido] +- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter] ### Development changes #### Added -- \#353 Added collection/model unit tests to be run by Travis CI [temikus] -- \#347 Added target pool tests [temikus] +- \#353 Added collection/model unit tests to be run by Travis CI [temikus] +- \#347 Added target pool tests [temikus] #### Fixed - \#322 Fixed all broken integration tests, all tests now pass in CI [temikus] -- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus] +- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus] ## 1.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f5a195cae..9927f8c5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,9 @@ # Getting Involved -New contributors are always welcome, and when in doubt please ask questions! +New contributors are always welcome, and when in doubt please ask questions! We strive to be an open and welcoming community. Please be nice to one another. -We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md) +We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md) and having a look around as well. It has information and context about the state of the `fog` project as a whole. ### Coding @@ -62,7 +62,7 @@ $ rake console ### Documentation Code should be documented using [YARDoc](https://yardoc.org/) syntax. -We use [inch](https://github.com/rrrene/inch) to keep track of overall doc +We use [inch](https://github.com/rrrene/inch) to keep track of overall doc coverage and [inch-ci](https://inch-ci.org/) to keep track of changes over time. You can view a doc coverage report by running: @@ -72,19 +72,19 @@ $ inch Or view suggestions on a specific method: ``` -$ inch show Fog::Compute::Google::Server#set_metadata +$ inch show Fog::Google::Compute::Server#set_metadata ``` ### Testing -This module is tested with [Minitest](https://github.com/seattlerb/minitest). +This module is tested with [Minitest](https://github.com/seattlerb/minitest). #### Integration tests -Live integration tests can be found in `test/integration/`. +Live integration tests can be found in `test/integration/`. Most of the library functionality is currently covered with them. To simplify things for contributors we have a -CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label +CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label that anyone in `fog-google` team can set. Read [CI section](https://github.com/fog/fog-google/blob/master/CONTRIBUTING.md#continuous-integration) for more info. @@ -137,7 +137,7 @@ We're in progress of extending the library with more unit tests and contribution #### The transition from `shindo` to Minitest -Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework. +Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework. We've moved away from it, and to Minitest, but some artifacts may remain. For more information on transition, read [#50](https://github.com/fog/fog-google/issues/50). @@ -158,10 +158,10 @@ and contains the standard tests to run for all resources, (e.g. `test_lifecycle` It also calls `cleanup` on the resource's factory during teardown, to make sure that resources are getting destroyed before the next test run. - The **factory**, (e.g. `ServersFactory`, in `test/integration/factories/servers_factory.rb`,) -automates the creation of resources and/or supplies parameters for explicit +automates the creation of resources and/or supplies parameters for explicit creation of resources. For example, `ServersFactory` initializes a `DisksFactory` to supply disks in order to create servers, and implements the `params` method -so that tests can create servers with unique names, correct zones and machine +so that tests can create servers with unique names, correct zones and machine types, and automatically-created disks. `ServersFactory` inherits the `create` method from `CollectionFactory`, which allows tests to create servers on-demand. - The **main test**, (e.g. `TestServers`, in `test/integration/compute/test_servers.rb`,) @@ -170,6 +170,6 @@ method from `CollectionFactory`, which allows tests to create servers on-demand. it initializes a `ServersFactory`, and it includes any other tests specific to this collection, (e.g. `test_bootstrap_ssh_destroy`). -If you want to create another resource, you should add live integration tests; +If you want to create another resource, you should add live integration tests; all you need to do is create a factory in `test/integration/factories/my_resource_factory.rb` and a main test in `test/integration/compute/test_my_resource.rb` that mixes in `TestCollection`. diff --git a/README.md b/README.md index c751bd680..b88303f50 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ There are two ways to access [Google Cloud Storage](https://cloud.google.com/sto Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1](https://cloud.google.com/compute/docs/reference/v1/) of the GCE API. -As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Compute::Google`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like. +As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Google::Compute`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like. ## SQL @@ -112,10 +112,10 @@ Example workflow for a GCE instance with [service account scopes](https://cloud. defined: ``` -> connection = Fog::Compute::Google.new(:google_project => "my-project", :google_application_default => true) -=> # connection = Fog::Google::Compute.new(:google_project => "my-project", :google_application_default => true) +=> # connection.servers -=> [ [ require 'fog/google' => true -[2] pry(main)> connection = Fog::Compute::Google.new +[2] pry(main)> connection = Fog::Google::Compute.new [3] pry(main)> connection.servers -=> [ [ device_name, :source => "https://www.googleapis.com/compute/v1/projects/#{PROJECT}/zones/#{ZONE}/disks/#{attached_disk.name}" @@ -58,13 +58,13 @@ def example raise "Could not attach second disk" unless connection.attach_disk(server.name, ZONE, config_hash) p "Waiting for disk to be attached" - attached_disk.wait_for { ! users.nil? && users != []} + attached_disk.wait_for { !users.nil? && users != [] } p "Detach second disk" raise "Could not detach second disk" unless connection.detach_disk(server.name, ZONE, device_name) p "Waiting for second disk to be detached" - attached_disk.wait_for { users.nil? || users == []} + attached_disk.wait_for { users.nil? || users == [] } p "Deleting server" raise "Could not delete server." unless server.destroy @@ -74,9 +74,8 @@ def example p "Waiting for second disk to be destroyed" begin - rc = attached_disk.wait_for { status.nil? || status == 'DELETING' } - - rescue => e + rc = attached_disk.wait_for { status.nil? || status == "DELETING" } + rescue StandardError => e if e.message !~ /not found/ && e.message !~ /notFound/ raise e end diff --git a/lib/fog/bin/google.rb b/lib/fog/bin/google.rb index 5c2b47513..e520f4375 100644 --- a/lib/fog/bin/google.rb +++ b/lib/fog/bin/google.rb @@ -4,7 +4,7 @@ class << self def class_for(key) case key when :compute - Fog::Compute::Google + Fog::Google::Compute when :dns Fog::DNS::Google when :monitoring @@ -24,25 +24,25 @@ def class_for(key) def [](service) @@connections ||= Hash.new do |hash, key| - hash[key] = case key - when :compute - Fog::Logger.warning("Google[:compute] is not recommended, use Compute[:google] for portability") - Fog::Compute.new(:provider => "Google") - when :dns - Fog::Logger.warning("Google[:dns] is not recommended, use DNS[:google] for portability") - Fog::DNS.new(:provider => "Google") - when :monitoring - Fog::Google::Monitoring.new - when :sql - Fog::Google::SQL.new - when :pubsub - Fog::Google::Pubsub.new - when :storage - Fog::Logger.warning("Google[:storage] is not recommended, use Storage[:google] for portability") - Fog::Storage.new(:provider => "Google") - else - raise ArgumentError, "Unrecognized service: #{key.inspect}" - end + case key + when :compute + Fog::Logger.warning("Google[:compute] is not recommended, use Compute[:google] for portability") + hash[key] = Fog::Compute.new(:provider => "Google") + when :dns + Fog::Logger.warning("Google[:dns] is not recommended, use DNS[:google] for portability") + hash[key] = Fog::DNS.new(:provider => "Google") + when :monitoring + hash[key] = Fog::Google::Monitoring.new + when :sql + hash[key] = Fog::Google::SQL.new + when :pubsub + hash[key] = Fog::Google::Pubsub.new + when :storage + Fog::Logger.warning("Google[:storage] is not recommended, use Storage[:google] for portability") + hash[key] = Fog::Storage.new(:provider => "Google") + else + hash[key] = raise ArgumentError, "Unrecognized service: #{key.inspect}" + end end @@connections[service] end @@ -74,7 +74,7 @@ def available? rescue ArgumentError => e Fog::Logger.warning(e.message) availability = false - rescue => e + rescue StandardError => e availability = false end end @@ -83,7 +83,8 @@ def available? services.each do |service| class_for(service).collections.each do |collection| next if respond_to?(collection) - class_eval <<-EOS, __FILE__, __LINE__ + + class_eval <<-EOS, __FILE__, __LINE__ + 1 def self.#{collection} self[:#{service}].#{collection} end diff --git a/lib/fog/google.rb b/lib/fog/google.rb index 3281ee1b3..cc966e78b 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -4,15 +4,12 @@ require "fog/google/version" module Fog - module Compute - autoload :Google, File.expand_path("../compute/google", __FILE__) - end - module DNS autoload :Google, File.expand_path("../dns/google", __FILE__) end module Google + autoload :Compute, File.expand_path("../google/compute", __FILE__) autoload :Mock, File.expand_path("../google/mock", __FILE__) autoload :Monitoring, File.expand_path("../google/monitoring", __FILE__) autoload :Pubsub, File.expand_path("../google/pubsub", __FILE__) diff --git a/lib/fog/compute/google.rb b/lib/fog/google/compute.rb similarity index 96% rename from lib/fog/compute/google.rb rename to lib/fog/google/compute.rb index dc685f419..672023f52 100644 --- a/lib/fog/compute/google.rb +++ b/lib/fog/google/compute.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google < Fog::Service - autoload :Mock, File.expand_path("../google/mock", __FILE__) - autoload :Real, File.expand_path("../google/real", __FILE__) + module Google + class Compute < Fog::Service + autoload :Mock, 'fog/google/compute/mock' + autoload :Real, 'fog/google/compute/real' requires :google_project recognizes( @@ -28,7 +28,7 @@ class Google < Fog::Service https://www.googleapis.com/auth/cloud-platform).freeze GOOGLE_COMPUTE_DEFAULT_NETWORK = "default".freeze - request_path "fog/compute/google/requests" + request_path "fog/google/compute/requests" request :add_backend_service_backends request :add_instance_group_instances request :add_server_access_config @@ -212,7 +212,7 @@ class Google < Fog::Service request :reset_windows_password - model_path "fog/compute/google/models" + model_path "fog/google/compute/models" model :server collection :servers diff --git a/lib/fog/compute/google/mock.rb b/lib/fog/google/compute/mock.rb similarity index 99% rename from lib/fog/compute/google/mock.rb rename to lib/fog/google/compute/mock.rb index adf17ec11..a6e8e9686 100644 --- a/lib/fog/compute/google/mock.rb +++ b/lib/fog/google/compute/mock.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock include Fog::Google::Shared attr_reader :extra_global_projects, :exclude_projects diff --git a/lib/fog/compute/google/models/address.rb b/lib/fog/google/compute/models/address.rb similarity index 91% rename from lib/fog/compute/google/models/address.rb rename to lib/fog/google/compute/models/address.rb index f86ef41a4..9a2b802cc 100644 --- a/lib/fog/compute/google/models/address.rb +++ b/lib/fog/google/compute/models/address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents an Address resource # @@ -37,7 +37,7 @@ def save requires :identity, :region data = service.insert_address(identity, region, attributes) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(service: service) .get(data.name, nil, data.region) operation.wait_for { ready? } @@ -48,7 +48,7 @@ def destroy(async = true) requires :identity, :region data = service.delete_address(identity, region.split("/")[-1]) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) @@ -81,14 +81,14 @@ def ready? # standard primary nic - "nic0" # @param [Boolean] async - whether to run the operation asynchronously # - # @return [Fog::Compute::Google::Operation] + # @return [Fog::Google::Compute::Operation] def associate(server, nic_name = "nic0", async = false) requires :address data = service.add_server_access_config( server.name, server.zone, nic_name, :nat_ip => address ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -98,7 +98,7 @@ def associate(server, nic_name = "nic0", async = false) # # @param [Boolean] async - whether to run the operation asynchronously # - # @return [Fog::Compute::Google::Operation] + # @return [Fog::Google::Compute::Operation] def disassociate(async = false) requires :address @@ -120,7 +120,7 @@ def disassociate(async = false) data = service.delete_server_access_config( server.name, server.zone, nic[:name], access_config[:name] ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async diff --git a/lib/fog/compute/google/models/addresses.rb b/lib/fog/google/compute/models/addresses.rb similarity index 96% rename from lib/fog/compute/google/models/addresses.rb rename to lib/fog/google/compute/models/addresses.rb index 69f66f0a1..0aa6c1a45 100644 --- a/lib/fog/compute/google/models/addresses.rb +++ b/lib/fog/google/compute/models/addresses.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Addresses < Fog::Collection - model Fog::Compute::Google::Address + model Fog::Google::Compute::Address def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) opts = { diff --git a/lib/fog/compute/google/models/backend_service.rb b/lib/fog/google/compute/models/backend_service.rb similarity index 93% rename from lib/fog/compute/google/models/backend_service.rb rename to lib/fog/google/compute/models/backend_service.rb index d1b0e9440..4a8b5da71 100644 --- a/lib/fog/compute/google/models/backend_service.rb +++ b/lib/fog/google/compute/models/backend_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class BackendService < Fog::Model identity :name @@ -30,7 +30,7 @@ def save } data = service.insert_backend_service(name, **options) - operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name) + operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name) operation.wait_for { ready? } reload end @@ -39,7 +39,7 @@ def destroy(async = true) requires :name data = service.delete_backend_service(name) - operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name) + operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name) operation.wait_for { ready? } unless async operation end diff --git a/lib/fog/compute/google/models/backend_services.rb b/lib/fog/google/compute/models/backend_services.rb similarity index 85% rename from lib/fog/compute/google/models/backend_services.rb rename to lib/fog/google/compute/models/backend_services.rb index 5e7d7d133..88a659309 100644 --- a/lib/fog/compute/google/models/backend_services.rb +++ b/lib/fog/google/compute/models/backend_services.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class BackendServices < Fog::Collection - model Fog::Compute::Google::BackendService + model Fog::Google::Compute::BackendService def all(_filters = {}) data = service.list_backend_services.items || [] diff --git a/lib/fog/compute/google/models/disk.rb b/lib/fog/google/compute/models/disk.rb similarity index 96% rename from lib/fog/compute/google/models/disk.rb rename to lib/fog/google/compute/models/disk.rb index 993efa1c2..90e74b866 100644 --- a/lib/fog/compute/google/models/disk.rb +++ b/lib/fog/google/compute/models/disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Disk < Fog::Model identity :name @@ -52,7 +52,7 @@ def save # Request needs backward compatibility so source image is specified in # method arguments data = service.insert_disk(name, zone, options[:source_image], **options) - operation = Fog::Compute::Google::Operations.new(service: service) + operation = Fog::Google::Compute::Operations.new(service: service) .get(data.name, data.zone) operation.wait_for { ready? } reload @@ -62,7 +62,7 @@ def destroy(async = true) requires :name, :zone data = service.delete_disk(name, zone_name) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async operation @@ -142,7 +142,7 @@ def create_snapshot(snapshot_name, snapshot = {}) raise ArgumentError, "Invalid snapshot name" unless snapshot_name data = service.create_disk_snapshot(snapshot_name, name, zone_name, snapshot) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } service.snapshots.get(snapshot_name) diff --git a/lib/fog/compute/google/models/disk_type.rb b/lib/fog/google/compute/models/disk_type.rb similarity index 95% rename from lib/fog/compute/google/models/disk_type.rb rename to lib/fog/google/compute/models/disk_type.rb index 6502e5d63..97dafd843 100644 --- a/lib/fog/compute/google/models/disk_type.rb +++ b/lib/fog/google/compute/models/disk_type.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class DiskType < Fog::Model identity :name diff --git a/lib/fog/compute/google/models/disk_types.rb b/lib/fog/google/compute/models/disk_types.rb similarity index 95% rename from lib/fog/compute/google/models/disk_types.rb rename to lib/fog/google/compute/models/disk_types.rb index e2ac936bf..294617cf4 100644 --- a/lib/fog/compute/google/models/disk_types.rb +++ b/lib/fog/google/compute/models/disk_types.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class DiskTypes < Fog::Collection - model Fog::Compute::Google::DiskType + model Fog::Google::Compute::DiskType def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/disks.rb b/lib/fog/google/compute/models/disks.rb similarity index 98% rename from lib/fog/compute/google/models/disks.rb rename to lib/fog/google/compute/models/disks.rb index 074e7165f..6a108d998 100644 --- a/lib/fog/compute/google/models/disks.rb +++ b/lib/fog/google/compute/models/disks.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Disks < Fog::Collection - model Fog::Compute::Google::Disk + model Fog::Google::Compute::Disk def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/firewall.rb b/lib/fog/google/compute/models/firewall.rb similarity index 90% rename from lib/fog/compute/google/models/firewall.rb rename to lib/fog/google/compute/models/firewall.rb index eea194b2e..8d08f62f9 100644 --- a/lib/fog/compute/google/models/firewall.rb +++ b/lib/fog/google/compute/models/firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Firewall resource # @@ -53,7 +53,7 @@ def save def create data = service.insert_firewall(identity, attributes) - operation = Fog::Compute::Google::Operations.new(service: service) + operation = Fog::Google::Compute::Operations.new(service: service) .get(data.name) operation.wait_for { ready? } reload @@ -63,7 +63,7 @@ def update requires :identity, :allowed, :network data = service.update_firewall(identity, attributes) - operation = Fog::Compute::Google::Operations.new(service: service) + operation = Fog::Google::Compute::Operations.new(service: service) .get(data.name) operation.wait_for { ready? } reload @@ -73,7 +73,7 @@ def patch(diff = {}) requires :identity data = service.patch_firewall(identity, diff) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -83,7 +83,7 @@ def destroy(async = true) requires :identity data = service.delete_firewall(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/firewalls.rb b/lib/fog/google/compute/models/firewalls.rb similarity index 91% rename from lib/fog/compute/google/models/firewalls.rb rename to lib/fog/google/compute/models/firewalls.rb index c5cd850df..306276952 100644 --- a/lib/fog/compute/google/models/firewalls.rb +++ b/lib/fog/google/compute/models/firewalls.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Firewalls < Fog::Collection - model Fog::Compute::Google::Firewall + model Fog::Google::Compute::Firewall def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/forwarding_rule.rb b/lib/fog/google/compute/models/forwarding_rule.rb similarity index 93% rename from lib/fog/compute/google/models/forwarding_rule.rb rename to lib/fog/google/compute/models/forwarding_rule.rb index 83a150dca..2a0c97653 100644 --- a/lib/fog/compute/google/models/forwarding_rule.rb +++ b/lib/fog/google/compute/models/forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class ForwardingRule < Fog::Model identity :name @@ -25,7 +25,7 @@ def save requires :identity, :region data = service.insert_forwarding_rule(identity, region, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } reload @@ -45,7 +45,7 @@ def set_target(new_target) def destroy(async = true) requires :identity, :region data = service.delete_forwarding_rule(identity, region) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/forwarding_rules.rb b/lib/fog/google/compute/models/forwarding_rules.rb similarity index 94% rename from lib/fog/compute/google/models/forwarding_rules.rb rename to lib/fog/google/compute/models/forwarding_rules.rb index b53f807bd..8868cdd26 100644 --- a/lib/fog/compute/google/models/forwarding_rules.rb +++ b/lib/fog/google/compute/models/forwarding_rules.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class ForwardingRules < Fog::Collection - model Fog::Compute::Google::ForwardingRule + model Fog::Google::Compute::ForwardingRule def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) opts = { diff --git a/lib/fog/compute/google/models/global_address.rb b/lib/fog/google/compute/models/global_address.rb similarity index 89% rename from lib/fog/compute/google/models/global_address.rb rename to lib/fog/google/compute/models/global_address.rb index 136fc0b44..3957b3090 100644 --- a/lib/fog/compute/google/models/global_address.rb +++ b/lib/fog/google/compute/models/global_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents an Address resource # @@ -25,7 +25,7 @@ def save requires :identity data = service.insert_global_address(identity, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -35,7 +35,7 @@ def destroy(async = true) requires :identity data = service.delete_global_address(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/global_addresses.rb b/lib/fog/google/compute/models/global_addresses.rb similarity index 94% rename from lib/fog/compute/google/models/global_addresses.rb rename to lib/fog/google/compute/models/global_addresses.rb index 29ab993ef..c0f2199e4 100644 --- a/lib/fog/compute/google/models/global_addresses.rb +++ b/lib/fog/google/compute/models/global_addresses.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class GlobalAddresses < Fog::Collection - model Fog::Compute::Google::GlobalAddress + model Fog::Google::Compute::GlobalAddress def all(options = {}) items = [] diff --git a/lib/fog/compute/google/models/global_forwarding_rule.rb b/lib/fog/google/compute/models/global_forwarding_rule.rb similarity index 93% rename from lib/fog/compute/google/models/global_forwarding_rule.rb rename to lib/fog/google/compute/models/global_forwarding_rule.rb index 75468015b..9b7a2f876 100644 --- a/lib/fog/compute/google/models/global_forwarding_rule.rb +++ b/lib/fog/google/compute/models/global_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class GlobalForwardingRule < Fog::Model identity :name @@ -25,7 +25,7 @@ def save requires :identity data = service.insert_global_forwarding_rule(identity, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } reload @@ -34,7 +34,7 @@ def save def destroy(async = true) requires :identity data = service.delete_global_forwarding_rule(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/global_forwarding_rules.rb b/lib/fog/google/compute/models/global_forwarding_rules.rb similarity index 90% rename from lib/fog/compute/google/models/global_forwarding_rules.rb rename to lib/fog/google/compute/models/global_forwarding_rules.rb index 46fe5f9a6..d6842f6a8 100644 --- a/lib/fog/compute/google/models/global_forwarding_rules.rb +++ b/lib/fog/google/compute/models/global_forwarding_rules.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class GlobalForwardingRules < Fog::Collection - model Fog::Compute::Google::GlobalForwardingRule + model Fog::Google::Compute::GlobalForwardingRule def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/http_health_check.rb b/lib/fog/google/compute/models/http_health_check.rb similarity index 92% rename from lib/fog/compute/google/models/http_health_check.rb rename to lib/fog/google/compute/models/http_health_check.rb index 429950657..a2568212f 100644 --- a/lib/fog/compute/google/models/http_health_check.rb +++ b/lib/fog/google/compute/models/http_health_check.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class HttpHealthCheck < Fog::Model identity :name @@ -51,7 +51,7 @@ def create(opts) requires :name data = service.insert_http_health_check(name, opts) - operation = Fog::Compute::Google::Operations.new(service: service) + operation = Fog::Google::Compute::Operations.new(service: service) .get(data.name, data.zone) operation.wait_for { ready? } reload @@ -60,7 +60,7 @@ def create(opts) def update(opts) requires :name data = service.update_http_health_check(name, opts) - operation = Fog::Compute::Google::Operations.new(service: service) + operation = Fog::Google::Compute::Operations.new(service: service) .get(data.name, data.zone) operation.wait_for { ready? } reload @@ -69,7 +69,7 @@ def update(opts) def destroy(async = true) requires :name data = service.delete_http_health_check(name) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/http_health_checks.rb b/lib/fog/google/compute/models/http_health_checks.rb similarity index 90% rename from lib/fog/compute/google/models/http_health_checks.rb rename to lib/fog/google/compute/models/http_health_checks.rb index eb373b785..abdf10b73 100644 --- a/lib/fog/compute/google/models/http_health_checks.rb +++ b/lib/fog/google/compute/models/http_health_checks.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class HttpHealthChecks < Fog::Collection - model Fog::Compute::Google::HttpHealthCheck + model Fog::Google::Compute::HttpHealthCheck def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/image.rb b/lib/fog/google/compute/models/image.rb similarity index 94% rename from lib/fog/compute/google/models/image.rb rename to lib/fog/google/compute/models/image.rb index 221beac25..d27ef7037 100644 --- a/lib/fog/compute/google/models/image.rb +++ b/lib/fog/google/compute/models/image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Image < Fog::Model identity :name @@ -49,7 +49,7 @@ def ready? def destroy(async = true) data = service.delete_image(name) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation @@ -66,7 +66,7 @@ def save requires :name data = service.insert_image(name, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload diff --git a/lib/fog/compute/google/models/images.rb b/lib/fog/google/compute/models/images.rb similarity index 97% rename from lib/fog/compute/google/models/images.rb rename to lib/fog/google/compute/models/images.rb index 9f72d21e8..4789eedae 100644 --- a/lib/fog/compute/google/models/images.rb +++ b/lib/fog/google/compute/models/images.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Images < Fog::Collection - model Fog::Compute::Google::Image + model Fog::Google::Compute::Image # NOTE: some of these operating systems are premium and users will be # charged a license fee beyond the base Google Compute Engine VM diff --git a/lib/fog/compute/google/models/instance_group.rb b/lib/fog/google/compute/models/instance_group.rb similarity index 98% rename from lib/fog/compute/google/models/instance_group.rb rename to lib/fog/google/compute/models/instance_group.rb index 4434097ff..854b0e1ef 100644 --- a/lib/fog/compute/google/models/instance_group.rb +++ b/lib/fog/google/compute/models/instance_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceGroup < Fog::Model identity :name diff --git a/lib/fog/compute/google/models/instance_group_manager.rb b/lib/fog/google/compute/models/instance_group_manager.rb similarity index 94% rename from lib/fog/compute/google/models/instance_group_manager.rb rename to lib/fog/google/compute/models/instance_group_manager.rb index 7bb0baa7b..8ff284328 100644 --- a/lib/fog/compute/google/models/instance_group_manager.rb +++ b/lib/fog/google/compute/models/instance_group_manager.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceGroupManager < Fog::Model identity :name @@ -22,7 +22,7 @@ def save data = service.insert_instance_group_manager(name, zone.split("/")[-1], instance_template, base_instance_name, target_size, target_pools, named_ports, description) - operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name, zone.split("/")[-1]) + operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name, zone.split("/")[-1]) operation.wait_for { ready? } reload end diff --git a/lib/fog/compute/google/models/instance_group_managers.rb b/lib/fog/google/compute/models/instance_group_managers.rb similarity index 95% rename from lib/fog/compute/google/models/instance_group_managers.rb rename to lib/fog/google/compute/models/instance_group_managers.rb index 833357f8b..be9951beb 100644 --- a/lib/fog/compute/google/models/instance_group_managers.rb +++ b/lib/fog/google/compute/models/instance_group_managers.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceGroupManagers < Fog::Collection - model Fog::Compute::Google::InstanceGroupManager + model Fog::Google::Compute::InstanceGroupManager def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/instance_groups.rb b/lib/fog/google/compute/models/instance_groups.rb similarity index 91% rename from lib/fog/compute/google/models/instance_groups.rb rename to lib/fog/google/compute/models/instance_groups.rb index cdb3a34dc..5abdf8751 100644 --- a/lib/fog/compute/google/models/instance_groups.rb +++ b/lib/fog/google/compute/models/instance_groups.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceGroups < Fog::Collection - model Fog::Compute::Google::InstanceGroup + model Fog::Google::Compute::InstanceGroup def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) opts = { @@ -51,7 +51,7 @@ def get(identity, zone = nil) # TODO(2.0): To be deprecated def add_instance(params) Fog::Logger.deprecation( - "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]" + "#{self.class}.#{__method__} is deprecated, use Fog::Google::Compute::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]" ) params[:instance] = [params[:instance]] unless params[:instance] == Array service.add_instance_group_instances(params[:group], params[:zone], params[:instance]) @@ -60,7 +60,7 @@ def add_instance(params) # TODO(2.0): To be deprecated def remove_instance(params) Fog::Logger.deprecation( - "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]" + "#{self.class}.#{__method__} is deprecated, use Fog::Google::Compute::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]" ) params[:instance] = [params[:instance]] unless params[:instance] == Array service.remove_instance_group_instances(params[:group], params[:zone], params[:instance]) diff --git a/lib/fog/compute/google/models/instance_template.rb b/lib/fog/google/compute/models/instance_template.rb similarity index 89% rename from lib/fog/compute/google/models/instance_template.rb rename to lib/fog/google/compute/models/instance_template.rb index e947a5404..15ac0244b 100644 --- a/lib/fog/compute/google/models/instance_template.rb +++ b/lib/fog/google/compute/models/instance_template.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceTemplate < Fog::Model identity :name @@ -29,7 +29,7 @@ def save requires :properties data = service.insert_instance_template(name, properties, description) - operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name) + operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name) operation.wait_for { ready? } reload end @@ -37,7 +37,7 @@ def save def destroy(async = true) requires :name data = service.delete_instance_template(name) - operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name) + operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name) operation.wait_for { ready? } unless async operation end diff --git a/lib/fog/compute/google/models/instance_templates.rb b/lib/fog/google/compute/models/instance_templates.rb similarity index 90% rename from lib/fog/compute/google/models/instance_templates.rb rename to lib/fog/google/compute/models/instance_templates.rb index 584424646..a3c2e6dc6 100644 --- a/lib/fog/compute/google/models/instance_templates.rb +++ b/lib/fog/google/compute/models/instance_templates.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class InstanceTemplates < Fog::Collection - model Fog::Compute::Google::InstanceTemplate + model Fog::Google::Compute::InstanceTemplate def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/machine_type.rb b/lib/fog/google/compute/models/machine_type.rb similarity index 95% rename from lib/fog/compute/google/models/machine_type.rb rename to lib/fog/google/compute/models/machine_type.rb index 91be25ffb..3fea4ba71 100644 --- a/lib/fog/compute/google/models/machine_type.rb +++ b/lib/fog/google/compute/models/machine_type.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class MachineType < Fog::Model identity :name diff --git a/lib/fog/compute/google/models/machine_types.rb b/lib/fog/google/compute/models/machine_types.rb similarity index 95% rename from lib/fog/compute/google/models/machine_types.rb rename to lib/fog/google/compute/models/machine_types.rb index 38d79a7a1..7ab0f2342 100644 --- a/lib/fog/compute/google/models/machine_types.rb +++ b/lib/fog/google/compute/models/machine_types.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class MachineTypes < Fog::Collection - model Fog::Compute::Google::MachineType + model Fog::Google::Compute::MachineType def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) opts = { diff --git a/lib/fog/compute/google/models/network.rb b/lib/fog/google/compute/models/network.rb similarity index 93% rename from lib/fog/compute/google/models/network.rb rename to lib/fog/google/compute/models/network.rb index 36f500a3d..f824f6ceb 100644 --- a/lib/fog/compute/google/models/network.rb +++ b/lib/fog/google/compute/models/network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Network resource # @@ -30,7 +30,7 @@ def save requires :identity data = service.insert_network(identity, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) # Since network has no "state" we can query, we have to wait for the operation to finish # TODO: change back to async when there's a proper state API @@ -42,7 +42,7 @@ def destroy(async = true) requires :identity data = service.delete_network(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/networks.rb b/lib/fog/google/compute/models/networks.rb similarity index 91% rename from lib/fog/compute/google/models/networks.rb rename to lib/fog/google/compute/models/networks.rb index d0a2b8d80..6ed5ee993 100644 --- a/lib/fog/compute/google/models/networks.rb +++ b/lib/fog/google/compute/models/networks.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Networks < Fog::Collection - model Fog::Compute::Google::Network + model Fog::Google::Compute::Network def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/operation.rb b/lib/fog/google/compute/models/operation.rb similarity index 98% rename from lib/fog/compute/google/models/operation.rb rename to lib/fog/google/compute/models/operation.rb index 8c4691762..3dda4adac 100644 --- a/lib/fog/compute/google/models/operation.rb +++ b/lib/fog/google/compute/models/operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Operation < Fog::Model identity :name diff --git a/lib/fog/compute/google/models/operations.rb b/lib/fog/google/compute/models/operations.rb similarity index 95% rename from lib/fog/compute/google/models/operations.rb rename to lib/fog/google/compute/models/operations.rb index 4677c367e..f01a0185a 100644 --- a/lib/fog/compute/google/models/operations.rb +++ b/lib/fog/google/compute/models/operations.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Operations < Fog::Collection - model Fog::Compute::Google::Operation + model Fog::Google::Compute::Operation def all(zone: nil, region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/project.rb b/lib/fog/google/compute/models/project.rb similarity index 88% rename from lib/fog/compute/google/models/project.rb rename to lib/fog/google/compute/models/project.rb index 9767ac9d9..bb0d3e739 100644 --- a/lib/fog/compute/google/models/project.rb +++ b/lib/fog/google/compute/models/project.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Project resource # @@ -20,7 +20,7 @@ def set_metadata(metadata = {}) requires :identity operation = service.set_common_instance_metadata(identity, common_instance_metadata["fingerprint"], metadata) - Fog::Compute::Google::Operations.new(:service => service).get(operation.id) + Fog::Google::Compute::Operations.new(:service => service).get(operation.id) end end end diff --git a/lib/fog/compute/google/models/projects.rb b/lib/fog/google/compute/models/projects.rb similarity index 81% rename from lib/fog/compute/google/models/projects.rb rename to lib/fog/google/compute/models/projects.rb index 9de7110ad..dfef3cd7e 100644 --- a/lib/fog/compute/google/models/projects.rb +++ b/lib/fog/google/compute/models/projects.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Projects < Fog::Collection - model Fog::Compute::Google::Project + model Fog::Google::Compute::Project def get(identity) if identity diff --git a/lib/fog/compute/google/models/region.rb b/lib/fog/google/compute/models/region.rb similarity index 95% rename from lib/fog/compute/google/models/region.rb rename to lib/fog/google/compute/models/region.rb index 16a60125a..a57bd9d7e 100644 --- a/lib/fog/compute/google/models/region.rb +++ b/lib/fog/google/compute/models/region.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Region resource # diff --git a/lib/fog/compute/google/models/regions.rb b/lib/fog/google/compute/models/regions.rb similarity index 91% rename from lib/fog/compute/google/models/regions.rb rename to lib/fog/google/compute/models/regions.rb index 1a06563d5..61ea087ac 100644 --- a/lib/fog/compute/google/models/regions.rb +++ b/lib/fog/google/compute/models/regions.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Regions < Fog::Collection - model Fog::Compute::Google::Region + model Fog::Google::Compute::Region def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/route.rb b/lib/fog/google/compute/models/route.rb similarity index 90% rename from lib/fog/compute/google/models/route.rb rename to lib/fog/google/compute/models/route.rb index 2e387192a..a15d17a12 100644 --- a/lib/fog/compute/google/models/route.rb +++ b/lib/fog/google/compute/models/route.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Route resource # @@ -28,7 +28,7 @@ def save requires :identity, :network, :dest_range, :priority data = service.insert_route(identity, network, dest_range, priority, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -38,7 +38,7 @@ def destroy(async = true) requires :identity data = service.delete_route(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/routes.rb b/lib/fog/google/compute/models/routes.rb similarity index 91% rename from lib/fog/compute/google/models/routes.rb rename to lib/fog/google/compute/models/routes.rb index 070a5b546..9b0721c4b 100644 --- a/lib/fog/compute/google/models/routes.rb +++ b/lib/fog/google/compute/models/routes.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Routes < Fog::Collection - model Fog::Compute::Google::Route + model Fog::Google::Compute::Route def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/server.rb b/lib/fog/google/compute/models/server.rb similarity index 95% rename from lib/fog/compute/google/models/server.rb rename to lib/fog/google/compute/models/server.rb index 21019f3ca..2b14952c5 100644 --- a/lib/fog/compute/google/models/server.rb +++ b/lib/fog/google/compute/models/server.rb @@ -1,8 +1,8 @@ require "fog/compute/models/server" module Fog - module Compute - class Google + module Google + class Compute class Server < Fog::Compute::Server identity :name @@ -202,12 +202,12 @@ def image_name # Destroy a server. # # @param async [TrueClass] execute the command asynchronously - # @return [Fog::Compute::Google::Operation] + # @return [Fog::Google::Compute::Operation] def destroy(async = true) requires :name, :zone data = service.delete_server(name, zone_name) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -283,7 +283,7 @@ def attach_disk(disk, async = true, attached_disk_options = {}) end data = service.attach_disk(identity, zone_name, disk_obj) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -294,12 +294,12 @@ def attach_disk(disk, async = true, attached_disk_options = {}) # # @param device_name [Object] # @param async [TrueClass] - # @returns [Fog::Compute::Google::Server] server object + # @returns [Fog::Google::Compute::Server] server object def detach_disk(device_name, async = true) requires :identity, :zone data = service.detach_disk(identity, zone, device_name) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -321,7 +321,7 @@ def reboot(async = true) requires :identity, :zone data = service.reset_server(identity, zone_name) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -332,7 +332,7 @@ def start(async = true) requires :identity, :zone data = service.start_server(identity, zone_name) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -343,7 +343,7 @@ def stop(async = true, discard_local_ssd=false) requires :identity, :zone data = service.stop_server(identity, zone_name, discard_local_ssd) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -368,7 +368,7 @@ def set_disk_auto_delete(auto_delete, device_name = nil, async = true) identity, zone_name, auto_delete, device_name ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -387,7 +387,7 @@ def set_scheduling(async = true, :preemptible => preemptible ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -400,7 +400,7 @@ def set_scheduling(async = true, # @param [Hash] new_metadata A new metadata object # Format: {'foo' => 'bar', 'baz'=>'foo'} # - # @returns [Fog::Compute::Google::Server] server object + # @returns [Fog::Google::Compute::Server] server object def set_metadata(new_metadata = {}, async = true) requires :identity, :zone @@ -414,7 +414,7 @@ def set_metadata(new_metadata = {}, async = true) data = service.set_server_metadata( identity, zone_name, metadata[:fingerprint], new_metadata_items ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -429,7 +429,7 @@ def set_machine_type(new_machine_type, async = true) data = service.set_server_machine_type( identity, zone_name, new_machine_type ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -442,7 +442,7 @@ def set_tags(new_tags = [], async = true) data = service.set_server_tags( identity, zone_name, tags[:fingerprint], new_tags ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -490,7 +490,7 @@ def add_ssh_key(username, key, async = true) identity, zone_name, metadata[:fingerprint], metadata[:items] ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async @@ -559,7 +559,7 @@ def save(username: nil, public_key: nil) data = service.insert_server(name, zone_name, options) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } diff --git a/lib/fog/compute/google/models/servers.rb b/lib/fog/google/compute/models/servers.rb similarity index 98% rename from lib/fog/compute/google/models/servers.rb rename to lib/fog/google/compute/models/servers.rb index 459dd8136..094daf974 100644 --- a/lib/fog/compute/google/models/servers.rb +++ b/lib/fog/google/compute/models/servers.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Servers < Fog::Collection - model Fog::Compute::Google::Server + model Fog::Google::Compute::Server def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/snapshot.rb b/lib/fog/google/compute/models/snapshot.rb similarity index 95% rename from lib/fog/compute/google/models/snapshot.rb rename to lib/fog/google/compute/models/snapshot.rb index 80d99221b..fe421e7bc 100644 --- a/lib/fog/compute/google/models/snapshot.rb +++ b/lib/fog/google/compute/models/snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Snapshot < Fog::Model identity :name @@ -31,7 +31,7 @@ def destroy(async = true) requires :identity data = service.delete_snapshot(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/snapshots.rb b/lib/fog/google/compute/models/snapshots.rb similarity index 90% rename from lib/fog/compute/google/models/snapshots.rb rename to lib/fog/google/compute/models/snapshots.rb index 35bab9e80..b6df63f2d 100644 --- a/lib/fog/compute/google/models/snapshots.rb +++ b/lib/fog/google/compute/models/snapshots.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Snapshots < Fog::Collection - model Fog::Compute::Google::Snapshot + model Fog::Google::Compute::Snapshot def all items = [] diff --git a/lib/fog/compute/google/models/ssl_certificate.rb b/lib/fog/google/compute/models/ssl_certificate.rb similarity index 88% rename from lib/fog/compute/google/models/ssl_certificate.rb rename to lib/fog/google/compute/models/ssl_certificate.rb index ec626149e..66b87ff41 100644 --- a/lib/fog/compute/google/models/ssl_certificate.rb +++ b/lib/fog/google/compute/models/ssl_certificate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a SslCertificate resource # @@ -22,7 +22,7 @@ def save identity, certificate, private_key, :description => description ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -31,7 +31,7 @@ def save def destroy(async = true) requires :identity data = service.delete_ssl_certificate(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/ssl_certificates.rb b/lib/fog/google/compute/models/ssl_certificates.rb similarity index 90% rename from lib/fog/compute/google/models/ssl_certificates.rb rename to lib/fog/google/compute/models/ssl_certificates.rb index e74804233..20be1f9fe 100644 --- a/lib/fog/compute/google/models/ssl_certificates.rb +++ b/lib/fog/google/compute/models/ssl_certificates.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class SslCertificates < Fog::Collection - model Fog::Compute::Google::SslCertificate + model Fog::Google::Compute::SslCertificate def get(identity) if identity diff --git a/lib/fog/compute/google/models/subnetwork.rb b/lib/fog/google/compute/models/subnetwork.rb similarity index 89% rename from lib/fog/compute/google/models/subnetwork.rb rename to lib/fog/google/compute/models/subnetwork.rb index 2730961c2..34c0d7851 100644 --- a/lib/fog/compute/google/models/subnetwork.rb +++ b/lib/fog/google/compute/models/subnetwork.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute ## # Represents a Subnetwork resource # @@ -24,7 +24,7 @@ def save requires :identity, :network, :region, :ip_cidr_range data = service.insert_subnetwork(identity, region, network, ip_cidr_range, attributes) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } reload @@ -34,7 +34,7 @@ def destroy(async = true) requires :identity, :region data = service.delete_subnetwork(identity, region) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async operation @@ -51,7 +51,7 @@ def expand_ip_cidr_range(range, async = true) data = service.expand_subnetwork_ip_cidr_range( identity, region, range ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async reload @@ -63,7 +63,7 @@ def set_private_ip_google_access(access, async = true) data = service.set_subnetwork_private_ip_google_access( identity, region, access ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async diff --git a/lib/fog/compute/google/models/subnetworks.rb b/lib/fog/google/compute/models/subnetworks.rb similarity index 95% rename from lib/fog/compute/google/models/subnetworks.rb rename to lib/fog/google/compute/models/subnetworks.rb index 6e176ccbc..b61a9a086 100644 --- a/lib/fog/compute/google/models/subnetworks.rb +++ b/lib/fog/google/compute/models/subnetworks.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Subnetworks < Fog::Collection - model Fog::Compute::Google::Subnetwork + model Fog::Google::Compute::Subnetwork def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) filters = { diff --git a/lib/fog/compute/google/models/target_http_proxies.rb b/lib/fog/google/compute/models/target_http_proxies.rb similarity index 90% rename from lib/fog/compute/google/models/target_http_proxies.rb rename to lib/fog/google/compute/models/target_http_proxies.rb index 93070c8e7..5e6162092 100644 --- a/lib/fog/compute/google/models/target_http_proxies.rb +++ b/lib/fog/google/compute/models/target_http_proxies.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetHttpProxies < Fog::Collection - model Fog::Compute::Google::TargetHttpProxy + model Fog::Google::Compute::TargetHttpProxy def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/target_http_proxy.rb b/lib/fog/google/compute/models/target_http_proxy.rb similarity index 89% rename from lib/fog/compute/google/models/target_http_proxy.rb rename to lib/fog/google/compute/models/target_http_proxy.rb index 84b901634..ce2a7870a 100644 --- a/lib/fog/compute/google/models/target_http_proxy.rb +++ b/lib/fog/google/compute/models/target_http_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetHttpProxy < Fog::Model identity :name @@ -16,7 +16,7 @@ def save data = service.insert_target_http_proxy( identity, :description => description, :url_map => url_map ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -26,7 +26,7 @@ def destroy(async = true) requires :identity data = service.delete_target_http_proxy(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation @@ -36,7 +36,7 @@ def set_url_map(url_map, async = true) requires :identity data = service.set_target_http_proxy_url_map(identity, url_map) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async reload diff --git a/lib/fog/compute/google/models/target_https_proxies.rb b/lib/fog/google/compute/models/target_https_proxies.rb similarity index 90% rename from lib/fog/compute/google/models/target_https_proxies.rb rename to lib/fog/google/compute/models/target_https_proxies.rb index b5948adb7..27af179a8 100644 --- a/lib/fog/compute/google/models/target_https_proxies.rb +++ b/lib/fog/google/compute/models/target_https_proxies.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetHttpsProxies < Fog::Collection - model Fog::Compute::Google::TargetHttpsProxy + model Fog::Google::Compute::TargetHttpsProxy def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/target_https_proxy.rb b/lib/fog/google/compute/models/target_https_proxy.rb similarity index 89% rename from lib/fog/compute/google/models/target_https_proxy.rb rename to lib/fog/google/compute/models/target_https_proxy.rb index dbb0a0a5b..35bad5538 100644 --- a/lib/fog/compute/google/models/target_https_proxy.rb +++ b/lib/fog/google/compute/models/target_https_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetHttpsProxy < Fog::Model identity :name @@ -16,7 +16,7 @@ class TargetHttpsProxy < Fog::Model # [cert_one.self_link', cert_two.self_link] # # , where 'cert_one' and 'cert_two' are instances of - # Fog::Compute::Google::SslCertificate + # Fog::Google::Compute::SslCertificate # # @return [Array] attribute :ssl_certificates, :aliases => "sslCertificates" @@ -34,7 +34,7 @@ def save :url_map => url_map, :ssl_certificates => ssl_certificates ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -44,7 +44,7 @@ def destroy(async = true) requires :identity data = service.delete_target_https_proxy(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation @@ -56,7 +56,7 @@ def set_url_map(url_map, async = true) data = service.set_target_https_proxy_url_map( identity, url_map ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async reload @@ -68,7 +68,7 @@ def set_ssl_certificates(ssl_certificates, async = true) data = service.set_target_https_proxy_ssl_certificates( identity, ssl_certificates ) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async reload diff --git a/lib/fog/compute/google/models/target_instance.rb b/lib/fog/google/compute/models/target_instance.rb similarity index 91% rename from lib/fog/compute/google/models/target_instance.rb rename to lib/fog/google/compute/models/target_instance.rb index 6daeb8647..951dfe6e5 100644 --- a/lib/fog/compute/google/models/target_instance.rb +++ b/lib/fog/google/compute/models/target_instance.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetInstance < Fog::Model identity :name @@ -24,7 +24,7 @@ def save } data = service.insert_target_instance(identity, zone, options) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } reload @@ -33,7 +33,7 @@ def save def destroy(async = true) requires :name, :zone data = service.delete_target_instance(name, zone) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name, data.zone) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/target_instances.rb b/lib/fog/google/compute/models/target_instances.rb similarity index 95% rename from lib/fog/compute/google/models/target_instances.rb rename to lib/fog/google/compute/models/target_instances.rb index 35d3020a1..a8e90fcc4 100644 --- a/lib/fog/compute/google/models/target_instances.rb +++ b/lib/fog/google/compute/models/target_instances.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetInstances < Fog::Collection - model Fog::Compute::Google::TargetInstance + model Fog::Google::Compute::TargetInstance def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) diff --git a/lib/fog/compute/google/models/target_pool.rb b/lib/fog/google/compute/models/target_pool.rb similarity index 93% rename from lib/fog/compute/google/models/target_pool.rb rename to lib/fog/google/compute/models/target_pool.rb index cb6cd5e45..7bf1da35e 100644 --- a/lib/fog/compute/google/models/target_pool.rb +++ b/lib/fog/google/compute/models/target_pool.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetPool < Fog::Model identity :name @@ -22,7 +22,7 @@ def save data = service.insert_target_pool( name, region, attributes.reject { |_k, v| v.nil? } ) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } @@ -32,7 +32,7 @@ def save def destroy(async = true) requires :identity, :region data = service.delete_target_pool(identity, region) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async @@ -43,7 +43,7 @@ def add_instance(instance, async = true) requires :identity instance = instance.self_link unless instance.class == String data = service.add_target_pool_instances(identity, region, [instance]) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async @@ -56,7 +56,7 @@ def remove_instance(instance, async = true) instance = instance.self_link unless instance.class == String data = service.remove_target_pool_instances(identity, region, [instance]) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) @@ -70,7 +70,7 @@ def add_health_check(health_check, async = true) health_check = health_check.self_link unless health_check.class == String data = service.add_target_pool_health_checks(identity, region, [health_check]) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async @@ -83,7 +83,7 @@ def remove_health_check(health_check, async = true) health_check = health_check.self_link unless health_check.class == String data = service.remove_target_pool_health_checks(identity, region, [health_check]) - operation = Fog::Compute::Google::Operations + operation = Fog::Google::Compute::Operations .new(:service => service) .get(data.name, nil, data.region) operation.wait_for { ready? } unless async diff --git a/lib/fog/compute/google/models/target_pools.rb b/lib/fog/google/compute/models/target_pools.rb similarity index 95% rename from lib/fog/compute/google/models/target_pools.rb rename to lib/fog/google/compute/models/target_pools.rb index daf0b1d91..af776d4ef 100644 --- a/lib/fog/compute/google/models/target_pools.rb +++ b/lib/fog/google/compute/models/target_pools.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class TargetPools < Fog::Collection - model Fog::Compute::Google::TargetPool + model Fog::Google::Compute::TargetPool def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil) opts = { diff --git a/lib/fog/compute/google/models/url_map.rb b/lib/fog/google/compute/models/url_map.rb similarity index 91% rename from lib/fog/compute/google/models/url_map.rb rename to lib/fog/google/compute/models/url_map.rb index b4a351db5..a71fc9cf9 100644 --- a/lib/fog/compute/google/models/url_map.rb +++ b/lib/fog/google/compute/models/url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class UrlMap < Fog::Model identity :name @@ -34,7 +34,7 @@ def save else data = service.insert_url_map(identity, options) end - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } reload @@ -44,7 +44,7 @@ def destroy(async = true) requires :identity data = service.delete_url_map(identity) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation @@ -61,7 +61,7 @@ def add_host_rules(rules_to_add, async = true) rules = (host_rules || []).concat rules_to_add data = service.patch_url_map(identity, :host_rules => rules) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async reload @@ -76,7 +76,7 @@ def add_path_matchers(matchers_to_add, rules_to_add, async = true) :host_rules => rules, :path_matchers => matchers) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async reload @@ -86,7 +86,7 @@ def invalidate_cache(path, host = nil, async = true) requires :identity data = service.invalidate_url_map_cache(identity, path, host) - operation = Fog::Compute::Google::Operations.new(:service => service) + operation = Fog::Google::Compute::Operations.new(:service => service) .get(data.name) operation.wait_for { ready? } unless async operation diff --git a/lib/fog/compute/google/models/url_maps.rb b/lib/fog/google/compute/models/url_maps.rb similarity index 91% rename from lib/fog/compute/google/models/url_maps.rb rename to lib/fog/google/compute/models/url_maps.rb index 1088785cf..2d7c2845f 100644 --- a/lib/fog/compute/google/models/url_maps.rb +++ b/lib/fog/google/compute/models/url_maps.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class UrlMaps < Fog::Collection - model Fog::Compute::Google::UrlMap + model Fog::Google::Compute::UrlMap def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/models/zone.rb b/lib/fog/google/compute/models/zone.rb similarity index 93% rename from lib/fog/compute/google/models/zone.rb rename to lib/fog/google/compute/models/zone.rb index e21509323..658584343 100644 --- a/lib/fog/compute/google/models/zone.rb +++ b/lib/fog/google/compute/models/zone.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Zone < Fog::Model identity :name diff --git a/lib/fog/compute/google/models/zones.rb b/lib/fog/google/compute/models/zones.rb similarity index 91% rename from lib/fog/compute/google/models/zones.rb rename to lib/fog/google/compute/models/zones.rb index bb00c39de..d11dfd1b6 100644 --- a/lib/fog/compute/google/models/zones.rb +++ b/lib/fog/google/compute/models/zones.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Google + module Google + class Compute class Zones < Fog::Collection - model Fog::Compute::Google::Zone + model Fog::Google::Compute::Zone def all(opts = {}) items = [] diff --git a/lib/fog/compute/google/real.rb b/lib/fog/google/compute/real.rb similarity index 95% rename from lib/fog/compute/google/real.rb rename to lib/fog/google/compute/real.rb index 46e052c34..821671a08 100644 --- a/lib/fog/compute/google/real.rb +++ b/lib/fog/google/compute/real.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Real include Fog::Google::Shared diff --git a/lib/fog/compute/google/requests/abandon_instances.rb b/lib/fog/google/compute/requests/abandon_instances.rb similarity index 96% rename from lib/fog/compute/google/requests/abandon_instances.rb rename to lib/fog/google/compute/requests/abandon_instances.rb index 5d45b636b..2ed30e5f6 100644 --- a/lib/fog/compute/google/requests/abandon_instances.rb +++ b/lib/fog/google/compute/requests/abandon_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def abandon_instances(_instance_group_manager, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/add_backend_service_backends.rb b/lib/fog/google/compute/requests/add_backend_service_backends.rb similarity index 92% rename from lib/fog/compute/google/requests/add_backend_service_backends.rb rename to lib/fog/google/compute/requests/add_backend_service_backends.rb index b8cc68968..6bb4bef9f 100644 --- a/lib/fog/compute/google/requests/add_backend_service_backends.rb +++ b/lib/fog/google/compute/requests/add_backend_service_backends.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_backend_service_backends(_backend_service, _new_backends) # :no-coverage: diff --git a/lib/fog/compute/google/requests/add_instance_group_instances.rb b/lib/fog/google/compute/requests/add_instance_group_instances.rb similarity index 96% rename from lib/fog/compute/google/requests/add_instance_group_instances.rb rename to lib/fog/google/compute/requests/add_instance_group_instances.rb index 817353f5b..b94e0e1b7 100644 --- a/lib/fog/compute/google/requests/add_instance_group_instances.rb +++ b/lib/fog/google/compute/requests/add_instance_group_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_instance_group_instances(_group_name, _zone, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/add_server_access_config.rb b/lib/fog/google/compute/requests/add_server_access_config.rb similarity index 96% rename from lib/fog/compute/google/requests/add_server_access_config.rb rename to lib/fog/google/compute/requests/add_server_access_config.rb index 4a63ae743..65d4f3244 100644 --- a/lib/fog/compute/google/requests/add_server_access_config.rb +++ b/lib/fog/google/compute/requests/add_server_access_config.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_server_access_config(_identity, _zone, _nic, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/add_target_pool_health_checks.rb b/lib/fog/google/compute/requests/add_target_pool_health_checks.rb similarity index 96% rename from lib/fog/compute/google/requests/add_target_pool_health_checks.rb rename to lib/fog/google/compute/requests/add_target_pool_health_checks.rb index 217cfc1b4..a54e294e7 100644 --- a/lib/fog/compute/google/requests/add_target_pool_health_checks.rb +++ b/lib/fog/google/compute/requests/add_target_pool_health_checks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_target_pool_health_checks(_target_pool, _region, _health_checks) # :no-coverage: diff --git a/lib/fog/compute/google/requests/add_target_pool_instances.rb b/lib/fog/google/compute/requests/add_target_pool_instances.rb similarity index 95% rename from lib/fog/compute/google/requests/add_target_pool_instances.rb rename to lib/fog/google/compute/requests/add_target_pool_instances.rb index 923602892..b996f2708 100644 --- a/lib/fog/compute/google/requests/add_target_pool_instances.rb +++ b/lib/fog/google/compute/requests/add_target_pool_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_target_pool_instances(_target_pool, _region, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/attach_disk.rb b/lib/fog/google/compute/requests/attach_disk.rb similarity index 93% rename from lib/fog/compute/google/requests/attach_disk.rb rename to lib/fog/google/compute/requests/attach_disk.rb index 200f6afc8..bc67b3eed 100644 --- a/lib/fog/compute/google/requests/attach_disk.rb +++ b/lib/fog/google/compute/requests/attach_disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def attach_disk(_instance, _zone, _disk = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/create_disk_snapshot.rb b/lib/fog/google/compute/requests/create_disk_snapshot.rb similarity index 94% rename from lib/fog/compute/google/requests/create_disk_snapshot.rb rename to lib/fog/google/compute/requests/create_disk_snapshot.rb index c31b41651..e7d54313d 100644 --- a/lib/fog/compute/google/requests/create_disk_snapshot.rb +++ b/lib/fog/google/compute/requests/create_disk_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def create_disk_snapshot(_snapshot_name, _disk, _zone, _snapshot = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_address.rb b/lib/fog/google/compute/requests/delete_address.rb similarity index 95% rename from lib/fog/compute/google/requests/delete_address.rb rename to lib/fog/google/compute/requests/delete_address.rb index 54226e7e7..eac07cd09 100644 --- a/lib/fog/compute/google/requests/delete_address.rb +++ b/lib/fog/google/compute/requests/delete_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_address(_address_name, _region_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_backend_service.rb b/lib/fog/google/compute/requests/delete_backend_service.rb similarity index 92% rename from lib/fog/compute/google/requests/delete_backend_service.rb rename to lib/fog/google/compute/requests/delete_backend_service.rb index 414d6073e..68ef3c02d 100644 --- a/lib/fog/compute/google/requests/delete_backend_service.rb +++ b/lib/fog/google/compute/requests/delete_backend_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_backend_service(_backend_service_name, _zone_name = nil) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_disk.rb b/lib/fog/google/compute/requests/delete_disk.rb similarity index 95% rename from lib/fog/compute/google/requests/delete_disk.rb rename to lib/fog/google/compute/requests/delete_disk.rb index c2c3af124..827a6d5b1 100644 --- a/lib/fog/compute/google/requests/delete_disk.rb +++ b/lib/fog/google/compute/requests/delete_disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_disk(_disk_name, _zone_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_firewall.rb b/lib/fog/google/compute/requests/delete_firewall.rb similarity index 90% rename from lib/fog/compute/google/requests/delete_firewall.rb rename to lib/fog/google/compute/requests/delete_firewall.rb index 8db5e372b..488587566 100644 --- a/lib/fog/compute/google/requests/delete_firewall.rb +++ b/lib/fog/google/compute/requests/delete_firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_firewall(_firewall_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_forwarding_rule.rb b/lib/fog/google/compute/requests/delete_forwarding_rule.rb similarity index 92% rename from lib/fog/compute/google/requests/delete_forwarding_rule.rb rename to lib/fog/google/compute/requests/delete_forwarding_rule.rb index 892706d7d..0c1994ef9 100644 --- a/lib/fog/compute/google/requests/delete_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/delete_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_forwarding_rule(_rule, _region) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_global_address.rb b/lib/fog/google/compute/requests/delete_global_address.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_global_address.rb rename to lib/fog/google/compute/requests/delete_global_address.rb index e2277adfc..e7bc22b27 100644 --- a/lib/fog/compute/google/requests/delete_global_address.rb +++ b/lib/fog/google/compute/requests/delete_global_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_global_address(_address_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_global_forwarding_rule.rb b/lib/fog/google/compute/requests/delete_global_forwarding_rule.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_global_forwarding_rule.rb rename to lib/fog/google/compute/requests/delete_global_forwarding_rule.rb index 61e0f3a8e..250a14f86 100644 --- a/lib/fog/compute/google/requests/delete_global_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/delete_global_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_global_forwarding_rule(_rule) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_global_operation.rb b/lib/fog/google/compute/requests/delete_global_operation.rb similarity index 93% rename from lib/fog/compute/google/requests/delete_global_operation.rb rename to lib/fog/google/compute/requests/delete_global_operation.rb index 5a897a379..8d272fb21 100644 --- a/lib/fog/compute/google/requests/delete_global_operation.rb +++ b/lib/fog/google/compute/requests/delete_global_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_global_operation(_operation) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_http_health_check.rb b/lib/fog/google/compute/requests/delete_http_health_check.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_http_health_check.rb rename to lib/fog/google/compute/requests/delete_http_health_check.rb index b099a81f8..0fc39cfc8 100644 --- a/lib/fog/compute/google/requests/delete_http_health_check.rb +++ b/lib/fog/google/compute/requests/delete_http_health_check.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_http_health_check(_check_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_image.rb b/lib/fog/google/compute/requests/delete_image.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_image.rb rename to lib/fog/google/compute/requests/delete_image.rb index 895587367..a6f52d235 100644 --- a/lib/fog/compute/google/requests/delete_image.rb +++ b/lib/fog/google/compute/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_image(_image_name, _project = @project) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_instance_group.rb b/lib/fog/google/compute/requests/delete_instance_group.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_instance_group.rb rename to lib/fog/google/compute/requests/delete_instance_group.rb index 72ad7fc59..7b8e107af 100644 --- a/lib/fog/compute/google/requests/delete_instance_group.rb +++ b/lib/fog/google/compute/requests/delete_instance_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_instance_group(_group_name, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_instance_group_manager.rb b/lib/fog/google/compute/requests/delete_instance_group_manager.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_instance_group_manager.rb rename to lib/fog/google/compute/requests/delete_instance_group_manager.rb index f7be62886..783a68a21 100644 --- a/lib/fog/compute/google/requests/delete_instance_group_manager.rb +++ b/lib/fog/google/compute/requests/delete_instance_group_manager.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_instance_group_manager(_name, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_instance_template.rb b/lib/fog/google/compute/requests/delete_instance_template.rb similarity index 90% rename from lib/fog/compute/google/requests/delete_instance_template.rb rename to lib/fog/google/compute/requests/delete_instance_template.rb index 5ecab7884..cd93683dd 100644 --- a/lib/fog/compute/google/requests/delete_instance_template.rb +++ b/lib/fog/google/compute/requests/delete_instance_template.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_instance_template(_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_network.rb b/lib/fog/google/compute/requests/delete_network.rb similarity index 90% rename from lib/fog/compute/google/requests/delete_network.rb rename to lib/fog/google/compute/requests/delete_network.rb index 6fa51d1a4..ca697e195 100644 --- a/lib/fog/compute/google/requests/delete_network.rb +++ b/lib/fog/google/compute/requests/delete_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_network(_network_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_region_operation.rb b/lib/fog/google/compute/requests/delete_region_operation.rb similarity index 94% rename from lib/fog/compute/google/requests/delete_region_operation.rb rename to lib/fog/google/compute/requests/delete_region_operation.rb index 46a3156dc..fe0046967 100644 --- a/lib/fog/compute/google/requests/delete_region_operation.rb +++ b/lib/fog/google/compute/requests/delete_region_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_region_operation(_region, _operation) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_route.rb b/lib/fog/google/compute/requests/delete_route.rb similarity index 93% rename from lib/fog/compute/google/requests/delete_route.rb rename to lib/fog/google/compute/requests/delete_route.rb index 7fde8dfd6..53fda4c36 100644 --- a/lib/fog/compute/google/requests/delete_route.rb +++ b/lib/fog/google/compute/requests/delete_route.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_route(_identity) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_server.rb b/lib/fog/google/compute/requests/delete_server.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_server.rb rename to lib/fog/google/compute/requests/delete_server.rb index 2108f95e2..193fcaea2 100644 --- a/lib/fog/compute/google/requests/delete_server.rb +++ b/lib/fog/google/compute/requests/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_server(_server, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_server_access_config.rb b/lib/fog/google/compute/requests/delete_server_access_config.rb similarity index 94% rename from lib/fog/compute/google/requests/delete_server_access_config.rb rename to lib/fog/google/compute/requests/delete_server_access_config.rb index 547ed4521..e2805f521 100644 --- a/lib/fog/compute/google/requests/delete_server_access_config.rb +++ b/lib/fog/google/compute/requests/delete_server_access_config.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_server_access_config(_identity, _zone, _nic, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_snapshot.rb b/lib/fog/google/compute/requests/delete_snapshot.rb similarity index 90% rename from lib/fog/compute/google/requests/delete_snapshot.rb rename to lib/fog/google/compute/requests/delete_snapshot.rb index c5db6c17d..662729bed 100644 --- a/lib/fog/compute/google/requests/delete_snapshot.rb +++ b/lib/fog/google/compute/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_snapshot(_snapshot_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_ssl_certificate.rb b/lib/fog/google/compute/requests/delete_ssl_certificate.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_ssl_certificate.rb rename to lib/fog/google/compute/requests/delete_ssl_certificate.rb index 930be813e..f5199bc0a 100644 --- a/lib/fog/compute/google/requests/delete_ssl_certificate.rb +++ b/lib/fog/google/compute/requests/delete_ssl_certificate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_ssl_certificate(_certificate_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_subnetwork.rb b/lib/fog/google/compute/requests/delete_subnetwork.rb similarity index 96% rename from lib/fog/compute/google/requests/delete_subnetwork.rb rename to lib/fog/google/compute/requests/delete_subnetwork.rb index 4c6a80a03..f42d9ecd3 100644 --- a/lib/fog/compute/google/requests/delete_subnetwork.rb +++ b/lib/fog/google/compute/requests/delete_subnetwork.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_subnetwork(_subnetwork_name, _region_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_target_http_proxy.rb b/lib/fog/google/compute/requests/delete_target_http_proxy.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_target_http_proxy.rb rename to lib/fog/google/compute/requests/delete_target_http_proxy.rb index d949de057..a9eb04760 100644 --- a/lib/fog/compute/google/requests/delete_target_http_proxy.rb +++ b/lib/fog/google/compute/requests/delete_target_http_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_target_http_proxy(_proxy_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_target_https_proxy.rb b/lib/fog/google/compute/requests/delete_target_https_proxy.rb similarity index 91% rename from lib/fog/compute/google/requests/delete_target_https_proxy.rb rename to lib/fog/google/compute/requests/delete_target_https_proxy.rb index f34af6efe..cebf2b057 100644 --- a/lib/fog/compute/google/requests/delete_target_https_proxy.rb +++ b/lib/fog/google/compute/requests/delete_target_https_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_target_https_proxy(_proxy_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_target_instance.rb b/lib/fog/google/compute/requests/delete_target_instance.rb similarity index 92% rename from lib/fog/compute/google/requests/delete_target_instance.rb rename to lib/fog/google/compute/requests/delete_target_instance.rb index c92e65e25..ac314664e 100644 --- a/lib/fog/compute/google/requests/delete_target_instance.rb +++ b/lib/fog/google/compute/requests/delete_target_instance.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_target_instance(_target_name, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_target_pool.rb b/lib/fog/google/compute/requests/delete_target_pool.rb similarity index 92% rename from lib/fog/compute/google/requests/delete_target_pool.rb rename to lib/fog/google/compute/requests/delete_target_pool.rb index d3f454cd9..b55885d65 100644 --- a/lib/fog/compute/google/requests/delete_target_pool.rb +++ b/lib/fog/google/compute/requests/delete_target_pool.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_target_pool(_target_pool, _region) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_url_map.rb b/lib/fog/google/compute/requests/delete_url_map.rb similarity index 90% rename from lib/fog/compute/google/requests/delete_url_map.rb rename to lib/fog/google/compute/requests/delete_url_map.rb index 8932efea1..78111c12e 100644 --- a/lib/fog/compute/google/requests/delete_url_map.rb +++ b/lib/fog/google/compute/requests/delete_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_url_map(_url_map_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/delete_zone_operation.rb b/lib/fog/google/compute/requests/delete_zone_operation.rb similarity index 94% rename from lib/fog/compute/google/requests/delete_zone_operation.rb rename to lib/fog/google/compute/requests/delete_zone_operation.rb index 56595fc77..1cde1367c 100644 --- a/lib/fog/compute/google/requests/delete_zone_operation.rb +++ b/lib/fog/google/compute/requests/delete_zone_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def delete_zone_operation(_zone, _operation) # :no-coverage: diff --git a/lib/fog/compute/google/requests/deprecate_image.rb b/lib/fog/google/compute/requests/deprecate_image.rb similarity index 93% rename from lib/fog/compute/google/requests/deprecate_image.rb rename to lib/fog/google/compute/requests/deprecate_image.rb index eb388b2f1..d3bbb8d2a 100644 --- a/lib/fog/compute/google/requests/deprecate_image.rb +++ b/lib/fog/google/compute/requests/deprecate_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def deprecate_image(_image_name, _deprecation_status = {}, _project = @project) # :no-coverage: diff --git a/lib/fog/compute/google/requests/detach_disk.rb b/lib/fog/google/compute/requests/detach_disk.rb similarity index 92% rename from lib/fog/compute/google/requests/detach_disk.rb rename to lib/fog/google/compute/requests/detach_disk.rb index 2fadbb4a9..b883e67d1 100644 --- a/lib/fog/compute/google/requests/detach_disk.rb +++ b/lib/fog/google/compute/requests/detach_disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def detach_disk(_instance, _zone, _device_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/expand_subnetwork_ip_cidr_range.rb b/lib/fog/google/compute/requests/expand_subnetwork_ip_cidr_range.rb similarity index 97% rename from lib/fog/compute/google/requests/expand_subnetwork_ip_cidr_range.rb rename to lib/fog/google/compute/requests/expand_subnetwork_ip_cidr_range.rb index 230b08b87..463b3dab5 100644 --- a/lib/fog/compute/google/requests/expand_subnetwork_ip_cidr_range.rb +++ b/lib/fog/google/compute/requests/expand_subnetwork_ip_cidr_range.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def expand_subnetwork_ip_cidr_range(_subnetwork, _region, _ip_cidr_range) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_address.rb b/lib/fog/google/compute/requests/get_address.rb similarity index 94% rename from lib/fog/compute/google/requests/get_address.rb rename to lib/fog/google/compute/requests/get_address.rb index 9df7595e8..69ff87aca 100644 --- a/lib/fog/compute/google/requests/get_address.rb +++ b/lib/fog/google/compute/requests/get_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_address(_address_name, _region_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_backend_service.rb b/lib/fog/google/compute/requests/get_backend_service.rb similarity index 92% rename from lib/fog/compute/google/requests/get_backend_service.rb rename to lib/fog/google/compute/requests/get_backend_service.rb index 0f0901e50..325921365 100644 --- a/lib/fog/compute/google/requests/get_backend_service.rb +++ b/lib/fog/google/compute/requests/get_backend_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_backend_service(service_name) backend_service = data[:backend_services][service_name] diff --git a/lib/fog/compute/google/requests/get_backend_service_health.rb b/lib/fog/google/compute/requests/get_backend_service_health.rb similarity index 95% rename from lib/fog/compute/google/requests/get_backend_service_health.rb rename to lib/fog/google/compute/requests/get_backend_service_health.rb index 244df78a1..2a322a5ec 100644 --- a/lib/fog/compute/google/requests/get_backend_service_health.rb +++ b/lib/fog/google/compute/requests/get_backend_service_health.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_backend_service_health(_backend_service) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_disk.rb b/lib/fog/google/compute/requests/get_disk.rb similarity index 94% rename from lib/fog/compute/google/requests/get_disk.rb rename to lib/fog/google/compute/requests/get_disk.rb index acc6e1f39..66a0c0fc0 100644 --- a/lib/fog/compute/google/requests/get_disk.rb +++ b/lib/fog/google/compute/requests/get_disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_disk(_disk_name, _zone_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_disk_type.rb b/lib/fog/google/compute/requests/get_disk_type.rb similarity index 91% rename from lib/fog/compute/google/requests/get_disk_type.rb rename to lib/fog/google/compute/requests/get_disk_type.rb index 421614030..6aca8cdaa 100644 --- a/lib/fog/compute/google/requests/get_disk_type.rb +++ b/lib/fog/google/compute/requests/get_disk_type.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_disk_type(_disk, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_firewall.rb b/lib/fog/google/compute/requests/get_firewall.rb similarity index 90% rename from lib/fog/compute/google/requests/get_firewall.rb rename to lib/fog/google/compute/requests/get_firewall.rb index 28063e715..24a6e4d5d 100644 --- a/lib/fog/compute/google/requests/get_firewall.rb +++ b/lib/fog/google/compute/requests/get_firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_firewall(_firewall_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_forwarding_rule.rb b/lib/fog/google/compute/requests/get_forwarding_rule.rb similarity index 92% rename from lib/fog/compute/google/requests/get_forwarding_rule.rb rename to lib/fog/google/compute/requests/get_forwarding_rule.rb index 83bbc3445..9b96386fb 100644 --- a/lib/fog/compute/google/requests/get_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/get_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_forwarding_rule(_rule, _region) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_global_address.rb b/lib/fog/google/compute/requests/get_global_address.rb similarity index 91% rename from lib/fog/compute/google/requests/get_global_address.rb rename to lib/fog/google/compute/requests/get_global_address.rb index 30baef69b..d794378cf 100644 --- a/lib/fog/compute/google/requests/get_global_address.rb +++ b/lib/fog/google/compute/requests/get_global_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_global_address(_address_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_global_forwarding_rule.rb b/lib/fog/google/compute/requests/get_global_forwarding_rule.rb similarity index 91% rename from lib/fog/compute/google/requests/get_global_forwarding_rule.rb rename to lib/fog/google/compute/requests/get_global_forwarding_rule.rb index 06f20c712..4a860ca23 100644 --- a/lib/fog/compute/google/requests/get_global_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/get_global_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_global_forwarding_rule(_rule) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_global_operation.rb b/lib/fog/google/compute/requests/get_global_operation.rb similarity index 94% rename from lib/fog/compute/google/requests/get_global_operation.rb rename to lib/fog/google/compute/requests/get_global_operation.rb index 99497e93d..d41fd8aa6 100644 --- a/lib/fog/compute/google/requests/get_global_operation.rb +++ b/lib/fog/google/compute/requests/get_global_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_global_operation(_operation) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_http_health_check.rb b/lib/fog/google/compute/requests/get_http_health_check.rb similarity index 91% rename from lib/fog/compute/google/requests/get_http_health_check.rb rename to lib/fog/google/compute/requests/get_http_health_check.rb index 59a2069a0..5c42e20f0 100644 --- a/lib/fog/compute/google/requests/get_http_health_check.rb +++ b/lib/fog/google/compute/requests/get_http_health_check.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_http_health_check(_check_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_image.rb b/lib/fog/google/compute/requests/get_image.rb similarity index 92% rename from lib/fog/compute/google/requests/get_image.rb rename to lib/fog/google/compute/requests/get_image.rb index cc4e3da96..a703e4105 100644 --- a/lib/fog/compute/google/requests/get_image.rb +++ b/lib/fog/google/compute/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_image(_image_name, _project = @project) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_image_from_family.rb b/lib/fog/google/compute/requests/get_image_from_family.rb similarity index 95% rename from lib/fog/compute/google/requests/get_image_from_family.rb rename to lib/fog/google/compute/requests/get_image_from_family.rb index f142c04f5..987dab96d 100644 --- a/lib/fog/compute/google/requests/get_image_from_family.rb +++ b/lib/fog/google/compute/requests/get_image_from_family.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_image_from_family(_family, _project = @project) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_instance_group.rb b/lib/fog/google/compute/requests/get_instance_group.rb similarity index 92% rename from lib/fog/compute/google/requests/get_instance_group.rb rename to lib/fog/google/compute/requests/get_instance_group.rb index dd80f33b0..716159ed6 100644 --- a/lib/fog/compute/google/requests/get_instance_group.rb +++ b/lib/fog/google/compute/requests/get_instance_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_instance_group(_group_name, _zone, _project = @project) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_instance_group_manager.rb b/lib/fog/google/compute/requests/get_instance_group_manager.rb similarity index 91% rename from lib/fog/compute/google/requests/get_instance_group_manager.rb rename to lib/fog/google/compute/requests/get_instance_group_manager.rb index c87c57e62..933d5a982 100644 --- a/lib/fog/compute/google/requests/get_instance_group_manager.rb +++ b/lib/fog/google/compute/requests/get_instance_group_manager.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_instance_group_manager(_name, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_instance_template.rb b/lib/fog/google/compute/requests/get_instance_template.rb similarity index 90% rename from lib/fog/compute/google/requests/get_instance_template.rb rename to lib/fog/google/compute/requests/get_instance_template.rb index ec43a74a5..1a8f2b264 100644 --- a/lib/fog/compute/google/requests/get_instance_template.rb +++ b/lib/fog/google/compute/requests/get_instance_template.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_instance_template(_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_machine_type.rb b/lib/fog/google/compute/requests/get_machine_type.rb similarity index 92% rename from lib/fog/compute/google/requests/get_machine_type.rb rename to lib/fog/google/compute/requests/get_machine_type.rb index a99200a01..92811827f 100644 --- a/lib/fog/compute/google/requests/get_machine_type.rb +++ b/lib/fog/google/compute/requests/get_machine_type.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_machine_type(_machine_type, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_network.rb b/lib/fog/google/compute/requests/get_network.rb similarity index 90% rename from lib/fog/compute/google/requests/get_network.rb rename to lib/fog/google/compute/requests/get_network.rb index 450121e6e..4e0e2c354 100644 --- a/lib/fog/compute/google/requests/get_network.rb +++ b/lib/fog/google/compute/requests/get_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_network(_network_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_project.rb b/lib/fog/google/compute/requests/get_project.rb similarity index 90% rename from lib/fog/compute/google/requests/get_project.rb rename to lib/fog/google/compute/requests/get_project.rb index 66aef52da..fa0316a70 100644 --- a/lib/fog/compute/google/requests/get_project.rb +++ b/lib/fog/google/compute/requests/get_project.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_project(_identity) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_region.rb b/lib/fog/google/compute/requests/get_region.rb similarity index 90% rename from lib/fog/compute/google/requests/get_region.rb rename to lib/fog/google/compute/requests/get_region.rb index 0a68bee8a..3923132b4 100644 --- a/lib/fog/compute/google/requests/get_region.rb +++ b/lib/fog/google/compute/requests/get_region.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_region(_identity) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_region_operation.rb b/lib/fog/google/compute/requests/get_region_operation.rb similarity index 94% rename from lib/fog/compute/google/requests/get_region_operation.rb rename to lib/fog/google/compute/requests/get_region_operation.rb index d16626198..0efeaa2cc 100644 --- a/lib/fog/compute/google/requests/get_region_operation.rb +++ b/lib/fog/google/compute/requests/get_region_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_region_operation(_region, _operation) raise Fog::Errors::MockNotImplemented diff --git a/lib/fog/compute/google/requests/get_route.rb b/lib/fog/google/compute/requests/get_route.rb similarity index 93% rename from lib/fog/compute/google/requests/get_route.rb rename to lib/fog/google/compute/requests/get_route.rb index 52301eed7..396716533 100644 --- a/lib/fog/compute/google/requests/get_route.rb +++ b/lib/fog/google/compute/requests/get_route.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_route(_identity) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_server.rb b/lib/fog/google/compute/requests/get_server.rb similarity index 91% rename from lib/fog/compute/google/requests/get_server.rb rename to lib/fog/google/compute/requests/get_server.rb index 93179cfcf..6a4f0dab5 100644 --- a/lib/fog/compute/google/requests/get_server.rb +++ b/lib/fog/google/compute/requests/get_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_server(_instance, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_server_serial_port_output.rb b/lib/fog/google/compute/requests/get_server_serial_port_output.rb similarity index 97% rename from lib/fog/compute/google/requests/get_server_serial_port_output.rb rename to lib/fog/google/compute/requests/get_server_serial_port_output.rb index 2c4b1f45e..1c31a9149 100644 --- a/lib/fog/compute/google/requests/get_server_serial_port_output.rb +++ b/lib/fog/google/compute/requests/get_server_serial_port_output.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_server_serial_port_output(_identity, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_snapshot.rb b/lib/fog/google/compute/requests/get_snapshot.rb similarity index 92% rename from lib/fog/compute/google/requests/get_snapshot.rb rename to lib/fog/google/compute/requests/get_snapshot.rb index a44960f8e..3a2d50ac4 100644 --- a/lib/fog/compute/google/requests/get_snapshot.rb +++ b/lib/fog/google/compute/requests/get_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_snapshot(_snap_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_ssl_certificate.rb b/lib/fog/google/compute/requests/get_ssl_certificate.rb similarity index 91% rename from lib/fog/compute/google/requests/get_ssl_certificate.rb rename to lib/fog/google/compute/requests/get_ssl_certificate.rb index c46590a97..a76b6b250 100644 --- a/lib/fog/compute/google/requests/get_ssl_certificate.rb +++ b/lib/fog/google/compute/requests/get_ssl_certificate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_ssl_certificate(_certificate_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_subnetwork.rb b/lib/fog/google/compute/requests/get_subnetwork.rb similarity index 96% rename from lib/fog/compute/google/requests/get_subnetwork.rb rename to lib/fog/google/compute/requests/get_subnetwork.rb index 9db3c1b7f..40bb171fb 100644 --- a/lib/fog/compute/google/requests/get_subnetwork.rb +++ b/lib/fog/google/compute/requests/get_subnetwork.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_subnetwork(_subnetwork_name, _region_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_target_http_proxy.rb b/lib/fog/google/compute/requests/get_target_http_proxy.rb similarity index 91% rename from lib/fog/compute/google/requests/get_target_http_proxy.rb rename to lib/fog/google/compute/requests/get_target_http_proxy.rb index 4573e6a9f..f2a7f5f40 100644 --- a/lib/fog/compute/google/requests/get_target_http_proxy.rb +++ b/lib/fog/google/compute/requests/get_target_http_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_target_http_proxy(_proxy_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_target_https_proxy.rb b/lib/fog/google/compute/requests/get_target_https_proxy.rb similarity index 91% rename from lib/fog/compute/google/requests/get_target_https_proxy.rb rename to lib/fog/google/compute/requests/get_target_https_proxy.rb index 3f8295247..be0e98b43 100644 --- a/lib/fog/compute/google/requests/get_target_https_proxy.rb +++ b/lib/fog/google/compute/requests/get_target_https_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_target_https_proxy(_proxy_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_target_instance.rb b/lib/fog/google/compute/requests/get_target_instance.rb similarity index 92% rename from lib/fog/compute/google/requests/get_target_instance.rb rename to lib/fog/google/compute/requests/get_target_instance.rb index 66d6421ab..8e75bdcf6 100644 --- a/lib/fog/compute/google/requests/get_target_instance.rb +++ b/lib/fog/google/compute/requests/get_target_instance.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_target_instance(_target_name, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_target_pool.rb b/lib/fog/google/compute/requests/get_target_pool.rb similarity index 92% rename from lib/fog/compute/google/requests/get_target_pool.rb rename to lib/fog/google/compute/requests/get_target_pool.rb index 262d78f51..788ed02d3 100644 --- a/lib/fog/compute/google/requests/get_target_pool.rb +++ b/lib/fog/google/compute/requests/get_target_pool.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_target_pool(_target_pool, _region) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_target_pool_health.rb b/lib/fog/google/compute/requests/get_target_pool_health.rb similarity index 94% rename from lib/fog/compute/google/requests/get_target_pool_health.rb rename to lib/fog/google/compute/requests/get_target_pool_health.rb index 38cf31240..b41aa61f2 100644 --- a/lib/fog/compute/google/requests/get_target_pool_health.rb +++ b/lib/fog/google/compute/requests/get_target_pool_health.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_target_pool_health(_target_pool, _region, _instance) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_url_map.rb b/lib/fog/google/compute/requests/get_url_map.rb similarity index 90% rename from lib/fog/compute/google/requests/get_url_map.rb rename to lib/fog/google/compute/requests/get_url_map.rb index 540dce523..9d02af266 100644 --- a/lib/fog/compute/google/requests/get_url_map.rb +++ b/lib/fog/google/compute/requests/get_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_url_map(_url_map_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_zone.rb b/lib/fog/google/compute/requests/get_zone.rb similarity index 90% rename from lib/fog/compute/google/requests/get_zone.rb rename to lib/fog/google/compute/requests/get_zone.rb index 461612793..c41d14008 100644 --- a/lib/fog/compute/google/requests/get_zone.rb +++ b/lib/fog/google/compute/requests/get_zone.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_zone(_zone_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/get_zone_operation.rb b/lib/fog/google/compute/requests/get_zone_operation.rb similarity index 95% rename from lib/fog/compute/google/requests/get_zone_operation.rb rename to lib/fog/google/compute/requests/get_zone_operation.rb index af0840c03..4da746eba 100644 --- a/lib/fog/compute/google/requests/get_zone_operation.rb +++ b/lib/fog/google/compute/requests/get_zone_operation.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def get_zone_operation(_zone_name, _operation) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_address.rb b/lib/fog/google/compute/requests/insert_address.rb similarity index 96% rename from lib/fog/compute/google/requests/insert_address.rb rename to lib/fog/google/compute/requests/insert_address.rb index a3691516f..c6851ca45 100644 --- a/lib/fog/compute/google/requests/insert_address.rb +++ b/lib/fog/google/compute/requests/insert_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_address(_address_name, _region_name, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_backend_service.rb b/lib/fog/google/compute/requests/insert_backend_service.rb similarity index 94% rename from lib/fog/compute/google/requests/insert_backend_service.rb rename to lib/fog/google/compute/requests/insert_backend_service.rb index db67f0234..1d5f9dc59 100644 --- a/lib/fog/compute/google/requests/insert_backend_service.rb +++ b/lib/fog/google/compute/requests/insert_backend_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_backend_service(_backend_service_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_disk.rb b/lib/fog/google/compute/requests/insert_disk.rb similarity index 98% rename from lib/fog/compute/google/requests/insert_disk.rb rename to lib/fog/google/compute/requests/insert_disk.rb index bdf30db48..c53aabf5f 100644 --- a/lib/fog/compute/google/requests/insert_disk.rb +++ b/lib/fog/google/compute/requests/insert_disk.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_disk(_disk_name, _zone, _image_name = nil, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_firewall.rb b/lib/fog/google/compute/requests/insert_firewall.rb similarity index 98% rename from lib/fog/compute/google/requests/insert_firewall.rb rename to lib/fog/google/compute/requests/insert_firewall.rb index dcb79081f..cd2a09625 100644 --- a/lib/fog/compute/google/requests/insert_firewall.rb +++ b/lib/fog/google/compute/requests/insert_firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_firewall(_firewall_name, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_forwarding_rule.rb b/lib/fog/google/compute/requests/insert_forwarding_rule.rb similarity index 95% rename from lib/fog/compute/google/requests/insert_forwarding_rule.rb rename to lib/fog/google/compute/requests/insert_forwarding_rule.rb index 435c05194..0b151873f 100644 --- a/lib/fog/compute/google/requests/insert_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/insert_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_forwarding_rule(_rule_name, _region, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_global_address.rb b/lib/fog/google/compute/requests/insert_global_address.rb similarity index 95% rename from lib/fog/compute/google/requests/insert_global_address.rb rename to lib/fog/google/compute/requests/insert_global_address.rb index 751b15f46..19ff4f0a1 100644 --- a/lib/fog/compute/google/requests/insert_global_address.rb +++ b/lib/fog/google/compute/requests/insert_global_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_global_address(_address_name, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_global_forwarding_rule.rb b/lib/fog/google/compute/requests/insert_global_forwarding_rule.rb similarity index 95% rename from lib/fog/compute/google/requests/insert_global_forwarding_rule.rb rename to lib/fog/google/compute/requests/insert_global_forwarding_rule.rb index fc66a879b..815d7685c 100644 --- a/lib/fog/compute/google/requests/insert_global_forwarding_rule.rb +++ b/lib/fog/google/compute/requests/insert_global_forwarding_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_global_forwarding_rule(_rule_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_http_health_check.rb b/lib/fog/google/compute/requests/insert_http_health_check.rb similarity index 93% rename from lib/fog/compute/google/requests/insert_http_health_check.rb rename to lib/fog/google/compute/requests/insert_http_health_check.rb index b82feccb8..a7bb78d40 100644 --- a/lib/fog/compute/google/requests/insert_http_health_check.rb +++ b/lib/fog/google/compute/requests/insert_http_health_check.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_http_health_check(_check_name, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_image.rb b/lib/fog/google/compute/requests/insert_image.rb similarity index 93% rename from lib/fog/compute/google/requests/insert_image.rb rename to lib/fog/google/compute/requests/insert_image.rb index 7f1700b42..413ce66b4 100644 --- a/lib/fog/compute/google/requests/insert_image.rb +++ b/lib/fog/google/compute/requests/insert_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_image(_image_name, _image = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_instance_group.rb b/lib/fog/google/compute/requests/insert_instance_group.rb similarity index 96% rename from lib/fog/compute/google/requests/insert_instance_group.rb rename to lib/fog/google/compute/requests/insert_instance_group.rb index 6ca08c363..d648878af 100644 --- a/lib/fog/compute/google/requests/insert_instance_group.rb +++ b/lib/fog/google/compute/requests/insert_instance_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_instance_group(_group_name, _zone, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_instance_group_manager.rb b/lib/fog/google/compute/requests/insert_instance_group_manager.rb similarity index 96% rename from lib/fog/compute/google/requests/insert_instance_group_manager.rb rename to lib/fog/google/compute/requests/insert_instance_group_manager.rb index 90fabdaaa..547d6d7cb 100644 --- a/lib/fog/compute/google/requests/insert_instance_group_manager.rb +++ b/lib/fog/google/compute/requests/insert_instance_group_manager.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_instance_group_manager(_name, _zone, _instance_template, _base_instance_name, _target_size, _target_pools, _named_ports, _description) diff --git a/lib/fog/compute/google/requests/insert_instance_template.rb b/lib/fog/google/compute/requests/insert_instance_template.rb similarity index 97% rename from lib/fog/compute/google/requests/insert_instance_template.rb rename to lib/fog/google/compute/requests/insert_instance_template.rb index 5858be6b5..7a88ffa3f 100644 --- a/lib/fog/compute/google/requests/insert_instance_template.rb +++ b/lib/fog/google/compute/requests/insert_instance_template.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_instance_template(_name, _properties, _description) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_network.rb b/lib/fog/google/compute/requests/insert_network.rb similarity index 93% rename from lib/fog/compute/google/requests/insert_network.rb rename to lib/fog/google/compute/requests/insert_network.rb index a87c93efb..cfde18d73 100644 --- a/lib/fog/compute/google/requests/insert_network.rb +++ b/lib/fog/google/compute/requests/insert_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_network(_network_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_route.rb b/lib/fog/google/compute/requests/insert_route.rb similarity index 96% rename from lib/fog/compute/google/requests/insert_route.rb rename to lib/fog/google/compute/requests/insert_route.rb index 56bb6e28c..08eeff86c 100644 --- a/lib/fog/compute/google/requests/insert_route.rb +++ b/lib/fog/google/compute/requests/insert_route.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_route(_route_name, _network, _dest_range, _priority, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_server.rb b/lib/fog/google/compute/requests/insert_server.rb similarity index 97% rename from lib/fog/compute/google/requests/insert_server.rb rename to lib/fog/google/compute/requests/insert_server.rb index 3552199f5..5180795c3 100644 --- a/lib/fog/compute/google/requests/insert_server.rb +++ b/lib/fog/google/compute/requests/insert_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_server(_instance_name, _zone, _options = {}) # :no-coverage: @@ -42,7 +42,7 @@ def process_network_interfaces(network_interfaces) # This method allows you to use low-level request options and thus # expects instance options similar to API requests. If you don't need to # modify low-level request options, consider using the - # Fog::Compute::Google::Servers collection object instead. + # Fog::Google::Compute::Servers collection object instead. # # @example minimal server creation # my_operation = client.insert_server( diff --git a/lib/fog/compute/google/requests/insert_ssl_certificate.rb b/lib/fog/google/compute/requests/insert_ssl_certificate.rb similarity index 95% rename from lib/fog/compute/google/requests/insert_ssl_certificate.rb rename to lib/fog/google/compute/requests/insert_ssl_certificate.rb index b4b29eaa0..08985bf84 100644 --- a/lib/fog/compute/google/requests/insert_ssl_certificate.rb +++ b/lib/fog/google/compute/requests/insert_ssl_certificate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_ssl_certificate(_certificate_name, _certificate, _private_key, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_subnetwork.rb b/lib/fog/google/compute/requests/insert_subnetwork.rb similarity index 98% rename from lib/fog/compute/google/requests/insert_subnetwork.rb rename to lib/fog/google/compute/requests/insert_subnetwork.rb index 9fb8be94c..171f41aca 100644 --- a/lib/fog/compute/google/requests/insert_subnetwork.rb +++ b/lib/fog/google/compute/requests/insert_subnetwork.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_subnetwork(_subnetwork_name, _region_name, _network, _ip_range, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_target_http_proxy.rb b/lib/fog/google/compute/requests/insert_target_http_proxy.rb similarity index 94% rename from lib/fog/compute/google/requests/insert_target_http_proxy.rb rename to lib/fog/google/compute/requests/insert_target_http_proxy.rb index 877b3bb3c..09af9a98a 100644 --- a/lib/fog/compute/google/requests/insert_target_http_proxy.rb +++ b/lib/fog/google/compute/requests/insert_target_http_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_target_http_proxy(_proxy_name, _description: nil, _url_map: nil) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_target_https_proxy.rb b/lib/fog/google/compute/requests/insert_target_https_proxy.rb similarity index 95% rename from lib/fog/compute/google/requests/insert_target_https_proxy.rb rename to lib/fog/google/compute/requests/insert_target_https_proxy.rb index aeecd060c..9d90d7e9d 100644 --- a/lib/fog/compute/google/requests/insert_target_https_proxy.rb +++ b/lib/fog/google/compute/requests/insert_target_https_proxy.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_target_https_proxy(_proxy_name, _description: nil, _url_map: nil, _ssl_certificates: nil) diff --git a/lib/fog/compute/google/requests/insert_target_instance.rb b/lib/fog/google/compute/requests/insert_target_instance.rb similarity index 94% rename from lib/fog/compute/google/requests/insert_target_instance.rb rename to lib/fog/google/compute/requests/insert_target_instance.rb index 02b66b474..befd7af43 100644 --- a/lib/fog/compute/google/requests/insert_target_instance.rb +++ b/lib/fog/google/compute/requests/insert_target_instance.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_target_instance(_target_name, _zone, _target_instance = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_target_pool.rb b/lib/fog/google/compute/requests/insert_target_pool.rb similarity index 94% rename from lib/fog/compute/google/requests/insert_target_pool.rb rename to lib/fog/google/compute/requests/insert_target_pool.rb index 634a7ddcf..d65aade4c 100644 --- a/lib/fog/compute/google/requests/insert_target_pool.rb +++ b/lib/fog/google/compute/requests/insert_target_pool.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_target_pool(_target_pool_name, _region, _target_pool = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/insert_url_map.rb b/lib/fog/google/compute/requests/insert_url_map.rb similarity index 97% rename from lib/fog/compute/google/requests/insert_url_map.rb rename to lib/fog/google/compute/requests/insert_url_map.rb index 9297e2789..efd8020ee 100644 --- a/lib/fog/compute/google/requests/insert_url_map.rb +++ b/lib/fog/google/compute/requests/insert_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def insert_url_map(_url_map_name, _url_map = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/invalidate_url_map_cache.rb b/lib/fog/google/compute/requests/invalidate_url_map_cache.rb similarity index 94% rename from lib/fog/compute/google/requests/invalidate_url_map_cache.rb rename to lib/fog/google/compute/requests/invalidate_url_map_cache.rb index ef2358c53..fb8f71992 100644 --- a/lib/fog/compute/google/requests/invalidate_url_map_cache.rb +++ b/lib/fog/google/compute/requests/invalidate_url_map_cache.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def invalidate_url_map_cache(_url_map_name, _path, _host = nil) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_addresses.rb b/lib/fog/google/compute/requests/list_addresses.rb similarity index 95% rename from lib/fog/compute/google/requests/list_addresses.rb rename to lib/fog/google/compute/requests/list_addresses.rb index aedc91d9a..b24147b6e 100644 --- a/lib/fog/compute/google/requests/list_addresses.rb +++ b/lib/fog/google/compute/requests/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_addresses(_region_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_addresses.rb b/lib/fog/google/compute/requests/list_aggregated_addresses.rb similarity index 95% rename from lib/fog/compute/google/requests/list_aggregated_addresses.rb rename to lib/fog/google/compute/requests/list_aggregated_addresses.rb index e0414d793..79cd74fc4 100644 --- a/lib/fog/compute/google/requests/list_aggregated_addresses.rb +++ b/lib/fog/google/compute/requests/list_aggregated_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_addresses(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_disk_types.rb b/lib/fog/google/compute/requests/list_aggregated_disk_types.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_disk_types.rb rename to lib/fog/google/compute/requests/list_aggregated_disk_types.rb index efb3f385e..bac0c328b 100644 --- a/lib/fog/compute/google/requests/list_aggregated_disk_types.rb +++ b/lib/fog/google/compute/requests/list_aggregated_disk_types.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_disk_types(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_disks.rb b/lib/fog/google/compute/requests/list_aggregated_disks.rb similarity index 96% rename from lib/fog/compute/google/requests/list_aggregated_disks.rb rename to lib/fog/google/compute/requests/list_aggregated_disks.rb index e371c4872..b068d247c 100644 --- a/lib/fog/compute/google/requests/list_aggregated_disks.rb +++ b/lib/fog/google/compute/requests/list_aggregated_disks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_disks(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_forwarding_rules.rb b/lib/fog/google/compute/requests/list_aggregated_forwarding_rules.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_forwarding_rules.rb rename to lib/fog/google/compute/requests/list_aggregated_forwarding_rules.rb index 58a5b31c9..44c9a327b 100644 --- a/lib/fog/compute/google/requests/list_aggregated_forwarding_rules.rb +++ b/lib/fog/google/compute/requests/list_aggregated_forwarding_rules.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_forwarding_rules(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_instance_group_managers.rb b/lib/fog/google/compute/requests/list_aggregated_instance_group_managers.rb similarity index 95% rename from lib/fog/compute/google/requests/list_aggregated_instance_group_managers.rb rename to lib/fog/google/compute/requests/list_aggregated_instance_group_managers.rb index 2d6355be4..7c5adb133 100644 --- a/lib/fog/compute/google/requests/list_aggregated_instance_group_managers.rb +++ b/lib/fog/google/compute/requests/list_aggregated_instance_group_managers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_instance_group_managers(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_instance_groups.rb b/lib/fog/google/compute/requests/list_aggregated_instance_groups.rb similarity index 91% rename from lib/fog/compute/google/requests/list_aggregated_instance_groups.rb rename to lib/fog/google/compute/requests/list_aggregated_instance_groups.rb index 171a045de..0057f3a5c 100644 --- a/lib/fog/compute/google/requests/list_aggregated_instance_groups.rb +++ b/lib/fog/google/compute/requests/list_aggregated_instance_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_instance_groups(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_machine_types.rb b/lib/fog/google/compute/requests/list_aggregated_machine_types.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_machine_types.rb rename to lib/fog/google/compute/requests/list_aggregated_machine_types.rb index acb4721e6..1997ed0f2 100644 --- a/lib/fog/compute/google/requests/list_aggregated_machine_types.rb +++ b/lib/fog/google/compute/requests/list_aggregated_machine_types.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_machine_types(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_servers.rb b/lib/fog/google/compute/requests/list_aggregated_servers.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_servers.rb rename to lib/fog/google/compute/requests/list_aggregated_servers.rb index f11dcf9ab..3e0f4a3d7 100644 --- a/lib/fog/compute/google/requests/list_aggregated_servers.rb +++ b/lib/fog/google/compute/requests/list_aggregated_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_servers(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_subnetworks.rb b/lib/fog/google/compute/requests/list_aggregated_subnetworks.rb similarity index 97% rename from lib/fog/compute/google/requests/list_aggregated_subnetworks.rb rename to lib/fog/google/compute/requests/list_aggregated_subnetworks.rb index 1bd73b4d4..8bbba93e4 100644 --- a/lib/fog/compute/google/requests/list_aggregated_subnetworks.rb +++ b/lib/fog/google/compute/requests/list_aggregated_subnetworks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_subnetworks(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_target_instances.rb b/lib/fog/google/compute/requests/list_aggregated_target_instances.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_target_instances.rb rename to lib/fog/google/compute/requests/list_aggregated_target_instances.rb index 41c78b223..2a2a77b70 100644 --- a/lib/fog/compute/google/requests/list_aggregated_target_instances.rb +++ b/lib/fog/google/compute/requests/list_aggregated_target_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_target_instances(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_aggregated_target_pools.rb b/lib/fog/google/compute/requests/list_aggregated_target_pools.rb similarity index 94% rename from lib/fog/compute/google/requests/list_aggregated_target_pools.rb rename to lib/fog/google/compute/requests/list_aggregated_target_pools.rb index dc6e76996..c8a51e997 100644 --- a/lib/fog/compute/google/requests/list_aggregated_target_pools.rb +++ b/lib/fog/google/compute/requests/list_aggregated_target_pools.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_aggregated_target_pools(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_backend_services.rb b/lib/fog/google/compute/requests/list_backend_services.rb similarity index 95% rename from lib/fog/compute/google/requests/list_backend_services.rb rename to lib/fog/google/compute/requests/list_backend_services.rb index 806ca457f..deabf3eaa 100644 --- a/lib/fog/compute/google/requests/list_backend_services.rb +++ b/lib/fog/google/compute/requests/list_backend_services.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_backend_services backend_services = data[:backend_services].values diff --git a/lib/fog/compute/google/requests/list_disk_types.rb b/lib/fog/google/compute/requests/list_disk_types.rb similarity index 94% rename from lib/fog/compute/google/requests/list_disk_types.rb rename to lib/fog/google/compute/requests/list_disk_types.rb index a2142febf..193b81501 100644 --- a/lib/fog/compute/google/requests/list_disk_types.rb +++ b/lib/fog/google/compute/requests/list_disk_types.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_disk_types(_zone, _options: {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_disks.rb b/lib/fog/google/compute/requests/list_disks.rb similarity index 95% rename from lib/fog/compute/google/requests/list_disks.rb rename to lib/fog/google/compute/requests/list_disks.rb index 2856dc2e5..b10f8a5d4 100644 --- a/lib/fog/compute/google/requests/list_disks.rb +++ b/lib/fog/google/compute/requests/list_disks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_disks(_zone_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_firewalls.rb b/lib/fog/google/compute/requests/list_firewalls.rb similarity index 94% rename from lib/fog/compute/google/requests/list_firewalls.rb rename to lib/fog/google/compute/requests/list_firewalls.rb index c49415101..46231f045 100644 --- a/lib/fog/compute/google/requests/list_firewalls.rb +++ b/lib/fog/google/compute/requests/list_firewalls.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_firewalls # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_forwarding_rules.rb b/lib/fog/google/compute/requests/list_forwarding_rules.rb similarity index 94% rename from lib/fog/compute/google/requests/list_forwarding_rules.rb rename to lib/fog/google/compute/requests/list_forwarding_rules.rb index 4bf8cf776..3436471e7 100644 --- a/lib/fog/compute/google/requests/list_forwarding_rules.rb +++ b/lib/fog/google/compute/requests/list_forwarding_rules.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_forwarding_rules(_region, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_global_addresses.rb b/lib/fog/google/compute/requests/list_global_addresses.rb similarity index 96% rename from lib/fog/compute/google/requests/list_global_addresses.rb rename to lib/fog/google/compute/requests/list_global_addresses.rb index 135e71871..7156b8dc6 100644 --- a/lib/fog/compute/google/requests/list_global_addresses.rb +++ b/lib/fog/google/compute/requests/list_global_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_global_addresses(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_global_forwarding_rules.rb b/lib/fog/google/compute/requests/list_global_forwarding_rules.rb similarity index 94% rename from lib/fog/compute/google/requests/list_global_forwarding_rules.rb rename to lib/fog/google/compute/requests/list_global_forwarding_rules.rb index 3d7e5e3dd..b35babb61 100644 --- a/lib/fog/compute/google/requests/list_global_forwarding_rules.rb +++ b/lib/fog/google/compute/requests/list_global_forwarding_rules.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_global_forwarding_rules(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_global_operations.rb b/lib/fog/google/compute/requests/list_global_operations.rb similarity index 95% rename from lib/fog/compute/google/requests/list_global_operations.rb rename to lib/fog/google/compute/requests/list_global_operations.rb index 462fdda5d..33e96256f 100644 --- a/lib/fog/compute/google/requests/list_global_operations.rb +++ b/lib/fog/google/compute/requests/list_global_operations.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_global_operations # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_http_health_checks.rb b/lib/fog/google/compute/requests/list_http_health_checks.rb similarity index 94% rename from lib/fog/compute/google/requests/list_http_health_checks.rb rename to lib/fog/google/compute/requests/list_http_health_checks.rb index d107be8ef..64072b7a9 100644 --- a/lib/fog/compute/google/requests/list_http_health_checks.rb +++ b/lib/fog/google/compute/requests/list_http_health_checks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_http_health_checks # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_images.rb b/lib/fog/google/compute/requests/list_images.rb similarity index 94% rename from lib/fog/compute/google/requests/list_images.rb rename to lib/fog/google/compute/requests/list_images.rb index 0fb799e13..7f7cc583a 100644 --- a/lib/fog/compute/google/requests/list_images.rb +++ b/lib/fog/google/compute/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_images(_project = @project, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_instance_group_instances.rb b/lib/fog/google/compute/requests/list_instance_group_instances.rb similarity index 93% rename from lib/fog/compute/google/requests/list_instance_group_instances.rb rename to lib/fog/google/compute/requests/list_instance_group_instances.rb index 93762dc3c..bf68e9525 100644 --- a/lib/fog/compute/google/requests/list_instance_group_instances.rb +++ b/lib/fog/google/compute/requests/list_instance_group_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_instance_group_instances(_group, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_instance_group_managers.rb b/lib/fog/google/compute/requests/list_instance_group_managers.rb similarity index 94% rename from lib/fog/compute/google/requests/list_instance_group_managers.rb rename to lib/fog/google/compute/requests/list_instance_group_managers.rb index c7b1b36fe..8cab7915c 100644 --- a/lib/fog/compute/google/requests/list_instance_group_managers.rb +++ b/lib/fog/google/compute/requests/list_instance_group_managers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_instance_group_managers(_zone, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_instance_groups.rb b/lib/fog/google/compute/requests/list_instance_groups.rb similarity index 90% rename from lib/fog/compute/google/requests/list_instance_groups.rb rename to lib/fog/google/compute/requests/list_instance_groups.rb index 8ab83ff93..f1cac163f 100644 --- a/lib/fog/compute/google/requests/list_instance_groups.rb +++ b/lib/fog/google/compute/requests/list_instance_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_instance_groups(_zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_instance_templates.rb b/lib/fog/google/compute/requests/list_instance_templates.rb similarity index 94% rename from lib/fog/compute/google/requests/list_instance_templates.rb rename to lib/fog/google/compute/requests/list_instance_templates.rb index 4e62ee2da..c7c234319 100644 --- a/lib/fog/compute/google/requests/list_instance_templates.rb +++ b/lib/fog/google/compute/requests/list_instance_templates.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_instance_templates # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_machine_types.rb b/lib/fog/google/compute/requests/list_machine_types.rb similarity index 95% rename from lib/fog/compute/google/requests/list_machine_types.rb rename to lib/fog/google/compute/requests/list_machine_types.rb index b204c58fb..e8023fd7d 100644 --- a/lib/fog/compute/google/requests/list_machine_types.rb +++ b/lib/fog/google/compute/requests/list_machine_types.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_machine_types(_zone, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_networks.rb b/lib/fog/google/compute/requests/list_networks.rb similarity index 94% rename from lib/fog/compute/google/requests/list_networks.rb rename to lib/fog/google/compute/requests/list_networks.rb index e12666562..98e93c116 100644 --- a/lib/fog/compute/google/requests/list_networks.rb +++ b/lib/fog/google/compute/requests/list_networks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_networks(_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_region_operations.rb b/lib/fog/google/compute/requests/list_region_operations.rb similarity index 96% rename from lib/fog/compute/google/requests/list_region_operations.rb rename to lib/fog/google/compute/requests/list_region_operations.rb index b437becab..b4ce3b3e7 100644 --- a/lib/fog/compute/google/requests/list_region_operations.rb +++ b/lib/fog/google/compute/requests/list_region_operations.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_region_operations(_region) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_regions.rb b/lib/fog/google/compute/requests/list_regions.rb similarity index 93% rename from lib/fog/compute/google/requests/list_regions.rb rename to lib/fog/google/compute/requests/list_regions.rb index d06aec40a..3f3a00b19 100644 --- a/lib/fog/compute/google/requests/list_regions.rb +++ b/lib/fog/google/compute/requests/list_regions.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_regions # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_routes.rb b/lib/fog/google/compute/requests/list_routes.rb similarity index 95% rename from lib/fog/compute/google/requests/list_routes.rb rename to lib/fog/google/compute/requests/list_routes.rb index 0ec96d21d..daa9ec448 100644 --- a/lib/fog/compute/google/requests/list_routes.rb +++ b/lib/fog/google/compute/requests/list_routes.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_routes(_options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_servers.rb b/lib/fog/google/compute/requests/list_servers.rb similarity index 94% rename from lib/fog/compute/google/requests/list_servers.rb rename to lib/fog/google/compute/requests/list_servers.rb index 5c97e285b..cb94949bb 100644 --- a/lib/fog/compute/google/requests/list_servers.rb +++ b/lib/fog/google/compute/requests/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_servers(_zone, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_snapshots.rb b/lib/fog/google/compute/requests/list_snapshots.rb similarity index 94% rename from lib/fog/compute/google/requests/list_snapshots.rb rename to lib/fog/google/compute/requests/list_snapshots.rb index 754773bc8..7e32e3541 100644 --- a/lib/fog/compute/google/requests/list_snapshots.rb +++ b/lib/fog/google/compute/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_snapshots # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_ssl_certificates.rb b/lib/fog/google/compute/requests/list_ssl_certificates.rb similarity index 94% rename from lib/fog/compute/google/requests/list_ssl_certificates.rb rename to lib/fog/google/compute/requests/list_ssl_certificates.rb index 99d747f08..f1afd53d5 100644 --- a/lib/fog/compute/google/requests/list_ssl_certificates.rb +++ b/lib/fog/google/compute/requests/list_ssl_certificates.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_ssl_certificates # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_subnetworks.rb b/lib/fog/google/compute/requests/list_subnetworks.rb similarity index 97% rename from lib/fog/compute/google/requests/list_subnetworks.rb rename to lib/fog/google/compute/requests/list_subnetworks.rb index e96bab1d8..c460060c2 100644 --- a/lib/fog/compute/google/requests/list_subnetworks.rb +++ b/lib/fog/google/compute/requests/list_subnetworks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_subnetworks(_region_name, _filter: nil, _max_results: nil, _order_by: nil, _page_token: nil) diff --git a/lib/fog/compute/google/requests/list_target_http_proxies.rb b/lib/fog/google/compute/requests/list_target_http_proxies.rb similarity index 95% rename from lib/fog/compute/google/requests/list_target_http_proxies.rb rename to lib/fog/google/compute/requests/list_target_http_proxies.rb index 328ab7f8a..79f5a14c6 100644 --- a/lib/fog/compute/google/requests/list_target_http_proxies.rb +++ b/lib/fog/google/compute/requests/list_target_http_proxies.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_target_http_proxies(_filter: nil, _max_results: nil, _order_by: nil, _page_token: nil) diff --git a/lib/fog/compute/google/requests/list_target_https_proxies.rb b/lib/fog/google/compute/requests/list_target_https_proxies.rb similarity index 94% rename from lib/fog/compute/google/requests/list_target_https_proxies.rb rename to lib/fog/google/compute/requests/list_target_https_proxies.rb index 1b4538584..7fdf57690 100644 --- a/lib/fog/compute/google/requests/list_target_https_proxies.rb +++ b/lib/fog/google/compute/requests/list_target_https_proxies.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_target_https_proxies # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_target_instances.rb b/lib/fog/google/compute/requests/list_target_instances.rb similarity index 95% rename from lib/fog/compute/google/requests/list_target_instances.rb rename to lib/fog/google/compute/requests/list_target_instances.rb index 36e5b6e61..46adf359a 100644 --- a/lib/fog/compute/google/requests/list_target_instances.rb +++ b/lib/fog/google/compute/requests/list_target_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_target_instances(_zone, _opts: {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_target_pools.rb b/lib/fog/google/compute/requests/list_target_pools.rb similarity index 94% rename from lib/fog/compute/google/requests/list_target_pools.rb rename to lib/fog/google/compute/requests/list_target_pools.rb index 66d858802..bcc66da54 100644 --- a/lib/fog/compute/google/requests/list_target_pools.rb +++ b/lib/fog/google/compute/requests/list_target_pools.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_target_pools(_region, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_url_maps.rb b/lib/fog/google/compute/requests/list_url_maps.rb similarity index 94% rename from lib/fog/compute/google/requests/list_url_maps.rb rename to lib/fog/google/compute/requests/list_url_maps.rb index 86bf74889..d8f290dce 100644 --- a/lib/fog/compute/google/requests/list_url_maps.rb +++ b/lib/fog/google/compute/requests/list_url_maps.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_url_maps(_filter: nil, _max_results: nil, _order_by: nil, _page_token: nil) diff --git a/lib/fog/compute/google/requests/list_zone_operations.rb b/lib/fog/google/compute/requests/list_zone_operations.rb similarity index 95% rename from lib/fog/compute/google/requests/list_zone_operations.rb rename to lib/fog/google/compute/requests/list_zone_operations.rb index 4dec9f8df..57ad867c5 100644 --- a/lib/fog/compute/google/requests/list_zone_operations.rb +++ b/lib/fog/google/compute/requests/list_zone_operations.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_zone_operations(_zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/list_zones.rb b/lib/fog/google/compute/requests/list_zones.rb similarity index 94% rename from lib/fog/compute/google/requests/list_zones.rb rename to lib/fog/google/compute/requests/list_zones.rb index ec86642e5..fc229d735 100644 --- a/lib/fog/compute/google/requests/list_zones.rb +++ b/lib/fog/google/compute/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def list_zones # :no-coverage: diff --git a/lib/fog/compute/google/requests/patch_firewall.rb b/lib/fog/google/compute/requests/patch_firewall.rb similarity index 95% rename from lib/fog/compute/google/requests/patch_firewall.rb rename to lib/fog/google/compute/requests/patch_firewall.rb index 089a7a818..fc8ec14e4 100644 --- a/lib/fog/compute/google/requests/patch_firewall.rb +++ b/lib/fog/google/compute/requests/patch_firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def patch_firewall(_firewall_name, _firewall_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/patch_url_map.rb b/lib/fog/google/compute/requests/patch_url_map.rb similarity index 92% rename from lib/fog/compute/google/requests/patch_url_map.rb rename to lib/fog/google/compute/requests/patch_url_map.rb index 187534caa..e8e6247b7 100644 --- a/lib/fog/compute/google/requests/patch_url_map.rb +++ b/lib/fog/google/compute/requests/patch_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def patch_url_map(_url_map_name, _options = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/recreate_instances.rb b/lib/fog/google/compute/requests/recreate_instances.rb similarity index 96% rename from lib/fog/compute/google/requests/recreate_instances.rb rename to lib/fog/google/compute/requests/recreate_instances.rb index dfeea6705..16fb4108b 100644 --- a/lib/fog/compute/google/requests/recreate_instances.rb +++ b/lib/fog/google/compute/requests/recreate_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def recreate_instances(_instance_group_manager, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/remove_instance_group_instances.rb b/lib/fog/google/compute/requests/remove_instance_group_instances.rb similarity index 96% rename from lib/fog/compute/google/requests/remove_instance_group_instances.rb rename to lib/fog/google/compute/requests/remove_instance_group_instances.rb index 6502c1a30..34acc258d 100644 --- a/lib/fog/compute/google/requests/remove_instance_group_instances.rb +++ b/lib/fog/google/compute/requests/remove_instance_group_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def add_instance_group_instances(_group, _zone, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/remove_target_pool_health_checks.rb b/lib/fog/google/compute/requests/remove_target_pool_health_checks.rb similarity index 95% rename from lib/fog/compute/google/requests/remove_target_pool_health_checks.rb rename to lib/fog/google/compute/requests/remove_target_pool_health_checks.rb index 919015c53..0cebe19ed 100644 --- a/lib/fog/compute/google/requests/remove_target_pool_health_checks.rb +++ b/lib/fog/google/compute/requests/remove_target_pool_health_checks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def remove_target_pool_health_checks(_target_pool, _region, _health_checks) # :no-coverage: diff --git a/lib/fog/compute/google/requests/remove_target_pool_instance.rb b/lib/fog/google/compute/requests/remove_target_pool_instance.rb similarity index 95% rename from lib/fog/compute/google/requests/remove_target_pool_instance.rb rename to lib/fog/google/compute/requests/remove_target_pool_instance.rb index 00f31376f..0d810a537 100644 --- a/lib/fog/compute/google/requests/remove_target_pool_instance.rb +++ b/lib/fog/google/compute/requests/remove_target_pool_instance.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def remove_target_pool_instances(_target_pool, _region, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/remove_target_pool_instances.rb b/lib/fog/google/compute/requests/remove_target_pool_instances.rb similarity index 95% rename from lib/fog/compute/google/requests/remove_target_pool_instances.rb rename to lib/fog/google/compute/requests/remove_target_pool_instances.rb index 31669710f..981657e65 100644 --- a/lib/fog/compute/google/requests/remove_target_pool_instances.rb +++ b/lib/fog/google/compute/requests/remove_target_pool_instances.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def remove_target_pool_instances(_target_pool, _region, _instances) # :no-coverage: diff --git a/lib/fog/compute/google/requests/reset_server.rb b/lib/fog/google/compute/requests/reset_server.rb similarity index 91% rename from lib/fog/compute/google/requests/reset_server.rb rename to lib/fog/google/compute/requests/reset_server.rb index 54165d767..843a28c76 100644 --- a/lib/fog/compute/google/requests/reset_server.rb +++ b/lib/fog/google/compute/requests/reset_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def reset_server(_identity, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/reset_windows_password.rb b/lib/fog/google/compute/requests/reset_windows_password.rb similarity index 99% rename from lib/fog/compute/google/requests/reset_windows_password.rb rename to lib/fog/google/compute/requests/reset_windows_password.rb index aa0b6f1a0..d6036c67c 100644 --- a/lib/fog/compute/google/requests/reset_windows_password.rb +++ b/lib/fog/google/compute/requests/reset_windows_password.rb @@ -22,8 +22,8 @@ require "json" module Fog - module Compute - class Google + module Google + class Compute class Mock def reset_windows_password(_server:, _user:) Fog::Mock.not_implemented diff --git a/lib/fog/compute/google/requests/set_common_instance_metadata.rb b/lib/fog/google/compute/requests/set_common_instance_metadata.rb similarity index 94% rename from lib/fog/compute/google/requests/set_common_instance_metadata.rb rename to lib/fog/google/compute/requests/set_common_instance_metadata.rb index 124c02e6e..d251d9823 100644 --- a/lib/fog/compute/google/requests/set_common_instance_metadata.rb +++ b/lib/fog/google/compute/requests/set_common_instance_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_common_instance_metadata(_project, _current_fingerprint, _metadata = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_forwarding_rule_target.rb b/lib/fog/google/compute/requests/set_forwarding_rule_target.rb similarity index 94% rename from lib/fog/compute/google/requests/set_forwarding_rule_target.rb rename to lib/fog/google/compute/requests/set_forwarding_rule_target.rb index badc04fc9..47e70b77c 100644 --- a/lib/fog/compute/google/requests/set_forwarding_rule_target.rb +++ b/lib/fog/google/compute/requests/set_forwarding_rule_target.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_forwarding_rule_target(_rule_name, _region, _target_opts) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_global_forwarding_rule_target.rb b/lib/fog/google/compute/requests/set_global_forwarding_rule_target.rb similarity index 93% rename from lib/fog/compute/google/requests/set_global_forwarding_rule_target.rb rename to lib/fog/google/compute/requests/set_global_forwarding_rule_target.rb index 869153d61..92486ad24 100644 --- a/lib/fog/compute/google/requests/set_global_forwarding_rule_target.rb +++ b/lib/fog/google/compute/requests/set_global_forwarding_rule_target.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_global_forwarding_rule_target(_rule_name, _target) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_instance_template.rb b/lib/fog/google/compute/requests/set_instance_template.rb similarity index 96% rename from lib/fog/compute/google/requests/set_instance_template.rb rename to lib/fog/google/compute/requests/set_instance_template.rb index 3243fc00f..aa991b569 100644 --- a/lib/fog/compute/google/requests/set_instance_template.rb +++ b/lib/fog/google/compute/requests/set_instance_template.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_instance_template(_instance_group_manager, _instance_template) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_server_disk_auto_delete.rb b/lib/fog/google/compute/requests/set_server_disk_auto_delete.rb similarity index 94% rename from lib/fog/compute/google/requests/set_server_disk_auto_delete.rb rename to lib/fog/google/compute/requests/set_server_disk_auto_delete.rb index 227be4d64..aa7171f53 100644 --- a/lib/fog/compute/google/requests/set_server_disk_auto_delete.rb +++ b/lib/fog/google/compute/requests/set_server_disk_auto_delete.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_server_disk_auto_delete(_identity, _zone, _auto_delete, _device_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_server_machine_type.rb b/lib/fog/google/compute/requests/set_server_machine_type.rb similarity index 95% rename from lib/fog/compute/google/requests/set_server_machine_type.rb rename to lib/fog/google/compute/requests/set_server_machine_type.rb index a91400b23..8055e5bf7 100644 --- a/lib/fog/compute/google/requests/set_server_machine_type.rb +++ b/lib/fog/google/compute/requests/set_server_machine_type.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_server_machine_type(_instance, _zone, _machine_type) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_server_metadata.rb b/lib/fog/google/compute/requests/set_server_metadata.rb similarity index 97% rename from lib/fog/compute/google/requests/set_server_metadata.rb rename to lib/fog/google/compute/requests/set_server_metadata.rb index 433b6da34..162303e91 100644 --- a/lib/fog/compute/google/requests/set_server_metadata.rb +++ b/lib/fog/google/compute/requests/set_server_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_server_metadata(_instance, _zone, _fingerprint, _metadata_items = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_server_scheduling.rb b/lib/fog/google/compute/requests/set_server_scheduling.rb similarity index 96% rename from lib/fog/compute/google/requests/set_server_scheduling.rb rename to lib/fog/google/compute/requests/set_server_scheduling.rb index c8973428a..fc7239aa9 100644 --- a/lib/fog/compute/google/requests/set_server_scheduling.rb +++ b/lib/fog/google/compute/requests/set_server_scheduling.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_server_scheduling(_identity, _zone, _on_host_maintenance, _automatic_restart, _preemptible) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_server_tags.rb b/lib/fog/google/compute/requests/set_server_tags.rb similarity index 94% rename from lib/fog/compute/google/requests/set_server_tags.rb rename to lib/fog/google/compute/requests/set_server_tags.rb index 5c739ea01..0886b5812 100644 --- a/lib/fog/compute/google/requests/set_server_tags.rb +++ b/lib/fog/google/compute/requests/set_server_tags.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_server_tags(_instance, _zone, _tags = []) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_snapshot_labels.rb b/lib/fog/google/compute/requests/set_snapshot_labels.rb similarity index 94% rename from lib/fog/compute/google/requests/set_snapshot_labels.rb rename to lib/fog/google/compute/requests/set_snapshot_labels.rb index 673c077bb..82535b7d6 100644 --- a/lib/fog/compute/google/requests/set_snapshot_labels.rb +++ b/lib/fog/google/compute/requests/set_snapshot_labels.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_snapshot_labels(_snap_name) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_subnetwork_private_ip_google_access.rb b/lib/fog/google/compute/requests/set_subnetwork_private_ip_google_access.rb similarity index 97% rename from lib/fog/compute/google/requests/set_subnetwork_private_ip_google_access.rb rename to lib/fog/google/compute/requests/set_subnetwork_private_ip_google_access.rb index 56368562c..97ed5d263 100644 --- a/lib/fog/compute/google/requests/set_subnetwork_private_ip_google_access.rb +++ b/lib/fog/google/compute/requests/set_subnetwork_private_ip_google_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_subnetwork_private_ip_google_access(_subnetwork_name, _region_name, diff --git a/lib/fog/compute/google/requests/set_target_http_proxy_url_map.rb b/lib/fog/google/compute/requests/set_target_http_proxy_url_map.rb similarity index 94% rename from lib/fog/compute/google/requests/set_target_http_proxy_url_map.rb rename to lib/fog/google/compute/requests/set_target_http_proxy_url_map.rb index 9460123a1..c99a578cd 100644 --- a/lib/fog/compute/google/requests/set_target_http_proxy_url_map.rb +++ b/lib/fog/google/compute/requests/set_target_http_proxy_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_target_http_proxy_url_map(_proxy_name, _url_map) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_target_https_proxy_ssl_certificates.rb b/lib/fog/google/compute/requests/set_target_https_proxy_ssl_certificates.rb similarity index 94% rename from lib/fog/compute/google/requests/set_target_https_proxy_ssl_certificates.rb rename to lib/fog/google/compute/requests/set_target_https_proxy_ssl_certificates.rb index f8cfc8296..067a9ac06 100644 --- a/lib/fog/compute/google/requests/set_target_https_proxy_ssl_certificates.rb +++ b/lib/fog/google/compute/requests/set_target_https_proxy_ssl_certificates.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_target_https_proxy_ssl_certificates(_proxy_name, _certs) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_target_https_proxy_url_map.rb b/lib/fog/google/compute/requests/set_target_https_proxy_url_map.rb similarity index 94% rename from lib/fog/compute/google/requests/set_target_https_proxy_url_map.rb rename to lib/fog/google/compute/requests/set_target_https_proxy_url_map.rb index 490449c6b..21877d85a 100644 --- a/lib/fog/compute/google/requests/set_target_https_proxy_url_map.rb +++ b/lib/fog/google/compute/requests/set_target_https_proxy_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_target_https_proxy_url_map(_proxy_name, _url_map) # :no-coverage: diff --git a/lib/fog/compute/google/requests/set_target_pool_backup.rb b/lib/fog/google/compute/requests/set_target_pool_backup.rb similarity index 95% rename from lib/fog/compute/google/requests/set_target_pool_backup.rb rename to lib/fog/google/compute/requests/set_target_pool_backup.rb index 1074c0489..a6675a0cc 100644 --- a/lib/fog/compute/google/requests/set_target_pool_backup.rb +++ b/lib/fog/google/compute/requests/set_target_pool_backup.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def set_target_pool_backup(_target_pool, _region, _backup_target, _failover_ratio: nil) diff --git a/lib/fog/compute/google/requests/start_server.rb b/lib/fog/google/compute/requests/start_server.rb similarity index 91% rename from lib/fog/compute/google/requests/start_server.rb rename to lib/fog/google/compute/requests/start_server.rb index 70bd56b6d..82a9ca115 100644 --- a/lib/fog/compute/google/requests/start_server.rb +++ b/lib/fog/google/compute/requests/start_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def start_server(_identity, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/stop_server.rb b/lib/fog/google/compute/requests/stop_server.rb similarity index 92% rename from lib/fog/compute/google/requests/stop_server.rb rename to lib/fog/google/compute/requests/stop_server.rb index 86c485b73..03548c61c 100644 --- a/lib/fog/compute/google/requests/stop_server.rb +++ b/lib/fog/google/compute/requests/stop_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def stop_server(_identity, _zone) # :no-coverage: diff --git a/lib/fog/compute/google/requests/update_firewall.rb b/lib/fog/google/compute/requests/update_firewall.rb similarity index 97% rename from lib/fog/compute/google/requests/update_firewall.rb rename to lib/fog/google/compute/requests/update_firewall.rb index eabce126a..57fc1934d 100644 --- a/lib/fog/compute/google/requests/update_firewall.rb +++ b/lib/fog/google/compute/requests/update_firewall.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def update_firewall(_firewall_name, _firewall_opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/update_http_health_check.rb b/lib/fog/google/compute/requests/update_http_health_check.rb similarity index 94% rename from lib/fog/compute/google/requests/update_http_health_check.rb rename to lib/fog/google/compute/requests/update_http_health_check.rb index f9906c976..009603e46 100644 --- a/lib/fog/compute/google/requests/update_http_health_check.rb +++ b/lib/fog/google/compute/requests/update_http_health_check.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def update_http_health_check(_check_name, _opts = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/update_url_map.rb b/lib/fog/google/compute/requests/update_url_map.rb similarity index 95% rename from lib/fog/compute/google/requests/update_url_map.rb rename to lib/fog/google/compute/requests/update_url_map.rb index 021a6377b..4cd5a96cb 100644 --- a/lib/fog/compute/google/requests/update_url_map.rb +++ b/lib/fog/google/compute/requests/update_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def update_url_map(_url_map_name, _url_map = {}) # :no-coverage: diff --git a/lib/fog/compute/google/requests/validate_url_map.rb b/lib/fog/google/compute/requests/validate_url_map.rb similarity index 94% rename from lib/fog/compute/google/requests/validate_url_map.rb rename to lib/fog/google/compute/requests/validate_url_map.rb index 47e6ee6f9..2b1bd84a9 100644 --- a/lib/fog/compute/google/requests/validate_url_map.rb +++ b/lib/fog/google/compute/requests/validate_url_map.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Google + module Google + class Compute class Mock def validate_url_map(_url_map_name, _url_map: {}) # :no-coverage: diff --git a/lib/fog/google/shared.rb b/lib/fog/google/shared.rb index a70e75697..7c5a1bdf0 100644 --- a/lib/fog/google/shared.rb +++ b/lib/fog/google/shared.rb @@ -40,16 +40,16 @@ def initialize_google_client(options) begin # TODO: google-api-client is in gemspec now, re-assess if this initialization logic is still needed require "google/apis/monitoring_#{Fog::Google::Monitoring::GOOGLE_MONITORING_API_VERSION}" - require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}" + require "google/apis/compute_#{Fog::Google::Compute::GOOGLE_COMPUTE_API_VERSION}" require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}" require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}" require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}" require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}" require "google/apis/iamcredentials_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}" require "googleauth" - rescue LoadError => error + rescue LoadError => e Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider") - raise error + raise e end validate_client_options(options) @@ -93,6 +93,7 @@ def initialize_auth(options) def apply_client_options(service, options = {}) google_client_options = options[:google_client_options] return if google_client_options.nil? || google_client_options.empty? + (service.client_options.members & google_client_options.keys).each do |option| service.client_options[option] = google_client_options[option] end @@ -176,7 +177,7 @@ def process_fallback_auth(options) ) begin return process_application_default_auth(options) - rescue + rescue StandardError raise Fog::Errors::Error.new( "Fallback auth failed, could not configure authentication for Fog client.\n" \ "Check your auth options, must be one of:\n" \ diff --git a/test/integration/compute/core_compute/test_client_options.rb b/test/integration/compute/core_compute/test_client_options.rb index 0dfbd72a3..9b18b59ea 100644 --- a/test/integration/compute/core_compute/test_client_options.rb +++ b/test/integration/compute/core_compute/test_client_options.rb @@ -4,7 +4,7 @@ class TestComputeClient < FogIntegrationTest def test_client_options # XXX This is a very rudimentary test checking that proxy option is applied client_options = { proxy_url: "https://user:password@host:8080" } - connection = Fog::Compute::Google.new(google_client_options: client_options) + connection = Fog::Google::Compute.new(google_client_options: client_options) err = assert_raises(ArgumentError) { connection.servers.all } assert_match(/unsupported proxy/, err.message) diff --git a/test/integration/compute/core_compute/test_disks.rb b/test/integration/compute/core_compute/test_disks.rb index ed47d8a8a..cdb034366 100644 --- a/test/integration/compute/core_compute/test_disks.rb +++ b/test/integration/compute/core_compute/test_disks.rb @@ -36,10 +36,10 @@ def test_create_snapshot snapshot = disk.create_snapshot("fog-test-snapshot") - assert(snapshot.is_a?(Fog::Compute::Google::Snapshot), + assert(snapshot.is_a?(Fog::Google::Compute::Snapshot), "Resulting snapshot should be a snapshot object.") - assert_raises(ArgumentError) { snapshot.set_labels(["bar", "test"]) } + assert_raises(ArgumentError) { snapshot.set_labels(%w(bar test)) } snapshot.set_labels(foo: "bar", fog: "test") diff --git a/test/integration/compute/core_compute/test_snapshots.rb b/test/integration/compute/core_compute/test_snapshots.rb index 8418af8e0..90087b1fd 100644 --- a/test/integration/compute/core_compute/test_snapshots.rb +++ b/test/integration/compute/core_compute/test_snapshots.rb @@ -4,7 +4,7 @@ class TestComputeSnapshots < FogIntegrationTest def setup - @client = Fog::Compute::Google.new + @client = Fog::Google::Compute.new # Ensure any resources we create with test prefixes are removed Minitest.after_run do delete_test_resources diff --git a/test/integration/factories/collection_factory.rb b/test/integration/factories/collection_factory.rb index 651fdf4ee..7005e88e4 100644 --- a/test/integration/factories/collection_factory.rb +++ b/test/integration/factories/collection_factory.rb @@ -11,7 +11,7 @@ def initialize(subject, example) # # @param async [FalseClass or TrueClass] perform resource destruction asynchronously def cleanup(async = false) - suit_name = @example.gsub(/\W/, "").tr("_", "-").downcase.split('-')[0] + suit_name = @example.gsub(/\W/, "").tr("_", "-").downcase.split("-")[0] resources = @subject.all.select { |resource| resource.name.match(/#{PREFIX}-[0-9]*-#{suit_name}/) } if DEBUG p "Cleanup invoked in #{self} for example: #{@example}" @@ -22,7 +22,7 @@ def cleanup(async = false) resources.each { |r| Fog.wait_for { !@subject.all.map(&:identity).include? r.identity } } end - # Creates a collection object instance e.g. Fog::Compute::Google::Server + # Creates a collection object instance e.g. Fog::Google::Compute::Server # # @param custom_params [Hash] override factory creation parameters or provide # additional ones. Useful in tests where you need to create a slightly different diff --git a/test/integration/test_authentication.rb b/test/integration/test_authentication.rb index f3dc457fa..2e72311f7 100644 --- a/test/integration/test_authentication.rb +++ b/test/integration/test_authentication.rb @@ -8,28 +8,28 @@ def setup end def test_authenticates_with_json_key_location - c = Fog::Compute::Google.new(:google_key_location => nil, + c = Fog::Google::Compute.new(:google_key_location => nil, :google_key_string => nil, :google_json_key_location => @google_json_key_location, :google_json_key_string => nil) - assert_kind_of(Fog::Compute::Google::Real, c) + assert_kind_of(Fog::Google::Compute::Real, c) end def test_authenticates_with_json_key_string - c = Fog::Compute::Google.new(:google_key_location => nil, + c = Fog::Google::Compute.new(:google_key_location => nil, :google_key_string => nil, :google_json_key_location => nil, :google_json_key_string => @google_json_key_string) - assert_kind_of(Fog::Compute::Google::Real, c) + assert_kind_of(Fog::Google::Compute::Real, c) end def test_raises_argument_error_when_google_project_is_missing - assert_raises(ArgumentError) { Fog::Compute::Google.new(:google_project => nil) } + assert_raises(ArgumentError) { Fog::Google::Compute.new(:google_project => nil) } end def test_raises_argument_error_when_google_keys_are_given assert_raises(ArgumentError) do - Fog::Compute::Google.new(:google_key_location => nil, + Fog::Google::Compute.new(:google_key_location => nil, :google_key_string => nil, :google_json_key_location => nil, :google_json_key_string => nil) diff --git a/test/unit/compute/test_common_collections.rb b/test/unit/compute/test_common_collections.rb index 1578b3ea7..8b3fe2e10 100644 --- a/test/unit/compute/test_common_collections.rb +++ b/test/unit/compute/test_common_collections.rb @@ -10,18 +10,18 @@ def setup # Exceptions that do not pass test_common_methods: # # Projects do not have a "list" method in compute API, so 'all' is not implemented - @common_method_exceptions = [Fog::Compute::Google::Projects] + @common_method_exceptions = [Fog::Google::Compute::Projects] # Enumerate all descendants of Fog::Collection descendants = ObjectSpace.each_object(Fog::Collection.singleton_class).to_a - @collections = descendants.select { |d| d.name.match(/Fog::Compute::Google/) } + @collections = descendants.select { |d| d.name.match(/Fog::Google::Compute/) } end def teardown Fog.unmock! end - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods def test_common_methods subjects = @collections - @common_method_exceptions subjects.each do |klass| diff --git a/test/unit/compute/test_common_models.rb b/test/unit/compute/test_common_models.rb index dfef54797..8deb62ff6 100644 --- a/test/unit/compute/test_common_models.rb +++ b/test/unit/compute/test_common_models.rb @@ -7,17 +7,17 @@ def setup google_project: "foo") # Do not test models that do not have a create method in API - exceptions = [Fog::Compute::Google::MachineType, - Fog::Compute::Google::Region, - Fog::Compute::Google::DiskType, - Fog::Compute::Google::Operation, - Fog::Compute::Google::Zone, - Fog::Compute::Google::Snapshot, - Fog::Compute::Google::Project] + exceptions = [Fog::Google::Compute::MachineType, + Fog::Google::Compute::Region, + Fog::Google::Compute::DiskType, + Fog::Google::Compute::Operation, + Fog::Google::Compute::Zone, + Fog::Google::Compute::Snapshot, + Fog::Google::Compute::Project] # Enumerate all descendants of Fog::Model descendants = ObjectSpace.each_object(Fog::Model.singleton_class).to_a - @models = descendants.select { |d| d.name.match(/Fog::Compute::Google/) } - exceptions + @models = descendants.select { |d| d.name.match(/Fog::Google::Compute/) } - exceptions end def teardown @@ -25,7 +25,7 @@ def teardown end def test_common_methods - # This tests whether Fog::Compute::Google models have common lifecycle methods + # This tests whether Fog::Google::Compute models have common lifecycle methods @models.each do |klass| obj = klass.new assert obj.respond_to?(:save), "#{klass} should have a .save method" diff --git a/test/unit/compute/test_disk.rb b/test/unit/compute/test_disk.rb index 1912c6675..6529d53f7 100644 --- a/test/unit/compute/test_disk.rb +++ b/test/unit/compute/test_disk.rb @@ -12,15 +12,15 @@ def teardown end def test_new_disk - disk = Fog::Compute::Google::Disk.new( - :name => "fog-1", - :size_gb => 10, - :zone => "us-central1-a", + disk = Fog::Google::Compute::Disk.new( + :name => "fog-1", + :size_gb => 10, + :zone => "us-central1-a", :source_image => "debian-7-wheezy-v20131120" ) - assert_equal("fog-1", disk.name, "Fog::Compute::Google::Disk name is incorrect: #{disk.name}") - assert_equal(10, disk.size_gb, "Fog::Compute::Google::Disk size_gb is incorrect: #{disk.size_gb}") - assert_equal("us-central1-a", disk.zone, "Fog::Compute::Google::Disk zone is incorrect: #{disk.zone}") - assert_equal("debian-7-wheezy-v20131120", disk.source_image, "Fog::Compute::Google::Disk source_image is incorrect: #{disk.source_image}") + assert_equal("fog-1", disk.name, "Fog::Google::Compute::Disk name is incorrect: #{disk.name}") + assert_equal(10, disk.size_gb, "Fog::Google::Compute::Disk size_gb is incorrect: #{disk.size_gb}") + assert_equal("us-central1-a", disk.zone, "Fog::Google::Compute::Disk zone is incorrect: #{disk.zone}") + assert_equal("debian-7-wheezy-v20131120", disk.source_image, "Fog::Google::Compute::Disk source_image is incorrect: #{disk.source_image}") end end diff --git a/test/unit/compute/test_server.rb b/test/unit/compute/test_server.rb index d1064fdf3..ffd8ec17a 100644 --- a/test/unit/compute/test_server.rb +++ b/test/unit/compute/test_server.rb @@ -15,7 +15,7 @@ def test_if_server_accepts_ssh_keys key = "ssh-rsa IAMNOTAREALSSHKEYAMA== user@host.subdomain.example.com" File.stub :read, key do - server = Fog::Compute::Google::Server.new( + server = Fog::Google::Compute::Server.new( :name => "foo", :machine_type => "bar", :disks => ["baz"], @@ -23,7 +23,7 @@ def test_if_server_accepts_ssh_keys :public_key_path => key ) assert_equal(server.public_key, key, - "Fog::Compute::Google::Server loads public_key properly") + "Fog::Google::Compute::Server loads public_key properly") end end end diff --git a/test/unit/dns/test_common_collections.rb b/test/unit/dns/test_common_collections.rb index 529ce4283..f57d1b6b5 100644 --- a/test/unit/dns/test_common_collections.rb +++ b/test/unit/dns/test_common_collections.rb @@ -20,7 +20,7 @@ def teardown Fog.unmock! end - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods def test_common_methods subjects = @collections - @common_methods_exceptions subjects.each do |klass| diff --git a/test/unit/monitoring/test_comon_collections.rb b/test/unit/monitoring/test_comon_collections.rb index e59777f10..8f6f5095a 100644 --- a/test/unit/monitoring/test_comon_collections.rb +++ b/test/unit/monitoring/test_comon_collections.rb @@ -20,7 +20,7 @@ def teardown Fog.unmock! end - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods def test_common_methods subjects = @collections - @common_method_exceptions diff --git a/test/unit/pubsub/test_common_collections.rb b/test/unit/pubsub/test_common_collections.rb index 61e65af3f..2d47a2822 100644 --- a/test/unit/pubsub/test_common_collections.rb +++ b/test/unit/pubsub/test_common_collections.rb @@ -16,7 +16,7 @@ def teardown end def test_common_methods - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods @collections.each do |klass| obj = klass.new assert obj.respond_to?(:all), "#{klass} should have an .all method" diff --git a/test/unit/sql/test_common_collections.rb b/test/unit/sql/test_common_collections.rb index 3d334bdfe..586aaa792 100644 --- a/test/unit/sql/test_common_collections.rb +++ b/test/unit/sql/test_common_collections.rb @@ -23,7 +23,7 @@ def teardown Fog.unmock! end - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods def test_common_methods subjects = @collections - @common_method_exceptions subjects.each do |klass| diff --git a/test/unit/storage/test_common_json_collections.rb b/test/unit/storage/test_common_json_collections.rb index 45298e37f..47aa548c6 100644 --- a/test/unit/storage/test_common_json_collections.rb +++ b/test/unit/storage/test_common_json_collections.rb @@ -19,7 +19,7 @@ def teardown end def test_common_methods - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods @collections.each do |klass| obj = klass.new assert obj.respond_to?(:all), "#{klass} should have an .all method" diff --git a/test/unit/storage/test_common_xml_collections.rb b/test/unit/storage/test_common_xml_collections.rb index 3607e7c48..d9ece7c85 100644 --- a/test/unit/storage/test_common_xml_collections.rb +++ b/test/unit/storage/test_common_xml_collections.rb @@ -21,7 +21,7 @@ def teardown end def test_common_methods - # This tests whether Fog::Compute::Google collections have common lifecycle methods + # This tests whether Fog::Google::Compute collections have common lifecycle methods @collections.each do |klass| obj = klass.new assert obj.respond_to?(:all), "#{klass} should have an .all method" @@ -39,11 +39,11 @@ def test_collection_get_arguments end def test_metadata - attr = { key: 'test-file', body: "hello world\x00" } + attr = { key: "test-file", body: "hello world\x00" } f = @bucket.files.new(attr) assert_equal({}, f.metadata) - metadata = { 'x-goog-meta-my-header' => 'hello world' } + metadata = { "x-goog-meta-my-header" => "hello world" } f = @bucket.files.new(attr.merge(metadata)) assert_equal(metadata, f.metadata) end From 53c42c3c83a206619b246c5dee84777dd614f7de Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Mar 2025 10:54:19 -0700 Subject: [PATCH 3/9] Rename Fog::DNS::Google to Fog::Google::DNS This is needed to support fog-core 2.2 and up due to this change: https://github.com/fog/fog-core/pull/241 --- examples/dns/project.rb | 2 +- examples/dns/zones.rb | 2 +- lib/fog/bin/google.rb | 2 +- lib/fog/google.rb | 5 +---- lib/fog/{dns/google.rb => google/dns.rb} | 12 +++++----- lib/fog/{dns/google => google/dns}/mock.rb | 4 ++-- .../google => google/dns}/models/change.rb | 4 ++-- .../google => google/dns}/models/changes.rb | 14 +++++++----- .../google => google/dns}/models/project.rb | 4 ++-- .../google => google/dns}/models/projects.rb | 8 +++---- .../google => google/dns}/models/record.rb | 22 +++++++++---------- .../google => google/dns}/models/records.rb | 14 +++++++----- .../{dns/google => google/dns}/models/zone.rb | 14 ++++++------ .../google => google/dns}/models/zones.rb | 11 +++++----- lib/fog/{dns/google => google/dns}/real.rb | 4 ++-- .../dns}/requests/create_change.rb | 4 ++-- .../dns}/requests/create_managed_zone.rb | 4 ++-- .../dns}/requests/delete_managed_zone.rb | 4 ++-- .../dns}/requests/get_change.rb | 4 ++-- .../dns}/requests/get_managed_zone.rb | 4 ++-- .../dns}/requests/get_project.rb | 4 ++-- .../dns}/requests/list_changes.rb | 4 ++-- .../dns}/requests/list_managed_zones.rb | 4 ++-- .../requests/list_resource_record_sets.rb | 4 ++-- lib/fog/google/shared.rb | 2 +- test/unit/dns/test_common_collections.rb | 4 ++-- 26 files changed, 83 insertions(+), 81 deletions(-) rename lib/fog/{dns/google.rb => google/dns.rb} (82%) rename lib/fog/{dns/google => google/dns}/mock.rb (95%) rename lib/fog/{dns/google => google/dns}/models/change.rb (96%) rename lib/fog/{dns/google => google/dns}/models/changes.rb (80%) rename lib/fog/{dns/google => google/dns}/models/project.rb (98%) rename lib/fog/{dns/google => google/dns}/models/projects.rb (77%) rename lib/fog/{dns/google => google/dns}/models/record.rb (84%) rename lib/fog/{dns/google => google/dns}/models/records.rb (83%) rename lib/fog/{dns/google => google/dns}/models/zone.rb (85%) rename lib/fog/{dns/google => google/dns}/models/zones.rb (78%) rename lib/fog/{dns/google => google/dns}/real.rb (94%) rename lib/fog/{dns/google => google/dns}/requests/create_change.rb (95%) rename lib/fog/{dns/google => google/dns}/requests/create_managed_zone.rb (95%) rename lib/fog/{dns/google => google/dns}/requests/delete_managed_zone.rb (94%) rename lib/fog/{dns/google => google/dns}/requests/get_change.rb (94%) rename lib/fog/{dns/google => google/dns}/requests/get_managed_zone.rb (94%) rename lib/fog/{dns/google => google/dns}/requests/get_project.rb (94%) rename lib/fog/{dns/google => google/dns}/requests/list_changes.rb (96%) rename lib/fog/{dns/google => google/dns}/requests/list_managed_zones.rb (95%) rename lib/fog/{dns/google => google/dns}/requests/list_resource_record_sets.rb (96%) diff --git a/examples/dns/project.rb b/examples/dns/project.rb index 350191189..f857518b9 100644 --- a/examples/dns/project.rb +++ b/examples/dns/project.rb @@ -1,5 +1,5 @@ def test - connection = Fog::DNS::Google.new + connection = Fog::Google::DNS.new puts "Get the Project limits..." puts "-------------------------" diff --git a/examples/dns/zones.rb b/examples/dns/zones.rb index 13b164f99..afc5a84b6 100644 --- a/examples/dns/zones.rb +++ b/examples/dns/zones.rb @@ -1,5 +1,5 @@ def test - connection = Fog::DNS::Google.new + connection = Fog::Google::DNS.new puts "Create a Zone..." puts "----------------" diff --git a/lib/fog/bin/google.rb b/lib/fog/bin/google.rb index e520f4375..f4da4eaab 100644 --- a/lib/fog/bin/google.rb +++ b/lib/fog/bin/google.rb @@ -6,7 +6,7 @@ def class_for(key) when :compute Fog::Google::Compute when :dns - Fog::DNS::Google + Fog::Google::DNS when :monitoring Fog::Google::Monitoring when :storage diff --git a/lib/fog/google.rb b/lib/fog/google.rb index cc966e78b..b02dc538a 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -4,12 +4,9 @@ require "fog/google/version" module Fog - module DNS - autoload :Google, File.expand_path("../dns/google", __FILE__) - end - module Google autoload :Compute, File.expand_path("../google/compute", __FILE__) + autoload :DNS, File.expand_path("../google/dns", __FILE__) autoload :Mock, File.expand_path("../google/mock", __FILE__) autoload :Monitoring, File.expand_path("../google/monitoring", __FILE__) autoload :Pubsub, File.expand_path("../google/pubsub", __FILE__) diff --git a/lib/fog/dns/google.rb b/lib/fog/google/dns.rb similarity index 82% rename from lib/fog/dns/google.rb rename to lib/fog/google/dns.rb index 62f9d0ea5..9f2a952fc 100644 --- a/lib/fog/dns/google.rb +++ b/lib/fog/google/dns.rb @@ -1,8 +1,8 @@ module Fog - module DNS - class Google < Fog::Service - autoload :Mock, File.expand_path("../google/mock", __FILE__) - autoload :Real, File.expand_path("../google/real", __FILE__) + module Google + class DNS < Fog::Service + autoload :Mock, "fog/google/dns/mock" + autoload :Real, "fog/google/dns/real" requires :google_project recognizes( @@ -24,7 +24,7 @@ class Google < Fog::Service ## # MODELS - model_path "fog/dns/google/models" + model_path "fog/google/dns/models" # Zone model :zone @@ -44,7 +44,7 @@ class Google < Fog::Service ## # REQUESTS - request_path "fog/dns/google/requests" + request_path "fog/google/dns/requests" # Zone request :create_managed_zone diff --git a/lib/fog/dns/google/mock.rb b/lib/fog/google/dns/mock.rb similarity index 95% rename from lib/fog/dns/google/mock.rb rename to lib/fog/google/dns/mock.rb index f63a72bd2..65720d3de 100644 --- a/lib/fog/dns/google/mock.rb +++ b/lib/fog/google/dns/mock.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS class Mock include Fog::Google::Shared diff --git a/lib/fog/dns/google/models/change.rb b/lib/fog/google/dns/models/change.rb similarity index 96% rename from lib/fog/dns/google/models/change.rb rename to lib/fog/google/dns/models/change.rb index 3f850c9f8..ecc98f8f5 100644 --- a/lib/fog/dns/google/models/change.rb +++ b/lib/fog/google/dns/models/change.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Represents a Change resource # diff --git a/lib/fog/dns/google/models/changes.rb b/lib/fog/google/dns/models/changes.rb similarity index 80% rename from lib/fog/dns/google/models/changes.rb rename to lib/fog/google/dns/models/changes.rb index d7063ee8a..b2efd3c24 100644 --- a/lib/fog/dns/google/models/changes.rb +++ b/lib/fog/google/dns/models/changes.rb @@ -1,15 +1,15 @@ module Fog - module DNS - class Google + module Google + class DNS class Changes < Fog::Collection - model Fog::DNS::Google::Change + model Fog::Google::DNS::Change attribute :zone ## # Enumerates the list of Changes # - # @return [Array] List of Changes resources + # @return [Array] List of Changes resources def all requires :zone @@ -17,6 +17,7 @@ def all load(data) rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + [] end @@ -24,7 +25,7 @@ def all # Fetches the representation of an existing Change # # @param [String] identity Change identity - # @return [Fog::DNS::Google::Change] Change resource + # @return [Fog::Google::DNS::Change] Change resource def get(identity) requires :zone if change = service.get_change(zone.identity, identity).to_h @@ -32,13 +33,14 @@ def get(identity) end rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + nil end ## # Creates a new instance of a Change # - # @return [Fog::DNS::Google::Change] Change resource + # @return [Fog::Google::DNS::Change] Change resource def new(attributes = {}) requires :zone diff --git a/lib/fog/dns/google/models/project.rb b/lib/fog/google/dns/models/project.rb similarity index 98% rename from lib/fog/dns/google/models/project.rb rename to lib/fog/google/dns/models/project.rb index cbae3deb9..4ccf05b2a 100644 --- a/lib/fog/dns/google/models/project.rb +++ b/lib/fog/google/dns/models/project.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Represents a Project resource # diff --git a/lib/fog/dns/google/models/projects.rb b/lib/fog/google/dns/models/projects.rb similarity index 77% rename from lib/fog/dns/google/models/projects.rb rename to lib/fog/google/dns/models/projects.rb index 095715888..04c6c4feb 100644 --- a/lib/fog/dns/google/models/projects.rb +++ b/lib/fog/google/dns/models/projects.rb @@ -1,14 +1,14 @@ module Fog - module DNS - class Google + module Google + class DNS class Projects < Fog::Collection - model Fog::DNS::Google::Project + model Fog::Google::DNS::Project ## # Fetches the representation of an existing Project # # @param [String] identity Project identity - # @return [Fog::DNS::Google::Project] Project resource + # @return [Fog::Google::DNS::Project] Project resource def get(identity) if project = service.get_project(identity).to_h new(project) diff --git a/lib/fog/dns/google/models/record.rb b/lib/fog/google/dns/models/record.rb similarity index 84% rename from lib/fog/dns/google/models/record.rb rename to lib/fog/google/dns/models/record.rb index c892ac6b9..0b6fe6721 100644 --- a/lib/fog/dns/google/models/record.rb +++ b/lib/fog/google/dns/models/record.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Resource Record Sets resource # @@ -22,7 +22,7 @@ def destroy(async = true) requires :name, :type, :ttl, :rrdatas data = service.create_change(zone.id, [], [resource_record_set_format]) - change = Fog::DNS::Google::Changes + change = Fog::Google::DNS::Changes .new(:service => service, :zone => zone) .get(data.id) change.wait_for { ready? } unless async @@ -33,7 +33,7 @@ def destroy(async = true) # Modifies a previously created Resource Record Sets resource # # @param [Hash] new_attributes Resource Record Set new attributes - # @return [Fog::DNS::Google::Record] Resource Record Sets resource + # @return [Fog::Google::DNS::Record] Resource Record Sets resource def modify(new_attributes) requires :name, :type, :ttl, :rrdatas @@ -41,7 +41,7 @@ def modify(new_attributes) merge_attributes(new_attributes) data = service.create_change(zone.id, [resource_record_set_format], [deletions]) - change = Fog::DNS::Google::Changes + change = Fog::Google::DNS::Changes .new(:service => service, :zone => zone) .get(data.id) new_attributes.key?(:async) ? async = new_attributes[:async] : async = true @@ -52,7 +52,7 @@ def modify(new_attributes) ## # Reloads a Resource Record Sets resource # - # @return [Fog::DNS::Google::Record] Resource Record Sets resource + # @return [Fog::Google::DNS::Record] Resource Record Sets resource def reload requires :name, :type @@ -64,12 +64,12 @@ def reload ## # Creates a new Resource Record Sets resource # - # @return [Fog::DNS::Google::Record] Resource Record Sets resource + # @return [Fog::Google::DNS::Record] Resource Record Sets resource def save requires :name, :type, :ttl, :rrdatas data = service.create_change(zone.id, [resource_record_set_format], []) - change = Fog::DNS::Google::Changes + change = Fog::Google::DNS::Changes .new(:service => service, :zone => zone) .get(data.id) change.wait_for { ready? } @@ -79,7 +79,7 @@ def save ## # Returns the Managed Zone of the Resource Record Sets resource # - # @return [Fog::DNS::Google::Zone] Managed Zone of the Resource Record Sets resource + # @return [Fog::Google::DNS::Zone] Managed Zone of the Resource Record Sets resource attr_reader :zone private @@ -87,7 +87,7 @@ def save ## # Assigns the Managed Zone of the Resource Record Sets resource # - # @param [Fog::DNS::Google::Zone] new_zone Managed Zone of the Resource Record Sets resource + # @param [Fog::Google::DNS::Zone] new_zone Managed Zone of the Resource Record Sets resource attr_writer :zone ## @@ -98,7 +98,7 @@ def resource_record_set_format :kind => "dns#resourceRecordSet", :name => name, :type => type, - :ttl => ttl, + :ttl => ttl, :rrdatas => rrdatas } end diff --git a/lib/fog/dns/google/models/records.rb b/lib/fog/google/dns/models/records.rb similarity index 83% rename from lib/fog/dns/google/models/records.rb rename to lib/fog/google/dns/models/records.rb index 72d9f5bd3..aa0a93e7a 100644 --- a/lib/fog/dns/google/models/records.rb +++ b/lib/fog/google/dns/models/records.rb @@ -1,15 +1,15 @@ module Fog - module DNS - class Google + module Google + class DNS class Records < Fog::Collection - model Fog::DNS::Google::Record + model Fog::Google::DNS::Record attribute :zone ## # Enumerates Resource Record Sets that have been created but not yet deleted # - # @return [Array] List of Resource Record Sets resources + # @return [Array] List of Resource Record Sets resources def all requires :zone @@ -18,6 +18,7 @@ def all load(data) rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + [] end @@ -26,7 +27,7 @@ def all # # @param [String] name Resource Record Set name # @param [String] type Resource Record Set type - # @return [Fog::DNS::Google::Record] Resource Record Set resource + # @return [Fog::Google::DNS::Record] Resource Record Set resource def get(name, type) requires :zone @@ -35,13 +36,14 @@ def get(name, type) records.any? ? new(records.first) : nil rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + nil end ## # Creates a new instance of a Resource Record Set # - # @return [Fog::DNS::Google::Record] Resource Record Set resource + # @return [Fog::Google::DNS::Record] Resource Record Set resource def new(attributes = {}) requires :zone diff --git a/lib/fog/dns/google/models/zone.rb b/lib/fog/google/dns/models/zone.rb similarity index 85% rename from lib/fog/dns/google/models/zone.rb rename to lib/fog/google/dns/models/zone.rb index 73a4efb52..431823fac 100644 --- a/lib/fog/dns/google/models/zone.rb +++ b/lib/fog/google/dns/models/zone.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Managed Zone resource # @@ -18,10 +18,10 @@ class Zone < Fog::Model ## # Enumerates the list of Changes for the Managed Zone # - # @return Array] List of Changes for the Managed Zone + # @return Array] List of Changes for the Managed Zone def changes @changes = begin - Fog::DNS::Google::Changes.new( + Fog::Google::DNS::Changes.new( :service => service, :zone => self ) @@ -42,10 +42,10 @@ def destroy ## # Enumerates the list of Resource Record Sets for the Managed Zone # - # @return Array] List of Resource Record Sets for the Managed Zone + # @return Array] List of Resource Record Sets for the Managed Zone def records @records = begin - Fog::DNS::Google::Records.new( + Fog::Google::DNS::Records.new( :service => service, :zone => self ) @@ -55,7 +55,7 @@ def records ## # Creates a new Managed Zone # - # @return [Fog::DNS::Google::Zone] Managed Zone + # @return [Fog::Google::DNS::Zone] Managed Zone # @raise [Fog::Errors::Error] If Managed Zone already exists def save requires :name, :domain, :description diff --git a/lib/fog/dns/google/models/zones.rb b/lib/fog/google/dns/models/zones.rb similarity index 78% rename from lib/fog/dns/google/models/zones.rb rename to lib/fog/google/dns/models/zones.rb index 8c6ac0989..4c83bf386 100644 --- a/lib/fog/dns/google/models/zones.rb +++ b/lib/fog/google/dns/models/zones.rb @@ -1,13 +1,13 @@ module Fog - module DNS - class Google + module Google + class DNS class Zones < Fog::Collection - model Fog::DNS::Google::Zone + model Fog::Google::DNS::Zone ## # Enumerates Managed Zones that have been created but not yet deleted # - # @return [Array] List of Managed Zone resources + # @return [Array] List of Managed Zone resources def all data = service.list_managed_zones.managed_zones.to_h || [] load(data) @@ -17,13 +17,14 @@ def all # Fetches the representation of an existing Managed Zone # # @param [String] name_or_id Managed Zone name or identity - # @return [Fog::DNS::Google::Zone] Managed Zone resource + # @return [Fog::Google::DNS::Zone] Managed Zone resource def get(name_or_id) if zone = service.get_managed_zone(name_or_id).to_h new(zone) end rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + nil end end diff --git a/lib/fog/dns/google/real.rb b/lib/fog/google/dns/real.rb similarity index 94% rename from lib/fog/dns/google/real.rb rename to lib/fog/google/dns/real.rb index 8fcdce977..f4acdfd5c 100644 --- a/lib/fog/dns/google/real.rb +++ b/lib/fog/google/dns/real.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS class Real include Fog::Google::Shared diff --git a/lib/fog/dns/google/requests/create_change.rb b/lib/fog/google/dns/requests/create_change.rb similarity index 95% rename from lib/fog/dns/google/requests/create_change.rb rename to lib/fog/google/dns/requests/create_change.rb index 013b16e68..a688b7a35 100644 --- a/lib/fog/dns/google/requests/create_change.rb +++ b/lib/fog/google/dns/requests/create_change.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Atomically updates a ResourceRecordSet collection. # diff --git a/lib/fog/dns/google/requests/create_managed_zone.rb b/lib/fog/google/dns/requests/create_managed_zone.rb similarity index 95% rename from lib/fog/dns/google/requests/create_managed_zone.rb rename to lib/fog/google/dns/requests/create_managed_zone.rb index 8f69b7b67..f191f6925 100644 --- a/lib/fog/dns/google/requests/create_managed_zone.rb +++ b/lib/fog/google/dns/requests/create_managed_zone.rb @@ -1,7 +1,7 @@ require "date" module Fog - module DNS - class Google + module Google + class DNS ## # Creates a new Managed Zone. # diff --git a/lib/fog/dns/google/requests/delete_managed_zone.rb b/lib/fog/google/dns/requests/delete_managed_zone.rb similarity index 94% rename from lib/fog/dns/google/requests/delete_managed_zone.rb rename to lib/fog/google/dns/requests/delete_managed_zone.rb index cd8b3514f..ab68aa7ae 100644 --- a/lib/fog/dns/google/requests/delete_managed_zone.rb +++ b/lib/fog/google/dns/requests/delete_managed_zone.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Deletes a previously created Managed Zone. # diff --git a/lib/fog/dns/google/requests/get_change.rb b/lib/fog/google/dns/requests/get_change.rb similarity index 94% rename from lib/fog/dns/google/requests/get_change.rb rename to lib/fog/google/dns/requests/get_change.rb index e18cd34bc..644a879d9 100644 --- a/lib/fog/dns/google/requests/get_change.rb +++ b/lib/fog/google/dns/requests/get_change.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Fetches the representation of an existing Change. # diff --git a/lib/fog/dns/google/requests/get_managed_zone.rb b/lib/fog/google/dns/requests/get_managed_zone.rb similarity index 94% rename from lib/fog/dns/google/requests/get_managed_zone.rb rename to lib/fog/google/dns/requests/get_managed_zone.rb index ead170a85..eaa30f5fc 100644 --- a/lib/fog/dns/google/requests/get_managed_zone.rb +++ b/lib/fog/google/dns/requests/get_managed_zone.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Fetches the representation of an existing Managed Zone. # diff --git a/lib/fog/dns/google/requests/get_project.rb b/lib/fog/google/dns/requests/get_project.rb similarity index 94% rename from lib/fog/dns/google/requests/get_project.rb rename to lib/fog/google/dns/requests/get_project.rb index fa532db83..40a3b4915 100644 --- a/lib/fog/dns/google/requests/get_project.rb +++ b/lib/fog/google/dns/requests/get_project.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Fetches the representation of an existing Project. Use this method to look up the limits on the number of # resources that are associated with your project. diff --git a/lib/fog/dns/google/requests/list_changes.rb b/lib/fog/google/dns/requests/list_changes.rb similarity index 96% rename from lib/fog/dns/google/requests/list_changes.rb rename to lib/fog/google/dns/requests/list_changes.rb index 02f360922..7b4dd9fce 100644 --- a/lib/fog/dns/google/requests/list_changes.rb +++ b/lib/fog/google/dns/requests/list_changes.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Enumerates the list of Changes. # diff --git a/lib/fog/dns/google/requests/list_managed_zones.rb b/lib/fog/google/dns/requests/list_managed_zones.rb similarity index 95% rename from lib/fog/dns/google/requests/list_managed_zones.rb rename to lib/fog/google/dns/requests/list_managed_zones.rb index 7c9370948..436f2bcaa 100644 --- a/lib/fog/dns/google/requests/list_managed_zones.rb +++ b/lib/fog/google/dns/requests/list_managed_zones.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Enumerates Managed Zones that have been created but not yet deleted. # diff --git a/lib/fog/dns/google/requests/list_resource_record_sets.rb b/lib/fog/google/dns/requests/list_resource_record_sets.rb similarity index 96% rename from lib/fog/dns/google/requests/list_resource_record_sets.rb rename to lib/fog/google/dns/requests/list_resource_record_sets.rb index 064fd3d2a..04871712e 100644 --- a/lib/fog/dns/google/requests/list_resource_record_sets.rb +++ b/lib/fog/google/dns/requests/list_resource_record_sets.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Google + module Google + class DNS ## # Enumerates Resource Record Sets that have been created but not yet deleted. # diff --git a/lib/fog/google/shared.rb b/lib/fog/google/shared.rb index 7c5a1bdf0..2824e052c 100644 --- a/lib/fog/google/shared.rb +++ b/lib/fog/google/shared.rb @@ -41,7 +41,7 @@ def initialize_google_client(options) # TODO: google-api-client is in gemspec now, re-assess if this initialization logic is still needed require "google/apis/monitoring_#{Fog::Google::Monitoring::GOOGLE_MONITORING_API_VERSION}" require "google/apis/compute_#{Fog::Google::Compute::GOOGLE_COMPUTE_API_VERSION}" - require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}" + require "google/apis/dns_#{Fog::Google::DNS::GOOGLE_DNS_API_VERSION}" require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}" require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}" require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}" diff --git a/test/unit/dns/test_common_collections.rb b/test/unit/dns/test_common_collections.rb index f57d1b6b5..a177f8d6b 100644 --- a/test/unit/dns/test_common_collections.rb +++ b/test/unit/dns/test_common_collections.rb @@ -9,11 +9,11 @@ def setup # Exceptions that do not pass test_common_methods: # # DNS Projects API does not support 'list', so 'all' method is not possible - @common_methods_exceptions = [Fog::DNS::Google::Projects] + @common_methods_exceptions = [Fog::Google::DNS::Projects] # Enumerate all descendants of Fog::Collection descendants = ObjectSpace.each_object(Fog::Collection.singleton_class) - @collections = descendants.select { |d| d.name.match(/Fog::DNS::Google/) } + @collections = descendants.select { |d| d.name.match(/Fog::Google::DNS/) } end def teardown From 0f94d65e861fed2c3d3f0385b0c9be3039e6b804 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Mar 2025 11:03:16 -0700 Subject: [PATCH 4/9] Rename Fog::DNS::Storage to Fog::Google::Storage This is needed to support fog-core 2.2 and up due to this change: https://github.com/fog/fog-core/pull/241 --- CHANGELOG.md | 12 +++---- README.md | 2 +- examples/storage.rb | 2 +- examples/storage_json.rb | 2 +- lib/fog/bin/google.rb | 4 +-- lib/fog/google.rb | 9 ++--- lib/fog/google/shared.rb | 4 +-- .../{storage/google.rb => google/storage.rb} | 10 +++--- .../storage/storage_json.rb} | 16 ++++----- .../storage/storage_json}/mock.rb | 4 +-- .../storage_json}/models/directories.rb | 7 ++-- .../storage/storage_json}/models/directory.rb | 6 ++-- .../storage/storage_json}/models/file.rb | 4 +-- .../storage/storage_json}/models/files.rb | 15 ++++---- .../storage/storage_json}/real.rb | 4 +-- .../storage_json}/requests/copy_object.rb | 4 +-- .../storage_json}/requests/delete_bucket.rb | 4 +-- .../storage_json}/requests/delete_object.rb | 4 +-- .../requests/delete_object_url.rb | 4 +-- .../storage_json}/requests/get_bucket.rb | 4 +-- .../storage_json}/requests/get_bucket_acl.rb | 4 +-- .../storage_json}/requests/get_object.rb | 4 +-- .../storage_json}/requests/get_object_acl.rb | 4 +-- .../requests/get_object_http_url.rb | 4 +-- .../requests/get_object_https_url.rb | 4 +-- .../requests/get_object_metadata.rb | 4 +-- .../storage_json}/requests/get_object_url.rb | 8 ++--- .../storage_json}/requests/list_bucket_acl.rb | 4 +-- .../storage_json}/requests/list_buckets.rb | 4 +-- .../storage_json}/requests/list_object_acl.rb | 4 +-- .../storage_json}/requests/list_objects.rb | 4 +-- .../storage_json}/requests/put_bucket.rb | 4 +-- .../storage_json}/requests/put_bucket_acl.rb | 4 +-- .../storage_json}/requests/put_object.rb | 4 +-- .../storage_json}/requests/put_object_acl.rb | 4 +-- .../storage_json}/requests/put_object_url.rb | 4 +-- .../storage/storage_json}/utils.rb | 8 ++--- .../storage/storage_xml.rb} | 14 ++++---- .../storage/storage_xml}/mock.rb | 4 +-- .../storage_xml}/models/directories.rb | 14 ++++---- .../storage/storage_xml}/models/directory.rb | 6 ++-- .../storage/storage_xml}/models/file.rb | 4 +-- .../storage/storage_xml}/models/files.rb | 22 ++++++------ .../storage/storage_xml}/real.rb | 4 +-- .../storage_xml}/requests/copy_object.rb | 4 +-- .../storage_xml}/requests/delete_bucket.rb | 4 +-- .../storage_xml}/requests/delete_object.rb | 4 +-- .../requests/delete_object_url.rb | 4 +-- .../storage_xml}/requests/get_bucket.rb | 4 +-- .../storage_xml}/requests/get_bucket_acl.rb | 4 +-- .../storage_xml}/requests/get_object.rb | 4 +-- .../storage_xml}/requests/get_object_acl.rb | 4 +-- .../requests/get_object_http_url.rb | 4 +-- .../requests/get_object_https_url.rb | 4 +-- .../storage_xml}/requests/get_object_url.rb | 8 ++--- .../storage_xml}/requests/get_service.rb | 4 +-- .../storage_xml}/requests/head_object.rb | 4 +-- .../storage_xml}/requests/put_bucket.rb | 4 +-- .../storage_xml}/requests/put_bucket_acl.rb | 4 +-- .../storage_xml}/requests/put_object.rb | 4 +-- .../storage_xml}/requests/put_object_acl.rb | 4 +-- .../storage_xml}/requests/put_object_url.rb | 4 +-- .../storage/storage_xml}/utils.rb | 35 ++++++++++--------- test/integration/storage/storage_shared.rb | 2 +- .../storage/test_common_json_collections.rb | 2 +- .../storage/test_common_xml_collections.rb | 2 +- 66 files changed, 191 insertions(+), 191 deletions(-) rename lib/fog/{storage/google.rb => google/storage.rb} (66%) rename lib/fog/{storage/google_json.rb => google/storage/storage_json.rb} (80%) rename lib/fog/{storage/google_json => google/storage/storage_json}/mock.rb (94%) rename lib/fog/{storage/google_json => google/storage/storage_json}/models/directories.rb (93%) rename lib/fog/{storage/google_json => google/storage/storage_json}/models/directory.rb (94%) rename lib/fog/{storage/google_json => google/storage/storage_json}/models/file.rb (99%) rename lib/fog/{storage/google_json => google/storage/storage_json}/models/files.rb (87%) rename lib/fog/{storage/google_json => google/storage/storage_json}/real.rb (99%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/copy_object.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/delete_bucket.rb (93%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/delete_object.rb (94%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/delete_object_url.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_bucket.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_bucket_acl.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object.rb (99%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object_acl.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object_http_url.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object_https_url.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object_metadata.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/get_object_url.rb (81%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/list_bucket_acl.rb (94%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/list_buckets.rb (95%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/list_object_acl.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/list_objects.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/put_bucket.rb (97%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/put_bucket_acl.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/put_object.rb (99%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/put_object_acl.rb (96%) rename lib/fog/{storage/google_json => google/storage/storage_json}/requests/put_object_url.rb (98%) rename lib/fog/{storage/google_json => google/storage/storage_json}/utils.rb (90%) rename lib/fog/{storage/google_xml.rb => google/storage/storage_xml.rb} (68%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/mock.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/models/directories.rb (65%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/models/directory.rb (95%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/models/file.rb (99%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/models/files.rb (84%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/real.rb (99%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/copy_object.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/delete_bucket.rb (96%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/delete_object.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/delete_object_url.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_bucket.rb (99%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_bucket_acl.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_object.rb (99%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_object_acl.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_object_http_url.rb (96%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_object_https_url.rb (96%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_object_url.rb (87%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/get_service.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/head_object.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/put_bucket.rb (98%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/put_bucket_acl.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/put_object.rb (99%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/put_object_acl.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/requests/put_object_url.rb (97%) rename lib/fog/{storage/google_xml => google/storage/storage_xml}/utils.rb (85%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0a8e5990..515c45362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -267,7 +267,7 @@ Drop travis usage #### Fixed -- \#498 Add `:idempotent` flag to Fog::Storage::GoogleXML::Real#head_object, fixing +- \#498 Add `:idempotent` flag to Fog::Google::StorageXML::Real#head_object, fixing `Excon::Error::Socket: end of file reached (EOFError)` in certain scenarios, see \#416 [temikus] - \#500 Set default options automatically if missing in `Pubsub#pull_subscription` @@ -449,7 +449,7 @@ Drop travis usage #### Fixed -- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url` +- \#412 Fixed `Fog::Google::StorageXML::GetObjectHttpUrl#get_object_http_url` request ## 1.7.0 @@ -458,11 +458,11 @@ Drop travis usage #### Added -- \#409 Support query parameters in `Fog::Storage::Google` GET requests [stanhu] +- \#409 Support query parameters in `Fog::Google::Storage` GET requests [stanhu] - \#394 Add some helper methods to `Fog::Google::Compute::Server` [temikus] - `.private_ip_address` - `.stopped?` -- \#375 Add timeout options to `Fog::Storage::GoogleJSON` client [dosuken123] +- \#375 Add timeout options to `Fog::Google::StorageJSON` client [dosuken123] #### Changed @@ -476,7 +476,7 @@ Drop travis usage #### Added -- \#409 Expand `Fog::Storage::Google` unit tests [stanhu] +- \#409 Expand `Fog::Google::Storage` unit tests [stanhu] - \#370 Introducing test coverage back, integrating with codecov.io [temikus] - \#373 Increase integration test coverage. [temikus] - Add Firewall factory and tests. @@ -589,7 +589,7 @@ You can override it in a standard manner by passing a parameter to async method, - \#346 Fixed get_health when called with an instance name [bpaquet] - \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] - \#321 Fix string key instead of symbol for subnetworks listing [tumido] -- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter] +- \#351 Fixed trailing spaces and added data presence check to `Fog::Google::StorageJSON.put_object` [vimutter] ### Development changes diff --git a/README.md b/README.md index b88303f50..ba8c3f0a2 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ We're proud to be sponsored by MeisterLabs who are generously funding our CI sta ## Storage -There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Storage::Google` will automatically direct you to the appropriate API based on the credentials you provide it. +There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Google::Storage` will automatically direct you to the appropriate API based on the credentials you provide it. * The [XML API](https://cloud.google.com/storage/docs/xml-api-overview/) is almost identical to S3. Use [Google's interoperability keys](https://cloud.google.com/storage/docs/migrating#keys) to access it. * The new [JSON API](https://cloud.google.com/storage/docs/json_api/) is faster and uses auth similarly to the rest of the Google Cloud APIs using a [service account private key](https://developers.google.com/identity/protocols/OAuth2ServiceAccount). diff --git a/examples/storage.rb b/examples/storage.rb index cedc46ebd..0858bcb91 100644 --- a/examples/storage.rb +++ b/examples/storage.rb @@ -11,7 +11,7 @@ # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key" def test - connection = Fog::Storage::Google.new + connection = Fog::Google::Storage.new puts "Put a bucket..." puts "----------------" diff --git a/examples/storage_json.rb b/examples/storage_json.rb index b7b04b15a..b7777890e 100644 --- a/examples/storage_json.rb +++ b/examples/storage_json.rb @@ -11,7 +11,7 @@ # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key" def test - connection = Fog::Storage::Google.new + connection = Fog::Google::Storage.new puts "Put a bucket..." puts "----------------" diff --git a/lib/fog/bin/google.rb b/lib/fog/bin/google.rb index f4da4eaab..89440ff5f 100644 --- a/lib/fog/bin/google.rb +++ b/lib/fog/bin/google.rb @@ -10,9 +10,9 @@ def class_for(key) when :monitoring Fog::Google::Monitoring when :storage - Fog::Storage::Google + Fog::Google::Storage when :storage_json - Fog::Storage::Google + Fog::Google::Storage when :sql Fog::Google::SQL when :pubsub diff --git a/lib/fog/google.rb b/lib/fog/google.rb index b02dc538a..a2b7ac46e 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -12,6 +12,9 @@ module Google autoload :Pubsub, File.expand_path("../google/pubsub", __FILE__) autoload :Shared, File.expand_path("../google/shared", __FILE__) autoload :SQL, File.expand_path("../google/sql", __FILE__) + autoload :Storage, File.expand_path("../google/storage", __FILE__) + autoload :StorageJSON, 'fog/google/storage/storage_json' + autoload :StorageXML, 'fog/google/storage/storage_xml' extend Fog::Provider @@ -38,10 +41,4 @@ module Storage autoload :Google, File.expand_path("../parsers/storage/google", __FILE__) end end - - module Storage - autoload :Google, File.expand_path("../storage/google", __FILE__) - autoload :GoogleJSON, File.expand_path("../storage/google_json", __FILE__) - autoload :GoogleXML, File.expand_path("../storage/google_xml", __FILE__) - end end diff --git a/lib/fog/google/shared.rb b/lib/fog/google/shared.rb index 2824e052c..5f30e4fc4 100644 --- a/lib/fog/google/shared.rb +++ b/lib/fog/google/shared.rb @@ -44,8 +44,8 @@ def initialize_google_client(options) require "google/apis/dns_#{Fog::Google::DNS::GOOGLE_DNS_API_VERSION}" require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}" require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}" - require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}" - require "google/apis/iamcredentials_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}" + require "google/apis/storage_#{Fog::Google::StorageJSON::GOOGLE_STORAGE_JSON_API_VERSION}" + require "google/apis/iamcredentials_#{Fog::Google::StorageJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}" require "googleauth" rescue LoadError => e Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider") diff --git a/lib/fog/storage/google.rb b/lib/fog/google/storage.rb similarity index 66% rename from lib/fog/storage/google.rb rename to lib/fog/google/storage.rb index e02e29544..ce3b23b15 100644 --- a/lib/fog/storage/google.rb +++ b/lib/fog/google/storage.rb @@ -1,18 +1,18 @@ module Fog - module Storage - class Google < Fog::Service + module Google + class Storage < Fog::Service def self.new(options = {}) begin fog_creds = Fog.credentials - rescue + rescue StandardError fog_creds = nil end if options.keys.include?(:google_storage_access_key_id) || (!fog_creds.nil? && fog_creds.keys.include?(:google_storage_access_key_id)) - Fog::Storage::GoogleXML.new(options) + Fog::Google::StorageXML.new(options) else - Fog::Storage::GoogleJSON.new(options) + Fog::Google::StorageJSON.new(options) end end end diff --git a/lib/fog/storage/google_json.rb b/lib/fog/google/storage/storage_json.rb similarity index 80% rename from lib/fog/storage/google_json.rb rename to lib/fog/google/storage/storage_json.rb index aec31fbf3..8c01d4373 100644 --- a/lib/fog/storage/google_json.rb +++ b/lib/fog/google/storage/storage_json.rb @@ -1,9 +1,9 @@ module Fog - module Storage - class GoogleJSON < Fog::Service - autoload :Mock, File.expand_path("../google_json/mock", __FILE__) - autoload :Real, File.expand_path("../google_json/real", __FILE__) - autoload :Utils, File.expand_path("../google_json/utils", __FILE__) + module Google + class StorageJSON < Fog::Service + autoload :Mock, "fog/google/storage/storage_json/mock" + autoload :Real, "fog/google/storage/storage_json/real" + autoload :Utils, "fog/google/storage/storage_json/utils" requires :google_project recognizes( @@ -27,7 +27,7 @@ class GoogleJSON < Fog::Service GOOGLE_STORAGE_JSON_BASE_URL = "https://www.googleapis.com/storage/".freeze GOOGLE_STORAGE_BUCKET_BASE_URL = "https://storage.googleapis.com/".freeze - # Version of IAM API used for blob signing, see Fog::Storage::GoogleJSON::Real#iam_signer + # Version of IAM API used for blob signing, see Fog::Google::StorageJSON::Real#iam_signer GOOGLE_STORAGE_JSON_IAM_API_VERSION = "v1".freeze GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/iam).freeze @@ -37,7 +37,7 @@ class GoogleJSON < Fog::Service ## # Models - model_path "fog/storage/google_json/models" + model_path "fog/google/storage/storage_json/models" collection :directories model :directory @@ -47,7 +47,7 @@ class GoogleJSON < Fog::Service ## # Requests - request_path "fog/storage/google_json/requests" + request_path "fog/google/storage/storage_json/requests" request :copy_object request :delete_bucket request :delete_object diff --git a/lib/fog/storage/google_json/mock.rb b/lib/fog/google/storage/storage_json/mock.rb similarity index 94% rename from lib/fog/storage/google_json/mock.rb rename to lib/fog/google/storage/storage_json/mock.rb index 1ef9d339f..3f0f2d216 100644 --- a/lib/fog/storage/google_json/mock.rb +++ b/lib/fog/google/storage/storage_json/mock.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Mock include Utils include Fog::Google::Shared diff --git a/lib/fog/storage/google_json/models/directories.rb b/lib/fog/google/storage/storage_json/models/directories.rb similarity index 93% rename from lib/fog/storage/google_json/models/directories.rb rename to lib/fog/google/storage/storage_json/models/directories.rb index 319e9d0f8..e21a6c9d5 100644 --- a/lib/fog/storage/google_json/models/directories.rb +++ b/lib/fog/google/storage/storage_json/models/directories.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Directories < Fog::Collection - model Fog::Storage::GoogleJSON::Directory + model Fog::Google::StorageJSON::Directory def all(opts = {}) data = service.list_buckets(**opts).to_h[:items] || [] @@ -33,6 +33,7 @@ def get(bucket_name, options = {}) rescue ::Google::Apis::ClientError => e # metageneration check failures returns HTTP 412 Precondition Failed raise e unless e.status_code == 404 || e.status_code == 412 + nil end end diff --git a/lib/fog/storage/google_json/models/directory.rb b/lib/fog/google/storage/storage_json/models/directory.rb similarity index 94% rename from lib/fog/storage/google_json/models/directory.rb rename to lib/fog/google/storage/storage_json/models/directory.rb index 71b249920..e8b471c65 100644 --- a/lib/fog/storage/google_json/models/directory.rb +++ b/lib/fog/google/storage/storage_json/models/directory.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON ## # Represents a Google Storage bucket class Directory < Fog::Model @@ -39,7 +39,7 @@ def destroy def files(attr = {}) @files ||= begin - Fog::Storage::GoogleJSON::Files.new( + Fog::Google::StorageJSON::Files.new( attr.merge(:directory => self, :service => service) ) end diff --git a/lib/fog/storage/google_json/models/file.rb b/lib/fog/google/storage/storage_json/models/file.rb similarity index 99% rename from lib/fog/storage/google_json/models/file.rb rename to lib/fog/google/storage/storage_json/models/file.rb index c40e84dd2..f4efa109d 100644 --- a/lib/fog/storage/google_json/models/file.rb +++ b/lib/fog/google/storage/storage_json/models/file.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class File < Fog::Model identity :key, :aliases => ["Key", :name] diff --git a/lib/fog/storage/google_json/models/files.rb b/lib/fog/google/storage/storage_json/models/files.rb similarity index 87% rename from lib/fog/storage/google_json/models/files.rb rename to lib/fog/google/storage/storage_json/models/files.rb index c6f939629..bb0efc691 100644 --- a/lib/fog/storage/google_json/models/files.rb +++ b/lib/fog/google/storage/storage_json/models/files.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Files < Fog::Collection - model Fog::Storage::GoogleJSON::File + model Fog::Google::StorageJSON::File extend Fog::Deprecation deprecate :get_url, :get_https_url @@ -11,7 +11,7 @@ class Files < Fog::Collection attribute :delimiter, :aliases => "Delimiter" attribute :directory attribute :page_token, :aliases => %w(pageToken page_token) - attribute :max_results, :aliases => ["MaxKeys", "max-keys"] + attribute :max_results, :aliases => %w(MaxKeys max-keys) attribute :prefix, :aliases => "Prefix" attribute :next_page_token @@ -24,14 +24,14 @@ def all(options = {}) end alias_method :each_file_this_page, :each - def each + def each(&block) if block_given? subset = dup.all - subset.each_file_this_page { |f| yield f } + subset.each_file_this_page(&block) while subset.next_page_token subset = subset.all(:page_token => subset.next_page_token) - subset.each_file_this_page { |f| yield f } + subset.each_file_this_page(&block) end end self @@ -43,6 +43,7 @@ def get(key, options = {}, &block) new(data) rescue ::Google::Apis::ClientError => e raise e unless e.status_code == 404 + nil end diff --git a/lib/fog/storage/google_json/real.rb b/lib/fog/google/storage/storage_json/real.rb similarity index 99% rename from lib/fog/storage/google_json/real.rb rename to lib/fog/google/storage/storage_json/real.rb index 7c627da30..23c86c509 100644 --- a/lib/fog/storage/google_json/real.rb +++ b/lib/fog/google/storage/storage_json/real.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real include Utils include Fog::Google::Shared diff --git a/lib/fog/storage/google_json/requests/copy_object.rb b/lib/fog/google/storage/storage_json/requests/copy_object.rb similarity index 97% rename from lib/fog/storage/google_json/requests/copy_object.rb rename to lib/fog/google/storage/storage_json/requests/copy_object.rb index 74eb3521d..6acf5d8b7 100644 --- a/lib/fog/storage/google_json/requests/copy_object.rb +++ b/lib/fog/google/storage/storage_json/requests/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Copy an object from one Google Storage bucket to another # diff --git a/lib/fog/storage/google_json/requests/delete_bucket.rb b/lib/fog/google/storage/storage_json/requests/delete_bucket.rb similarity index 93% rename from lib/fog/storage/google_json/requests/delete_bucket.rb rename to lib/fog/google/storage/storage_json/requests/delete_bucket.rb index dc54769f6..aeee196bf 100644 --- a/lib/fog/storage/google_json/requests/delete_bucket.rb +++ b/lib/fog/google/storage/storage_json/requests/delete_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Delete an Google Storage bucket # https://cloud.google.com/storage/docs/json_api/v1/buckets/delete diff --git a/lib/fog/storage/google_json/requests/delete_object.rb b/lib/fog/google/storage/storage_json/requests/delete_object.rb similarity index 94% rename from lib/fog/storage/google_json/requests/delete_object.rb rename to lib/fog/google/storage/storage_json/requests/delete_object.rb index 4a79381a8..c1a898db7 100644 --- a/lib/fog/storage/google_json/requests/delete_object.rb +++ b/lib/fog/google/storage/storage_json/requests/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Delete an object from Google Storage # https://cloud.google.com/storage/docs/json_api/v1/objects/delete diff --git a/lib/fog/storage/google_json/requests/delete_object_url.rb b/lib/fog/google/storage/storage_json/requests/delete_object_url.rb similarity index 97% rename from lib/fog/storage/google_json/requests/delete_object_url.rb rename to lib/fog/google/storage/storage_json/requests/delete_object_url.rb index f3d19c810..ca0bf0ce3 100644 --- a/lib/fog/storage/google_json/requests/delete_object_url.rb +++ b/lib/fog/google/storage/storage_json/requests/delete_object_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get an expiring object url from Google Storage for deleting an object # https://cloud.google.com/storage/docs/access-control#Signed-URLs diff --git a/lib/fog/storage/google_json/requests/get_bucket.rb b/lib/fog/google/storage/storage_json/requests/get_bucket.rb similarity index 97% rename from lib/fog/storage/google_json/requests/get_bucket.rb rename to lib/fog/google/storage/storage_json/requests/get_bucket.rb index 68a6e3b85..89176708f 100644 --- a/lib/fog/storage/google_json/requests/get_bucket.rb +++ b/lib/fog/google/storage/storage_json/requests/get_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # List information about objects in an Google Storage bucket # # https://cloud.google.com/storage/docs/json_api/v1/buckets#resource diff --git a/lib/fog/storage/google_json/requests/get_bucket_acl.rb b/lib/fog/google/storage/storage_json/requests/get_bucket_acl.rb similarity index 96% rename from lib/fog/storage/google_json/requests/get_bucket_acl.rb rename to lib/fog/google/storage/storage_json/requests/get_bucket_acl.rb index 2c245180c..bf91e12a2 100644 --- a/lib/fog/storage/google_json/requests/get_bucket_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/get_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get access control list entry for an Google Storage bucket # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/get diff --git a/lib/fog/storage/google_json/requests/get_object.rb b/lib/fog/google/storage/storage_json/requests/get_object.rb similarity index 99% rename from lib/fog/storage/google_json/requests/get_object.rb rename to lib/fog/google/storage/storage_json/requests/get_object.rb index 950e00d31..d06bd79e1 100644 --- a/lib/fog/storage/google_json/requests/get_object.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object.rb @@ -1,8 +1,8 @@ require "tempfile" module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get an object from Google Storage # @see https://cloud.google.com/storage/docs/json_api/v1/objects/get diff --git a/lib/fog/storage/google_json/requests/get_object_acl.rb b/lib/fog/google/storage/storage_json/requests/get_object_acl.rb similarity index 97% rename from lib/fog/storage/google_json/requests/get_object_acl.rb rename to lib/fog/google/storage/storage_json/requests/get_object_acl.rb index 40f88972d..b41bb1b27 100644 --- a/lib/fog/storage/google_json/requests/get_object_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get access control list for an Google Storage object # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get diff --git a/lib/fog/storage/google_json/requests/get_object_http_url.rb b/lib/fog/google/storage/storage_json/requests/get_object_http_url.rb similarity index 96% rename from lib/fog/storage/google_json/requests/get_object_http_url.rb rename to lib/fog/google/storage/storage_json/requests/get_object_http_url.rb index c00c4d56f..b8ce6f671 100644 --- a/lib/fog/storage/google_json/requests/get_object_http_url.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON module GetObjectHttpUrl def get_object_http_url(bucket_name, object_name, expires, options = {}) raise ArgumentError.new("bucket_name is required") unless bucket_name diff --git a/lib/fog/storage/google_json/requests/get_object_https_url.rb b/lib/fog/google/storage/storage_json/requests/get_object_https_url.rb similarity index 96% rename from lib/fog/storage/google_json/requests/get_object_https_url.rb rename to lib/fog/google/storage/storage_json/requests/get_object_https_url.rb index 6cd4213e8..77aeab0a0 100644 --- a/lib/fog/storage/google_json/requests/get_object_https_url.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON module GetObjectHttpsUrl def get_object_https_url(bucket_name, object_name, expires, options = {}) raise ArgumentError.new("bucket_name is required") unless bucket_name diff --git a/lib/fog/storage/google_json/requests/get_object_metadata.rb b/lib/fog/google/storage/storage_json/requests/get_object_metadata.rb similarity index 96% rename from lib/fog/storage/google_json/requests/get_object_metadata.rb rename to lib/fog/google/storage/storage_json/requests/get_object_metadata.rb index 2754eb263..c26b49aaa 100644 --- a/lib/fog/storage/google_json/requests/get_object_metadata.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Fetch metadata for an object in Google Storage # diff --git a/lib/fog/storage/google_json/requests/get_object_url.rb b/lib/fog/google/storage/storage_json/requests/get_object_url.rb similarity index 81% rename from lib/fog/storage/google_json/requests/get_object_url.rb rename to lib/fog/google/storage/storage_json/requests/get_object_url.rb index 4f147136c..779fbea56 100644 --- a/lib/fog/storage/google_json/requests/get_object_url.rb +++ b/lib/fog/google/storage/storage_json/requests/get_object_url.rb @@ -1,18 +1,18 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get an expiring object url from GCS # Deprecated, redirects to get_object_https_url.rb def get_object_url(bucket_name, object_name, expires, options = {}) - Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})") + Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})") get_object_https_url(bucket_name, object_name, expires, **options) end end class Mock # :nodoc:all def get_object_url(bucket_name, object_name, expires, options = {}) - Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})") + Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})") get_object_https_url(bucket_name, object_name, expires, **options) end end diff --git a/lib/fog/storage/google_json/requests/list_bucket_acl.rb b/lib/fog/google/storage/storage_json/requests/list_bucket_acl.rb similarity index 94% rename from lib/fog/storage/google_json/requests/list_bucket_acl.rb rename to lib/fog/google/storage/storage_json/requests/list_bucket_acl.rb index 718643be8..53f312c77 100644 --- a/lib/fog/storage/google_json/requests/list_bucket_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/list_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get access control list for an Google Storage bucket # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/list diff --git a/lib/fog/storage/google_json/requests/list_buckets.rb b/lib/fog/google/storage/storage_json/requests/list_buckets.rb similarity index 95% rename from lib/fog/storage/google_json/requests/list_buckets.rb rename to lib/fog/google/storage/storage_json/requests/list_buckets.rb index bc94cc48b..13d5cc1f6 100644 --- a/lib/fog/storage/google_json/requests/list_buckets.rb +++ b/lib/fog/google/storage/storage_json/requests/list_buckets.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Retrieves a list of buckets for a given project # https://cloud.google.com/storage/docs/json_api/v1/buckets/list diff --git a/lib/fog/storage/google_json/requests/list_object_acl.rb b/lib/fog/google/storage/storage_json/requests/list_object_acl.rb similarity index 96% rename from lib/fog/storage/google_json/requests/list_object_acl.rb rename to lib/fog/google/storage/storage_json/requests/list_object_acl.rb index ed86dacac..9e4379c84 100644 --- a/lib/fog/storage/google_json/requests/list_object_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/list_object_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # List access control list for an Google Storage object # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get diff --git a/lib/fog/storage/google_json/requests/list_objects.rb b/lib/fog/google/storage/storage_json/requests/list_objects.rb similarity index 97% rename from lib/fog/storage/google_json/requests/list_objects.rb rename to lib/fog/google/storage/storage_json/requests/list_objects.rb index d059e15cc..68b7ffad6 100644 --- a/lib/fog/storage/google_json/requests/list_objects.rb +++ b/lib/fog/google/storage/storage_json/requests/list_objects.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Lists objects in a bucket matching some criteria. # diff --git a/lib/fog/storage/google_json/requests/put_bucket.rb b/lib/fog/google/storage/storage_json/requests/put_bucket.rb similarity index 97% rename from lib/fog/storage/google_json/requests/put_bucket.rb rename to lib/fog/google/storage/storage_json/requests/put_bucket.rb index 04d88a2a4..67525f313 100644 --- a/lib/fog/storage/google_json/requests/put_bucket.rb +++ b/lib/fog/google/storage/storage_json/requests/put_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Create a Google Storage bucket # @see https://cloud.google.com/storage/docs/json_api/v1/buckets/insert diff --git a/lib/fog/storage/google_json/requests/put_bucket_acl.rb b/lib/fog/google/storage/storage_json/requests/put_bucket_acl.rb similarity index 96% rename from lib/fog/storage/google_json/requests/put_bucket_acl.rb rename to lib/fog/google/storage/storage_json/requests/put_bucket_acl.rb index eca7386fb..7dbd428ca 100644 --- a/lib/fog/storage/google_json/requests/put_bucket_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/put_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Change access control list for an Google Storage bucket # https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/insert diff --git a/lib/fog/storage/google_json/requests/put_object.rb b/lib/fog/google/storage/storage_json/requests/put_object.rb similarity index 99% rename from lib/fog/storage/google_json/requests/put_object.rb rename to lib/fog/google/storage/storage_json/requests/put_object.rb index a39668996..9b519284d 100644 --- a/lib/fog/storage/google_json/requests/put_object.rb +++ b/lib/fog/google/storage/storage_json/requests/put_object.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Create an object in an Google Storage bucket # https://cloud.google.com/storage/docs/json_api/v1/objects/insert diff --git a/lib/fog/storage/google_json/requests/put_object_acl.rb b/lib/fog/google/storage/storage_json/requests/put_object_acl.rb similarity index 96% rename from lib/fog/storage/google_json/requests/put_object_acl.rb rename to lib/fog/google/storage/storage_json/requests/put_object_acl.rb index 53a7f6843..5f4209df3 100644 --- a/lib/fog/storage/google_json/requests/put_object_acl.rb +++ b/lib/fog/google/storage/storage_json/requests/put_object_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Change access control list for an Google Storage object # diff --git a/lib/fog/storage/google_json/requests/put_object_url.rb b/lib/fog/google/storage/storage_json/requests/put_object_url.rb similarity index 98% rename from lib/fog/storage/google_json/requests/put_object_url.rb rename to lib/fog/google/storage/storage_json/requests/put_object_url.rb index be819259b..39a658f76 100644 --- a/lib/fog/storage/google_json/requests/put_object_url.rb +++ b/lib/fog/google/storage/storage_json/requests/put_object_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON class Real # Get an expiring object url from Google Storage for putting an object # https://cloud.google.com/storage/docs/access-control#Signed-URLs diff --git a/lib/fog/storage/google_json/utils.rb b/lib/fog/google/storage/storage_json/utils.rb similarity index 90% rename from lib/fog/storage/google_json/utils.rb rename to lib/fog/google/storage/storage_json/utils.rb index e9b02816c..7b85c1bad 100644 --- a/lib/fog/storage/google_json/utils.rb +++ b/lib/fog/google/storage/storage_json/utils.rb @@ -1,8 +1,8 @@ -require 'addressable' +require "addressable" module Fog - module Storage - class GoogleJSON + module Google + class StorageJSON module Utils def http_url(params, expires) "http://" << host_path_query(params, expires) @@ -13,7 +13,7 @@ def https_url(params, expires) end def url(params, expires) - Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("Fog::Google::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]") https_url(params, expires) end diff --git a/lib/fog/storage/google_xml.rb b/lib/fog/google/storage/storage_xml.rb similarity index 68% rename from lib/fog/storage/google_xml.rb rename to lib/fog/google/storage/storage_xml.rb index 780541034..3a24e74b0 100644 --- a/lib/fog/storage/google_xml.rb +++ b/lib/fog/google/storage/storage_xml.rb @@ -1,20 +1,20 @@ module Fog - module Storage - class GoogleXML < Fog::Service - autoload :Mock, File.expand_path("../google_xml/mock", __FILE__) - autoload :Real, File.expand_path("../google_xml/real", __FILE__) - autoload :Utils, File.expand_path("../google_xml/utils", __FILE__) + module Google + class StorageXML < Fog::Service + autoload :Mock, "fog/google/storage/storage_xml/mock" + autoload :Real, "fog/google/storage/storage_xml/real" + autoload :Utils, "fog/google/storage/storage_xml/utils" requires :google_storage_access_key_id, :google_storage_secret_access_key recognizes :host, :port, :scheme, :persistent, :path_style - model_path "fog/storage/google_xml/models" + model_path "fog/google/storage/storage_xml/models" collection :directories model :directory collection :files model :file - request_path "fog/storage/google_xml/requests" + request_path "fog/google/storage/storage_xml/requests" request :copy_object request :delete_bucket request :delete_object diff --git a/lib/fog/storage/google_xml/mock.rb b/lib/fog/google/storage/storage_xml/mock.rb similarity index 98% rename from lib/fog/storage/google_xml/mock.rb rename to lib/fog/google/storage/storage_xml/mock.rb index e85ee6b40..a6e5760ab 100644 --- a/lib/fog/storage/google_xml/mock.rb +++ b/lib/fog/google/storage/storage_xml/mock.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Mock include Utils diff --git a/lib/fog/storage/google_xml/models/directories.rb b/lib/fog/google/storage/storage_xml/models/directories.rb similarity index 65% rename from lib/fog/storage/google_xml/models/directories.rb rename to lib/fog/google/storage/storage_xml/models/directories.rb index b3bec62fe..8685b09da 100644 --- a/lib/fog/storage/google_xml/models/directories.rb +++ b/lib/fog/google/storage/storage_xml/models/directories.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Directories < Fog::Collection - model Fog::Storage::GoogleXML::Directory + model Fog::Google::StorageXML::Directory def all data = service.get_service.body["Buckets"] @@ -10,10 +10,10 @@ def all end def get(key, options = {}) - remap_attributes(options, :delimiter => "delimiter", - :marker => "marker", - :max_keys => "max-keys", - :prefix => "prefix") + remap_attributes(options, :delimiter => "delimiter", + :marker => "marker", + :max_keys => "max-keys", + :prefix => "prefix") data = service.get_bucket(key, options).body directory = new(:key => data["Name"]) options = {} diff --git a/lib/fog/storage/google_xml/models/directory.rb b/lib/fog/google/storage/storage_xml/models/directory.rb similarity index 95% rename from lib/fog/storage/google_xml/models/directory.rb rename to lib/fog/google/storage/storage_xml/models/directory.rb index 04391c42d..288419a07 100644 --- a/lib/fog/storage/google_xml/models/directory.rb +++ b/lib/fog/google/storage/storage_xml/models/directory.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Directory < Fog::Model identity :key, :aliases => %w(Name name) @@ -23,7 +23,7 @@ def destroy def files @files ||= begin - Fog::Storage::GoogleXML::Files.new( + Fog::Google::StorageXML::Files.new( :directory => self, :service => service ) diff --git a/lib/fog/storage/google_xml/models/file.rb b/lib/fog/google/storage/storage_xml/models/file.rb similarity index 99% rename from lib/fog/storage/google_xml/models/file.rb rename to lib/fog/google/storage/storage_xml/models/file.rb index 6d8e61d75..c4c70ae37 100644 --- a/lib/fog/storage/google_xml/models/file.rb +++ b/lib/fog/google/storage/storage_xml/models/file.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class File < Fog::Model identity :key, :aliases => "Key" diff --git a/lib/fog/storage/google_xml/models/files.rb b/lib/fog/google/storage/storage_xml/models/files.rb similarity index 84% rename from lib/fog/storage/google_xml/models/files.rb rename to lib/fog/google/storage/storage_xml/models/files.rb index 53d29b881..75784d8b5 100644 --- a/lib/fog/storage/google_xml/models/files.rb +++ b/lib/fog/google/storage/storage_xml/models/files.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Files < Fog::Collection extend Fog::Deprecation deprecate :get_url, :get_https_url @@ -10,18 +10,18 @@ class Files < Fog::Collection attribute :directory attribute :is_truncated, :aliases => "IsTruncated" attribute :marker, :aliases => "Marker" - attribute :max_keys, :aliases => ["MaxKeys", "max-keys"] + attribute :max_keys, :aliases => %w(MaxKeys max-keys) attribute :prefix, :aliases => "Prefix" - model Fog::Storage::GoogleXML::File + model Fog::Google::StorageXML::File def all(options = {}) requires :directory options = { - "delimiter" => delimiter, - "marker" => marker, - "max-keys" => max_keys, - "prefix" => prefix + "delimiter" => delimiter, + "marker" => marker, + "max-keys" => max_keys, + "prefix" => prefix }.merge!(options) options = options.reject { |_key, value| value.nil? || value.to_s.empty? } merge_attributes(options) @@ -36,16 +36,16 @@ def all(options = {}) end alias_method :each_file_this_page, :each - def each + def each(&block) if !block_given? self else subset = dup.all - subset.each_file_this_page { |f| yield f } + subset.each_file_this_page(&block) while subset.is_truncated subset = subset.all(:marker => subset.last.key) - subset.each_file_this_page { |f| yield f } + subset.each_file_this_page(&block) end self diff --git a/lib/fog/storage/google_xml/real.rb b/lib/fog/google/storage/storage_xml/real.rb similarity index 99% rename from lib/fog/storage/google_xml/real.rb rename to lib/fog/google/storage/storage_xml/real.rb index bb98082a5..166e18145 100644 --- a/lib/fog/storage/google_xml/real.rb +++ b/lib/fog/google/storage/storage_xml/real.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real include Utils diff --git a/lib/fog/storage/google_xml/requests/copy_object.rb b/lib/fog/google/storage/storage_xml/requests/copy_object.rb similarity index 98% rename from lib/fog/storage/google_xml/requests/copy_object.rb rename to lib/fog/google/storage/storage_xml/requests/copy_object.rb index b55c29509..f7b9d9e9c 100644 --- a/lib/fog/storage/google_xml/requests/copy_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Copy an object from one Google Storage bucket to another # diff --git a/lib/fog/storage/google_xml/requests/delete_bucket.rb b/lib/fog/google/storage/storage_xml/requests/delete_bucket.rb similarity index 96% rename from lib/fog/storage/google_xml/requests/delete_bucket.rb rename to lib/fog/google/storage/storage_xml/requests/delete_bucket.rb index 59f6651e5..d95e381ca 100644 --- a/lib/fog/storage/google_xml/requests/delete_bucket.rb +++ b/lib/fog/google/storage/storage_xml/requests/delete_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Delete an Google Storage bucket # diff --git a/lib/fog/storage/google_xml/requests/delete_object.rb b/lib/fog/google/storage/storage_xml/requests/delete_object.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/delete_object.rb rename to lib/fog/google/storage/storage_xml/requests/delete_object.rb index 2220265d6..0377b4106 100644 --- a/lib/fog/storage/google_xml/requests/delete_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Delete an object from Google Storage # diff --git a/lib/fog/storage/google_xml/requests/delete_object_url.rb b/lib/fog/google/storage/storage_xml/requests/delete_object_url.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/delete_object_url.rb rename to lib/fog/google/storage/storage_xml/requests/delete_object_url.rb index 567be1798..097a4c4f5 100644 --- a/lib/fog/storage/google_xml/requests/delete_object_url.rb +++ b/lib/fog/google/storage/storage_xml/requests/delete_object_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get an expiring object url from Google Storage for deleting an object # diff --git a/lib/fog/storage/google_xml/requests/get_bucket.rb b/lib/fog/google/storage/storage_xml/requests/get_bucket.rb similarity index 99% rename from lib/fog/storage/google_xml/requests/get_bucket.rb rename to lib/fog/google/storage/storage_xml/requests/get_bucket.rb index e26f40aa3..975b728d1 100644 --- a/lib/fog/storage/google_xml/requests/get_bucket.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # List information about objects in an Google Storage bucket # diff --git a/lib/fog/storage/google_xml/requests/get_bucket_acl.rb b/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb similarity index 98% rename from lib/fog/storage/google_xml/requests/get_bucket_acl.rb rename to lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb index bf596cb1a..9c1bc7bf8 100644 --- a/lib/fog/storage/google_xml/requests/get_bucket_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get access control list for an Google Storage bucket # diff --git a/lib/fog/storage/google_xml/requests/get_object.rb b/lib/fog/google/storage/storage_xml/requests/get_object.rb similarity index 99% rename from lib/fog/storage/google_xml/requests/get_object.rb rename to lib/fog/google/storage/storage_xml/requests/get_object.rb index e4c419c81..aab576665 100644 --- a/lib/fog/storage/google_xml/requests/get_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get an object from Google Storage # diff --git a/lib/fog/storage/google_xml/requests/get_object_acl.rb b/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb similarity index 98% rename from lib/fog/storage/google_xml/requests/get_object_acl.rb rename to lib/fog/google/storage/storage_xml/requests/get_object_acl.rb index 27c978fcf..04563521d 100644 --- a/lib/fog/storage/google_xml/requests/get_object_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get access control list for an Google Storage object # diff --git a/lib/fog/storage/google_xml/requests/get_object_http_url.rb b/lib/fog/google/storage/storage_xml/requests/get_object_http_url.rb similarity index 96% rename from lib/fog/storage/google_xml/requests/get_object_http_url.rb rename to lib/fog/google/storage/storage_xml/requests/get_object_http_url.rb index a525a3b73..b02cc6b80 100644 --- a/lib/fog/storage/google_xml/requests/get_object_http_url.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML module GetObjectHttpUrl def get_object_http_url(bucket_name, object_name, expires, options = {}) raise ArgumentError.new("bucket_name is required") unless bucket_name diff --git a/lib/fog/storage/google_xml/requests/get_object_https_url.rb b/lib/fog/google/storage/storage_xml/requests/get_object_https_url.rb similarity index 96% rename from lib/fog/storage/google_xml/requests/get_object_https_url.rb rename to lib/fog/google/storage/storage_xml/requests/get_object_https_url.rb index c6c6f2c7c..422002c0a 100644 --- a/lib/fog/storage/google_xml/requests/get_object_https_url.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML module GetObjectHttpsUrl def get_object_https_url(bucket_name, object_name, expires, options = {}) raise ArgumentError.new("bucket_name is required") unless bucket_name diff --git a/lib/fog/storage/google_xml/requests/get_object_url.rb b/lib/fog/google/storage/storage_xml/requests/get_object_url.rb similarity index 87% rename from lib/fog/storage/google_xml/requests/get_object_url.rb rename to lib/fog/google/storage/storage_xml/requests/get_object_url.rb index e3db3565e..f44a67c0c 100644 --- a/lib/fog/storage/google_xml/requests/get_object_url.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get an expiring object url from Google Storage # @@ -15,14 +15,14 @@ class Real # * body<~String> - url for object def get_object_url(bucket_name, object_name, expires, options = {}) - Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})") + Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})") get_object_https_url(bucket_name, object_name, expires, options) end end class Mock # :nodoc:all def get_object_url(bucket_name, object_name, expires, options = {}) - Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})") + Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})") get_object_https_url(bucket_name, object_name, expires, options) end end diff --git a/lib/fog/storage/google_xml/requests/get_service.rb b/lib/fog/google/storage/storage_xml/requests/get_service.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/get_service.rb rename to lib/fog/google/storage/storage_xml/requests/get_service.rb index f78c9ba8a..7151041eb 100644 --- a/lib/fog/storage/google_xml/requests/get_service.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_service.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # List information about Google Storage buckets for authorized user # diff --git a/lib/fog/storage/google_xml/requests/head_object.rb b/lib/fog/google/storage/storage_xml/requests/head_object.rb similarity index 98% rename from lib/fog/storage/google_xml/requests/head_object.rb rename to lib/fog/google/storage/storage_xml/requests/head_object.rb index c77faed03..9219751e2 100644 --- a/lib/fog/storage/google_xml/requests/head_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/head_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get headers for an object from Google Storage # diff --git a/lib/fog/storage/google_xml/requests/put_bucket.rb b/lib/fog/google/storage/storage_xml/requests/put_bucket.rb similarity index 98% rename from lib/fog/storage/google_xml/requests/put_bucket.rb rename to lib/fog/google/storage/storage_xml/requests/put_bucket.rb index 134ebc4ea..03ce55d84 100644 --- a/lib/fog/storage/google_xml/requests/put_bucket.rb +++ b/lib/fog/google/storage/storage_xml/requests/put_bucket.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Create an Google Storage bucket # diff --git a/lib/fog/storage/google_xml/requests/put_bucket_acl.rb b/lib/fog/google/storage/storage_xml/requests/put_bucket_acl.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/put_bucket_acl.rb rename to lib/fog/google/storage/storage_xml/requests/put_bucket_acl.rb index 8170d9d7c..a63822e4b 100644 --- a/lib/fog/storage/google_xml/requests/put_bucket_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/put_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Mock def put_bucket_acl(_bucket_name, _acl) # :no-coverage: diff --git a/lib/fog/storage/google_xml/requests/put_object.rb b/lib/fog/google/storage/storage_xml/requests/put_object.rb similarity index 99% rename from lib/fog/storage/google_xml/requests/put_object.rb rename to lib/fog/google/storage/storage_xml/requests/put_object.rb index 9f74dbcf1..2b992481d 100644 --- a/lib/fog/storage/google_xml/requests/put_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/put_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Create an object in an Google Storage bucket # diff --git a/lib/fog/storage/google_xml/requests/put_object_acl.rb b/lib/fog/google/storage/storage_xml/requests/put_object_acl.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/put_object_acl.rb rename to lib/fog/google/storage/storage_xml/requests/put_object_acl.rb index 6457d387a..9cab9cddc 100644 --- a/lib/fog/storage/google_xml/requests/put_object_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/put_object_acl.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # TODO: move this methods to helper to use them with put_bucket_acl request def tag(name, value) diff --git a/lib/fog/storage/google_xml/requests/put_object_url.rb b/lib/fog/google/storage/storage_xml/requests/put_object_url.rb similarity index 97% rename from lib/fog/storage/google_xml/requests/put_object_url.rb rename to lib/fog/google/storage/storage_xml/requests/put_object_url.rb index 18ae8bc6b..c90dbf112 100644 --- a/lib/fog/storage/google_xml/requests/put_object_url.rb +++ b/lib/fog/google/storage/storage_xml/requests/put_object_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML class Real # Get an expiring object url from Google Storage for putting an object # diff --git a/lib/fog/storage/google_xml/utils.rb b/lib/fog/google/storage/storage_xml/utils.rb similarity index 85% rename from lib/fog/storage/google_xml/utils.rb rename to lib/fog/google/storage/storage_xml/utils.rb index 48ae74738..5ab356b4b 100644 --- a/lib/fog/storage/google_xml/utils.rb +++ b/lib/fog/google/storage/storage_xml/utils.rb @@ -1,17 +1,17 @@ module Fog - module Storage - class GoogleXML + module Google + class StorageXML module Utils # https://cloud.google.com/storage/docs/access-control#predefined-acl - VALID_ACLS = [ - "authenticated-read", - "bucket-owner-full-control", - "bucket-owner-read", - "private", - "project-private", - "public-read", - "public-read-write" - ].freeze + VALID_ACLS = %w( + authenticated-read + bucket-owner-full-control + bucket-owner-read + private + project-private + public-read + public-read-write + ).freeze def http_url(params, expires) "http://" << host_path_query(params, expires) @@ -22,7 +22,7 @@ def https_url(params, expires) end def url(params, expires) - Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("Fog::Google::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]") https_url(params, expires) end @@ -46,7 +46,7 @@ def host_path_query(params, expires) def request_params(params) subdomain = params[:host].split(".#{@host}").first - if @path_style || subdomain !~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/ + if @path_style || subdomain !~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![.-])|-(?!\.)){1,61}[a-z0-9]$/ if subdomain =~ /_/ # https://github.com/fog/fog/pull/1258#issuecomment-10248620. Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).") @@ -61,12 +61,13 @@ def request_params(params) end params[:host] = params[:host].split("#{subdomain}.")[-1] - params[:path] = - if params[:path] + if params[:path] + params[:path] = "#{subdomain}/#{params[:path]}" - else + else + params[:path] = subdomain.to_s - end + end subdomain = nil end diff --git a/test/integration/storage/storage_shared.rb b/test/integration/storage/storage_shared.rb index d0e748835..f9767828c 100644 --- a/test/integration/storage/storage_shared.rb +++ b/test/integration/storage/storage_shared.rb @@ -6,7 +6,7 @@ class StorageShared < FogIntegrationTest def setup - @client = Fog::Storage::Google.new + @client = Fog::Google::Storage.new # Enable retries during the suite. This prevents us from # having to manually rate limit our requests. ::Google::Apis::RequestOptions.default.retries = 5 diff --git a/test/unit/storage/test_common_json_collections.rb b/test/unit/storage/test_common_json_collections.rb index 47aa548c6..953d7d22f 100644 --- a/test/unit/storage/test_common_json_collections.rb +++ b/test/unit/storage/test_common_json_collections.rb @@ -10,7 +10,7 @@ def setup descendants = ObjectSpace.each_object(Fog::Collection.singleton_class) @collections = descendants.select do |d| - d.name.match(/Fog::Storage::GoogleJSON/) + d.name.match(/Fog::Google::StorageJSON/) end end diff --git a/test/unit/storage/test_common_xml_collections.rb b/test/unit/storage/test_common_xml_collections.rb index d9ece7c85..d4936c6c8 100644 --- a/test/unit/storage/test_common_xml_collections.rb +++ b/test/unit/storage/test_common_xml_collections.rb @@ -12,7 +12,7 @@ def setup descendants = ObjectSpace.each_object(Fog::Collection.singleton_class) @collections = descendants.select do |d| - d.name.match(/Fog::Storage::GoogleXML/) + d.name.match(/Fog::Google::StorageXML/) end end From 7a2b2865cd7f30e3101b1d1b461032ab2e36cd14 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 20 Sep 2018 18:54:48 +1000 Subject: [PATCH 5/9] Rename Fog::Parsers::Storage::Google to Fog::Google::Parsers::Storage --- lib/fog/google.rb | 6 ++---- .../parsers/storage}/access_control_list.rb | 6 +++--- .../parsers/storage}/copy_object.rb | 6 +++--- .../parsers/storage}/get_bucket.rb | 6 +++--- .../parsers/storage}/get_bucket_logging.rb | 6 +++--- .../storage}/get_bucket_object_versions.rb | 6 +++--- .../parsers/storage}/get_bucket_versioning.rb | 6 +++--- .../parsers/storage}/get_request_payment.rb | 6 +++--- .../parsers/storage}/get_service.rb | 6 +++--- lib/fog/google/parsers/storage/storage.rb | 15 +++++++++++++++ .../storage/storage_xml/requests/copy_object.rb | 2 +- .../storage/storage_xml/requests/get_bucket.rb | 2 +- .../storage_xml/requests/get_bucket_acl.rb | 2 +- .../storage_xml/requests/get_object_acl.rb | 2 +- .../storage/storage_xml/requests/get_service.rb | 2 +- lib/fog/parsers/storage/google.rb | 15 --------------- 16 files changed, 46 insertions(+), 48 deletions(-) rename lib/fog/{parsers/storage/google => google/parsers/storage}/access_control_list.rb (95%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/copy_object.rb (85%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_bucket.rb (96%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_bucket_logging.rb (94%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_bucket_object_versions.rb (97%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_bucket_versioning.rb (87%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_request_payment.rb (81%) rename lib/fog/{parsers/storage/google => google/parsers/storage}/get_service.rb (91%) create mode 100644 lib/fog/google/parsers/storage/storage.rb delete mode 100644 lib/fog/parsers/storage/google.rb diff --git a/lib/fog/google.rb b/lib/fog/google.rb index a2b7ac46e..4abb13faf 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -34,11 +34,9 @@ def self.escape(str, extra_exclude_chars = "") "%" + Regexp.last_match(1).unpack("H2" * Regexp.last_match(1).bytesize).join("%").upcase end end - end - module Parsers - module Storage - autoload :Google, File.expand_path("../parsers/storage/google", __FILE__) + module Parsers + autoload :Storage, 'fog/google/parsers/storage/storage' end end end diff --git a/lib/fog/parsers/storage/google/access_control_list.rb b/lib/fog/google/parsers/storage/access_control_list.rb similarity index 95% rename from lib/fog/parsers/storage/google/access_control_list.rb rename to lib/fog/google/parsers/storage/access_control_list.rb index 932803086..68ad1a7b3 100644 --- a/lib/fog/parsers/storage/google/access_control_list.rb +++ b/lib/fog/google/parsers/storage/access_control_list.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class AccessControlList < Fog::Parsers::Base def reset @in_entries = false diff --git a/lib/fog/parsers/storage/google/copy_object.rb b/lib/fog/google/parsers/storage/copy_object.rb similarity index 85% rename from lib/fog/parsers/storage/google/copy_object.rb rename to lib/fog/google/parsers/storage/copy_object.rb index 0730f9ca0..aa91bf308 100644 --- a/lib/fog/parsers/storage/google/copy_object.rb +++ b/lib/fog/google/parsers/storage/copy_object.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class CopyObject < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/parsers/storage/google/get_bucket.rb b/lib/fog/google/parsers/storage/get_bucket.rb similarity index 96% rename from lib/fog/parsers/storage/google/get_bucket.rb rename to lib/fog/google/parsers/storage/get_bucket.rb index ae638754f..677329d7c 100644 --- a/lib/fog/parsers/storage/google/get_bucket.rb +++ b/lib/fog/google/parsers/storage/get_bucket.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class GetBucket < Fog::Parsers::Base def reset @object = { "Owner" => {} } diff --git a/lib/fog/parsers/storage/google/get_bucket_logging.rb b/lib/fog/google/parsers/storage/get_bucket_logging.rb similarity index 94% rename from lib/fog/parsers/storage/google/get_bucket_logging.rb rename to lib/fog/google/parsers/storage/get_bucket_logging.rb index 0017c8288..9537333e7 100644 --- a/lib/fog/parsers/storage/google/get_bucket_logging.rb +++ b/lib/fog/google/parsers/storage/get_bucket_logging.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class AccessControlList < Fog::Parsers::Base def reset @grant = { "Grantee" => {} } diff --git a/lib/fog/parsers/storage/google/get_bucket_object_versions.rb b/lib/fog/google/parsers/storage/get_bucket_object_versions.rb similarity index 97% rename from lib/fog/parsers/storage/google/get_bucket_object_versions.rb rename to lib/fog/google/parsers/storage/get_bucket_object_versions.rb index 298b792ae..f304e0708 100644 --- a/lib/fog/parsers/storage/google/get_bucket_object_versions.rb +++ b/lib/fog/google/parsers/storage/get_bucket_object_versions.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class GetBucketObjectVersions < Fog::Parsers::Base def reset @delete_marker = { "Owner" => {} } diff --git a/lib/fog/parsers/storage/google/get_bucket_versioning.rb b/lib/fog/google/parsers/storage/get_bucket_versioning.rb similarity index 87% rename from lib/fog/parsers/storage/google/get_bucket_versioning.rb rename to lib/fog/google/parsers/storage/get_bucket_versioning.rb index 63f3aaa15..9ca6b77a6 100644 --- a/lib/fog/parsers/storage/google/get_bucket_versioning.rb +++ b/lib/fog/google/parsers/storage/get_bucket_versioning.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class GetBucketVersioning < Fog::Parsers::Base def reset @response = { "VersioningConfiguration" => {} } diff --git a/lib/fog/parsers/storage/google/get_request_payment.rb b/lib/fog/google/parsers/storage/get_request_payment.rb similarity index 81% rename from lib/fog/parsers/storage/google/get_request_payment.rb rename to lib/fog/google/parsers/storage/get_request_payment.rb index de0aae0f8..640b29e6b 100644 --- a/lib/fog/parsers/storage/google/get_request_payment.rb +++ b/lib/fog/google/parsers/storage/get_request_payment.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class GetRequestPayment < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/parsers/storage/google/get_service.rb b/lib/fog/google/parsers/storage/get_service.rb similarity index 91% rename from lib/fog/parsers/storage/google/get_service.rb rename to lib/fog/google/parsers/storage/get_service.rb index 86c9d5d2d..8efedf3a3 100644 --- a/lib/fog/parsers/storage/google/get_service.rb +++ b/lib/fog/google/parsers/storage/get_service.rb @@ -1,7 +1,7 @@ module Fog - module Parsers - module Storage - module Google + module Google + module Parsers + module Storage class GetService < Fog::Parsers::Base def reset @bucket = {} diff --git a/lib/fog/google/parsers/storage/storage.rb b/lib/fog/google/parsers/storage/storage.rb new file mode 100644 index 000000000..4b10147ce --- /dev/null +++ b/lib/fog/google/parsers/storage/storage.rb @@ -0,0 +1,15 @@ +module Fog + module Google + module Parsers + module Storage + autoload :AccessControlList, 'fog/google/parsers/storage/access_control_list' + autoload :CopyObject, 'fog/google/parsers/storage/copy_object' + autoload :GetBucket, 'fog/google/parsers/storage/get_bucket' + autoload :GetBucketLogging, 'fog/google/parsers/storage/get_bucket_logging' + autoload :GetBucketObjectVersions, 'fog/google/parsers/storage/get_bucket_object_versions' + autoload :GetRequestPayment, 'fog/google/parsers/storage/get_request_payment' + autoload :GetService, 'fog/google/parsers/storage/get_service' + end + end + end +end diff --git a/lib/fog/google/storage/storage_xml/requests/copy_object.rb b/lib/fog/google/storage/storage_xml/requests/copy_object.rb index f7b9d9e9c..7fa8a6052 100644 --- a/lib/fog/google/storage/storage_xml/requests/copy_object.rb +++ b/lib/fog/google/storage/storage_xml/requests/copy_object.rb @@ -28,7 +28,7 @@ def copy_object(source_bucket_name, source_object_name, target_bucket_name, targ :headers => headers, :host => "#{target_bucket_name}.#{@host}", :method => "PUT", - :parser => Fog::Parsers::Storage::Google::CopyObject.new, + :parser => Fog::Google::Parsers::Storage::CopyObject.new, :path => Fog::Google.escape(target_object_name)) end end diff --git a/lib/fog/google/storage/storage_xml/requests/get_bucket.rb b/lib/fog/google/storage/storage_xml/requests/get_bucket.rb index 975b728d1..ab3524057 100644 --- a/lib/fog/google/storage/storage_xml/requests/get_bucket.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_bucket.rb @@ -40,7 +40,7 @@ def get_bucket(bucket_name, options = {}) :host => "#{bucket_name}.#{@host}", :idempotent => true, :method => "GET", - :parser => Fog::Parsers::Storage::Google::GetBucket.new, + :parser => Fog::Google::Parsers::Storage::GetBucket.new, :query => options) end end diff --git a/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb b/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb index 9c1bc7bf8..d46d01c90 100644 --- a/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_bucket_acl.rb @@ -30,7 +30,7 @@ def get_bucket_acl(bucket_name) :host => "#{bucket_name}.#{@host}", :idempotent => true, :method => "GET", - :parser => Fog::Parsers::Storage::Google::AccessControlList.new, + :parser => Fog::Google::Parsers::Storage::AccessControlList.new, :query => { "acl" => nil }) end end diff --git a/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb b/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb index 04563521d..e67cdee12 100644 --- a/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_object_acl.rb @@ -38,7 +38,7 @@ def get_object_acl(bucket_name, object_name, options = {}) :host => "#{bucket_name}.#{@host}", :idempotent => true, :method => "GET", - :parser => Fog::Parsers::Storage::Google::AccessControlList.new, + :parser => Fog::Google::Parsers::Storage::AccessControlList.new, :path => Fog::Google.escape(object_name), :query => query) end diff --git a/lib/fog/google/storage/storage_xml/requests/get_service.rb b/lib/fog/google/storage/storage_xml/requests/get_service.rb index 7151041eb..14c7ba1f5 100644 --- a/lib/fog/google/storage/storage_xml/requests/get_service.rb +++ b/lib/fog/google/storage/storage_xml/requests/get_service.rb @@ -19,7 +19,7 @@ def get_service :host => @host, :idempotent => true, :method => "GET", - :parser => Fog::Parsers::Storage::Google::GetService.new) + :parser => Fog::Google::Parsers::Storage::GetService.new) end end diff --git a/lib/fog/parsers/storage/google.rb b/lib/fog/parsers/storage/google.rb deleted file mode 100644 index 455c8b618..000000000 --- a/lib/fog/parsers/storage/google.rb +++ /dev/null @@ -1,15 +0,0 @@ -module Fog - module Parsers - module Storage - module Google - autoload :AccessControlList, File.expand_path("../google/access_control_list", __FILE__) - autoload :CopyObject, File.expand_path("../google/copy_object", __FILE__) - autoload :GetBucket, File.expand_path("../google/get_bucket", __FILE__) - autoload :GetBucketLogging, File.expand_path("../google/get_bucket_logging", __FILE__) - autoload :GetBucketObjectVersions, File.expand_path("../google/get_bucket_object_versions", __FILE__) - autoload :GetRequestPayment, File.expand_path("../google/get_request_payment", __FILE__) - autoload :GetService, File.expand_path("../google/get_service", __FILE__) - end - end - end -end From bcab9a4ff2d0414fab3d1c152ceced0cdd2e4f29 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Mar 2025 11:12:03 -0700 Subject: [PATCH 6/9] Use lib/fog/google/parsers/storage.rb This lines up more with Ruby best practices for module and class locations. --- lib/fog/google.rb | 2 +- lib/fog/google/parsers/{storage => }/storage.rb | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/fog/google/parsers/{storage => }/storage.rb (100%) diff --git a/lib/fog/google.rb b/lib/fog/google.rb index 4abb13faf..394c20a5a 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -36,7 +36,7 @@ def self.escape(str, extra_exclude_chars = "") end module Parsers - autoload :Storage, 'fog/google/parsers/storage/storage' + autoload :Storage, 'fog/google/parsers/storage' end end end diff --git a/lib/fog/google/parsers/storage/storage.rb b/lib/fog/google/parsers/storage.rb similarity index 100% rename from lib/fog/google/parsers/storage/storage.rb rename to lib/fog/google/parsers/storage.rb From 3808fc2bad196c15c1b8722d2a96e08a43ca1a72 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 25 Apr 2025 12:35:36 -0700 Subject: [PATCH 7/9] Revert module name changes in CHANGELOG.md These changes might cause some confusion. --- CHANGELOG.md | 82 ++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 515c45362..87df40024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html #### Fixed - #609 Fixed missing paging on all models [agrare] -- #608 Fixed `Fog::Google::Compute::Servers#all` paging [agrare] +- #608 Fixed `Fog::Compute::Google::Servers#all` paging [agrare] ### Development changes @@ -267,7 +267,7 @@ Drop travis usage #### Fixed -- \#498 Add `:idempotent` flag to Fog::Google::StorageXML::Real#head_object, fixing +- \#498 Add `:idempotent` flag to Fog::Storage::GoogleXML::Real#head_object, fixing `Excon::Error::Socket: end of file reached (EOFError)` in certain scenarios, see \#416 [temikus] - \#500 Set default options automatically if missing in `Pubsub#pull_subscription` @@ -323,8 +323,8 @@ Drop travis usage #### Fixed -- \#448 Add `:google_application_default` as recognized argument in - Fog::Google::Compute client [mavin] +- \#448 Add `:google_application_default` as recognized argument in + Fog::Compute::Google client [mavin] ### Development changes @@ -339,14 +339,14 @@ Drop travis usage #### Added - \#442 Add support for Application Default credentials [mavin] - - This change allows the use of Application Default Credentials so that end + - This change allows the use of Application Default Credentials so that end users can authenticate without a service account for development, testing, - and one-off interactions by using `:google_application_default`client + and one-off interactions by using `:google_application_default`client option. See README for more details. ### Fixed -- \#444 Remove deprecated `google_client_email` option from client parameters +- \#444 Remove deprecated `google_client_email` option from client parameters [temikus] - \#446 Updating service parameters to avoid "unrecognised parameter" warnings when initializing Fog client with application default auth [temikus] @@ -371,7 +371,7 @@ Drop travis usage #### Fixed -- \#433 Allow the api to close Tempfiles inline, improving disk utilization. +- \#433 Allow the api to close Tempfiles inline, improving disk utilization. [itopalov] ### Development changes @@ -413,12 +413,12 @@ Drop travis usage - \#419 Locked down fog upstream dependencies to alleviate deprecation warnings until they can be properly dealt with. [temikus] - \#400 Small `%Collection%.get` and `%Collection%.all` behaviour fixes [temikus] - - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid + - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid `sql#instancesList` object. - - `Fog::Google::Compute::InstanceGroups.get` and `.all` methods now support + - `Fog::Compute::Google::InstanceGroups.get` and `.all` methods now support more than just `:filter` option, fixed `.all` output without `zone` option. - Fix a typo causing `Operations.get(region:REGION)` to fail. - - `Fog::Google::Compute::Images.get(IMAGE, PROJECT)`, now returns `nil` if + - `Fog::Compute::Google::Images.get(IMAGE, PROJECT)`, now returns `nil` if image is not found rather than throwing `Google::Apis::ClientError`. ### Development changes @@ -426,13 +426,13 @@ Drop travis usage #### Added - \#400 Additional test coverage [temikus] - - Expanded tests for `%Collection%.get` behavior - scoped requests - (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also + - Expanded tests for `%Collection%.get` behavior - scoped requests + (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also properly tested. - - Increase `Fog::Google::Compute::Images` integration test coverage. + - Increase `Fog::Compute::Google::Images` integration test coverage. - Unit tests now work without a `~/.fog` config file set up. - Expanded unit test coverage. -- \#424 Add simple integration tests to check client proxy options being +- \#424 Add simple integration tests to check client proxy options being applied. #### Changed @@ -449,7 +449,7 @@ Drop travis usage #### Fixed -- \#412 Fixed `Fog::Google::StorageXML::GetObjectHttpUrl#get_object_http_url` +- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url` request ## 1.7.0 @@ -458,25 +458,25 @@ Drop travis usage #### Added -- \#409 Support query parameters in `Fog::Google::Storage` GET requests [stanhu] -- \#394 Add some helper methods to `Fog::Google::Compute::Server` [temikus] +- \#409 Support query parameters in `Fog::Storage::Google` GET requests [stanhu] +- \#394 Add some helper methods to `Fog::Compute::Google::Server` [temikus] - `.private_ip_address` - `.stopped?` -- \#375 Add timeout options to `Fog::Google::StorageJSON` client [dosuken123] +- \#375 Add timeout options to `Fog::Storage::GoogleJSON` client [dosuken123] #### Changed -- \#394 `save/update/destroy` and other operations now wait until they are in a - DONE state, instead of !PENDING. This should be a no-op for users but should +- \#394 `save/update/destroy` and other operations now wait until they are in a + DONE state, instead of !PENDING. This should be a no-op for users but should safeguard from issues in the future. [temikus] -- \#383 `Fog::Google::Compute::Address` resources are now created synchronously +- \#383 `Fog::Compute::Google::Address` resources are now created synchronously by default. [temikus] ### Development changes #### Added -- \#409 Expand `Fog::Google::Storage` unit tests [stanhu] +- \#409 Expand `Fog::Storage::Google` unit tests [stanhu] - \#370 Introducing test coverage back, integrating with codecov.io [temikus] - \#373 Increase integration test coverage. [temikus] - Add Firewall factory and tests. @@ -485,7 +485,7 @@ Drop travis usage - \#376 Add doc coverage tracking. [temikus] - \#383 Increase integration test coverage further. [temikus] - Add collection tests and factories (when mutable) for following resources: - - Addresses + - Addresses - Disks - Projects - Routes @@ -509,23 +509,23 @@ Drop travis usage #### Changed -- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default. +- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default. You can override it in a standard manner by passing a parameter to async method, e.g.: `Fog::Google::SQL::Instance.create(true)` [temikus] -- \#367 `Fog::Google::Compute::Server.bootstrap` changes [temikus] +- \#367 `Fog::Compute::Google::Server.bootstrap` changes [temikus] - Now creates instances with disks that automatically delete on instance shutdown. - Now creates instances with a public IP address by default. #### Added -- \#361 `Fog::Google::Compute::Server` now recognises `network_ip` attribute to specify internal IP. [mattimatti] +- \#361 `Fog::Compute::Google::Server` now recognises `network_ip` attribute to specify internal IP. [mattimatti] #### Fixed - \#338 Fixed SQL Users model workflow [temikus] - \#359 Fix whitespace escaping in XML Storage methods [temikus] - \#366 Fixing `Server` model to properly accept `:private_key_path` and `:public_key_path` attributes again. [temikus] -- \#367 `Fog::Google::Compute::Server.bootstrap` parameters are now properly merged with default ones. [tesmikus] +- \#367 `Fog::Compute::Google::Server.bootstrap` parameters are now properly merged with default ones. [tesmikus] ### Development changes @@ -544,7 +544,7 @@ You can override it in a standard manner by passing a parameter to async method, - \#348 Added Instance Group Manager and Instance Templates [bpaquet] - - `Fog::Google::Compute::InstanceGroupManager` model and associated requests: + - `Fog::Compute::Google::InstanceGroupManager` model and associated requests: - `:get_instance_group_manager` - `:insert_instance_group_manager` - `:delete_instance_group_manager` @@ -553,7 +553,7 @@ You can override it in a standard manner by passing a parameter to async method, - `:recreate_instances` - `:abandon_instances` - - `Fog::Google::Compute::InstanceTemplate` model and associated requests: + - `Fog::Compute::Google::InstanceTemplate` model and associated requests: - `:list_instance_templates` - `:get_instance_template` - `:insert_instance_template` @@ -577,31 +577,31 @@ You can override it in a standard manner by passing a parameter to async method, #### Added -- \#336 `Fog::Google::Compute::Server.set_metadata` is now working properly and adopted a simpler format, e.g. `{'foo' => 'bar', 'baz'=>'foo'}` -- \#334 Added a new helper method: `Fog::Google::Compute::Server.public_ip_address` [temikus] -- \#314 Added `Fog::Google::Compute::InstanceGroup.add_instance` method back [temikus] +- \#336 `Fog::Compute::Google::Server.set_metadata` is now working properly and adopted a simpler format, e.g. `{'foo' => 'bar', 'baz'=>'foo'}` +- \#334 Added a new helper method: `Fog::Compute::Google::Server.public_ip_address` [temikus] +- \#314 Added `Fog::Compute::Google::InstanceGroup.add_instance` method back [temikus] - \#326 Added support for using predefined ACLs, refactor valid ACLs [vimutter] - \#318 Added fog_public support in Storage JSON API [jayhsu21] #### Fixed -- \#354 Bump Google API client to 0.23 [temikus] -- \#346 Fixed get_health when called with an instance name [bpaquet] -- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] -- \#321 Fix string key instead of symbol for subnetworks listing [tumido] -- \#351 Fixed trailing spaces and added data presence check to `Fog::Google::StorageJSON.put_object` [vimutter] +- \#354 Bump Google API client to 0.23 [temikus] +- \#346 Fixed get_health when called with an instance name [bpaquet] +- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] +- \#321 Fix string key instead of symbol for subnetworks listing [tumido] +- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter] ### Development changes #### Added -- \#353 Added collection/model unit tests to be run by Travis CI [temikus] -- \#347 Added target pool tests [temikus] +- \#353 Added collection/model unit tests to be run by Travis CI [temikus] +- \#347 Added target pool tests [temikus] #### Fixed - \#322 Fixed all broken integration tests, all tests now pass in CI [temikus] -- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus] +- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus] ## 1.0.1 From c9e6f13ec3e1067ab06935575253d90abd9e95a7 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 25 Apr 2025 12:42:52 -0700 Subject: [PATCH 8/9] Drop unnecessary warnings in lib/fog/bin/google.rb It's not clear why these warnings were here in the first place. --- lib/fog/bin/google.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/fog/bin/google.rb b/lib/fog/bin/google.rb index 89440ff5f..47f75a4dc 100644 --- a/lib/fog/bin/google.rb +++ b/lib/fog/bin/google.rb @@ -26,10 +26,8 @@ def [](service) @@connections ||= Hash.new do |hash, key| case key when :compute - Fog::Logger.warning("Google[:compute] is not recommended, use Compute[:google] for portability") hash[key] = Fog::Compute.new(:provider => "Google") when :dns - Fog::Logger.warning("Google[:dns] is not recommended, use DNS[:google] for portability") hash[key] = Fog::DNS.new(:provider => "Google") when :monitoring hash[key] = Fog::Google::Monitoring.new @@ -38,7 +36,6 @@ def [](service) when :pubsub hash[key] = Fog::Google::Pubsub.new when :storage - Fog::Logger.warning("Google[:storage] is not recommended, use Storage[:google] for portability") hash[key] = Fog::Storage.new(:provider => "Google") else hash[key] = raise ArgumentError, "Unrecognized service: #{key.inspect}" From c7a31601854d682860353265d7322f0944a1cf81 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 25 Apr 2025 12:49:47 -0700 Subject: [PATCH 9/9] Add shims for backwards compatibility This allows old style references like Fog::Compute::Google to work by redirecting them to the new namespace Fog::Google::Compute. --- lib/fog/google.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/fog/google.rb b/lib/fog/google.rb index 394c20a5a..0fd61a64a 100644 --- a/lib/fog/google.rb +++ b/lib/fog/google.rb @@ -40,3 +40,28 @@ module Parsers end end end + +# Add shims for backward compatibility +# This allows old style references like Fog::Compute::Google to work +# by redirecting them to the new namespace Fog::Google::Compute + +module Fog + # List of services from the original module + GOOGLE_SERVICES = %w[Compute DNS Monitoring Pubsub Storage SQL] + + # Dynamically create shim modules for each service + GOOGLE_SERVICES.each do |service| + # Create the module namespace + const_set(service, Module.new) unless const_defined?(service) + + # Get reference to the module + service_module = const_get(service) + + # Define the Google submodule with the shim + service_module.const_set(:Google, Module.new) + service_module::Google.define_singleton_method(:new) do |*args| + warn "[DEPRECATION] `Fog::#{service}::Google.new` is deprecated. Please use `Fog::Google::#{service}.new` instead." + Fog::Google.const_get(service).new(*args) + end + end +end