fog-google 0.1.3 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.editorconfig +11 -0
- data/.gitignore +1 -0
- data/.hound.yml +2 -0
- data/.rubocop.yml +225 -5
- data/.travis.yml +13 -11
- data/CONTRIBUTORS.md +1 -0
- data/Gemfile +1 -1
- data/README.md +31 -16
- data/Rakefile +15 -39
- data/examples/backend_services.rb +12 -11
- data/examples/bootstrap.rb +11 -1
- data/examples/{create.rb → create_instance.rb} +20 -11
- data/examples/dns/project.rb +2 -3
- data/examples/dns/zones.rb +21 -21
- data/examples/get_list_images.rb +31 -15
- data/examples/get_list_snapshots.rb +20 -10
- data/examples/image_create.rb +5 -5
- data/examples/l7_load_balance.rb +56 -58
- data/examples/load-balance.rb +22 -23
- data/examples/metadata.rb +17 -9
- data/examples/monitoring/metric_descriptors.rb +19 -6
- data/examples/monitoring/timeseries_collection.rb +23 -11
- data/examples/monitoring/timeseries_descriptors.rb +23 -11
- data/examples/network.rb +25 -29
- data/examples/precreated_client.rb +3 -6
- data/examples/sql/flags.rb +2 -2
- data/examples/sql/instances.rb +18 -18
- data/examples/sql/operations.rb +9 -9
- data/examples/sql/ssl_certs.rb +13 -13
- data/examples/sql/tiers.rb +2 -2
- data/examples/storage.rb +37 -0
- data/examples/storage_json.rb +37 -0
- data/fog-google.gemspec +24 -21
- data/lib/fog/bin/google.rb +34 -32
- data/lib/fog/{google/compute.rb → compute/google.rb} +207 -151
- data/lib/fog/{google/models/compute → compute/google/models}/address.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/addresses.rb +10 -14
- data/lib/fog/{google/models/compute → compute/google/models}/backend_service.rb +28 -34
- data/lib/fog/{google/models/compute → compute/google/models}/backend_services.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/disk.rb +35 -39
- data/lib/fog/{google/models/compute → compute/google/models}/disk_type.rb +4 -6
- data/lib/fog/{google/models/compute → compute/google/models}/disk_types.rb +7 -10
- data/lib/fog/{google/models/compute → compute/google/models}/disks.rb +9 -12
- data/lib/fog/{google/models/compute → compute/google/models}/firewall.rb +10 -14
- data/lib/fog/{google/models/compute → compute/google/models}/firewalls.rb +1 -4
- data/lib/fog/compute/google/models/flavor.rb +31 -0
- data/lib/fog/{google/models/compute → compute/google/models}/flavors.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/forwarding_rule.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/forwarding_rules.rb +8 -11
- data/lib/fog/compute/google/models/global_forwarding_rule.rb +82 -0
- data/lib/fog/{google/models/compute → compute/google/models}/global_forwarding_rules.rb +2 -5
- data/lib/fog/compute/google/models/http_health_check.rb +80 -0
- data/lib/fog/{google/models/compute → compute/google/models}/http_health_checks.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/image.rb +18 -22
- data/lib/fog/{google/models/compute → compute/google/models}/images.rb +24 -17
- data/lib/fog/{google/models/compute → compute/google/models}/instance_group.rb +5 -8
- data/lib/fog/{google/models/compute → compute/google/models}/instance_groups.rb +10 -13
- data/lib/fog/{google/models/compute → compute/google/models}/network.rb +9 -13
- data/lib/fog/{google/models/compute → compute/google/models}/networks.rb +1 -4
- data/lib/fog/{google/models/compute → compute/google/models}/operation.rb +16 -18
- data/lib/fog/{google/models/compute → compute/google/models}/operations.rb +8 -11
- data/lib/fog/{google/models/compute → compute/google/models}/project.rb +5 -7
- data/lib/fog/{google/models/compute → compute/google/models}/projects.rb +0 -3
- data/lib/fog/{google/models/compute → compute/google/models}/region.rb +5 -7
- data/lib/fog/{google/models/compute → compute/google/models}/regions.rb +1 -4
- data/lib/fog/compute/google/models/resource_view.rb +108 -0
- data/lib/fog/compute/google/models/resource_views.rb +54 -0
- data/lib/fog/{google/models/compute → compute/google/models}/route.rb +12 -16
- data/lib/fog/{google/models/compute → compute/google/models}/routes.rb +1 -4
- data/lib/fog/{google/models/compute → compute/google/models}/server.rb +81 -92
- data/lib/fog/{google/models/compute → compute/google/models}/servers.rb +13 -16
- data/lib/fog/compute/google/models/snapshot.rb +44 -0
- data/lib/fog/{google/models/compute → compute/google/models}/snapshots.rb +1 -4
- data/lib/fog/compute/google/models/subnetwork.rb +49 -0
- data/lib/fog/compute/google/models/subnetworks.rb +29 -0
- data/lib/fog/{google/models/compute → compute/google/models}/target_http_proxies.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/target_http_proxy.rb +18 -22
- data/lib/fog/{google/models/compute → compute/google/models}/target_instance.rb +23 -28
- data/lib/fog/{google/models/compute → compute/google/models}/target_instances.rb +9 -12
- data/lib/fog/{google/models/compute → compute/google/models}/target_pool.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/target_pools.rb +6 -9
- data/lib/fog/{google/models/compute → compute/google/models}/url_map.rb +32 -36
- data/lib/fog/{google/models/compute → compute/google/models}/url_maps.rb +1 -4
- data/lib/fog/compute/google/models/zone.rb +21 -0
- data/lib/fog/{google/models/compute → compute/google/models}/zones.rb +0 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_backend_service_backends.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_instance_group_instance.rb +4 -4
- data/lib/fog/compute/google/requests/add_region_view_resources.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_server_access_config.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_target_pool_health_checks.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_target_pool_instances.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_url_map_host_rules.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_url_map_path_matchers.rb +7 -7
- data/lib/fog/compute/google/requests/add_zone_view_resources.rb +27 -0
- data/lib/fog/compute/google/requests/attach_disk.rb +34 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_address.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_backend_service.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_disk.rb +9 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_firewall.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_forwarding_rule.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_global_forwarding_rule.rb +12 -12
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_global_operation.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_http_health_check.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_image.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_instance_group.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_network.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_region_operation.rb +6 -6
- data/lib/fog/compute/google/requests/delete_region_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_route.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_server.rb +15 -17
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_server_access_config.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_snapshot.rb +3 -3
- data/lib/fog/compute/google/requests/delete_subnetwork.rb +49 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_http_proxy.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_instance.rb +9 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_pool.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_url_map.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_zone_operation.rb +5 -7
- data/lib/fog/compute/google/requests/delete_zone_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/detach_disk.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_address.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_service.rb +5 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_service_health.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_services.rb +6 -6
- data/lib/fog/compute/google/requests/get_disk.rb +46 -0
- data/lib/fog/compute/google/requests/get_disk_type.rb +40 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_firewall.rb +3 -3
- data/lib/fog/compute/google/requests/get_forwarding_rule.rb +44 -0
- data/lib/fog/compute/google/requests/get_global_forwarding_rule.rb +30 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_global_operation.rb +8 -8
- data/lib/fog/compute/google/requests/get_http_health_check.rb +37 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_image.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_instance_group.rb +5 -5
- data/lib/fog/compute/google/requests/get_machine_type.rb +41 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_network.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_project.rb +2 -2
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_region.rb +9 -9
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_region_operation.rb +11 -11
- data/lib/fog/compute/google/requests/get_region_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_route.rb +3 -3
- data/lib/fog/compute/google/requests/get_server.rb +71 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_server_serial_port_output.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_snapshot.rb +5 -7
- data/lib/fog/compute/google/requests/get_subnetwork.rb +45 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_http_proxy.rb +4 -6
- data/lib/fog/compute/google/requests/get_target_instance.rb +28 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_pool.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_pool_health.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_url_map.rb +4 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_zone.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_zone_operation.rb +10 -12
- data/lib/fog/compute/google/requests/get_zone_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_address.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_backend_service.rb +17 -17
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_disk.rb +26 -30
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_firewall.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_forwarding_rule.rb +13 -13
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_global_forwarding_rule.rb +13 -13
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_http_health_check.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_image.rb +14 -14
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_instance_group.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_network.rb +6 -6
- data/lib/fog/compute/google/requests/insert_region_view.rb +25 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_route.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_server.rb +57 -57
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_snapshot.rb +8 -8
- data/lib/fog/compute/google/requests/insert_subnetwork.rb +75 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_http_proxy.rb +9 -9
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_instance.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_pool.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_url_map.rb +9 -9
- data/lib/fog/compute/google/requests/insert_zone_view.rb +26 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_addresses.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_addresses.rb +3 -3
- data/lib/fog/compute/google/requests/list_aggregated_disk_types.rb +38 -0
- data/lib/fog/compute/google/requests/list_aggregated_disks.rb +37 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_instance_groups.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_machine_types.rb +1 -1
- data/lib/fog/compute/google/requests/list_aggregated_servers.rb +37 -0
- data/lib/fog/compute/google/requests/list_aggregated_subnetworks.rb +34 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_target_instances.rb +10 -13
- data/lib/fog/compute/google/requests/list_backend_services.rb +27 -0
- data/lib/fog/compute/google/requests/list_disk_types.rb +44 -0
- data/lib/fog/compute/google/requests/list_disks.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_firewalls.rb +1 -1
- data/lib/fog/compute/google/requests/list_forwarding_rules.rb +27 -0
- data/lib/fog/compute/google/requests/list_global_forwarding_rules.rb +28 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_global_operations.rb +1 -1
- data/lib/fog/compute/google/requests/list_http_health_checks.rb +27 -0
- data/lib/fog/compute/google/requests/list_images.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_instance_group_instances.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_instance_groups.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_machine_types.rb +6 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_networks.rb +1 -1
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_region_operations.rb +3 -3
- data/lib/fog/compute/google/requests/list_region_view_resources.rb +24 -0
- data/lib/fog/compute/google/requests/list_region_views.rb +23 -0
- data/lib/fog/compute/google/requests/list_regions.rb +83 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_routes.rb +2 -2
- data/lib/fog/compute/google/requests/list_servers.rb +29 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_snapshots.rb +3 -3
- data/lib/fog/compute/google/requests/list_subnetworks.rb +35 -0
- data/lib/fog/compute/google/requests/list_target_http_proxies.rb +27 -0
- data/lib/fog/compute/google/requests/list_target_instances.rb +28 -0
- data/lib/fog/compute/google/requests/list_target_pools.rb +27 -0
- data/lib/fog/compute/google/requests/list_url_maps.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_zone_operations.rb +3 -3
- data/lib/fog/compute/google/requests/list_zone_view_resources.rb +24 -0
- data/lib/fog/compute/google/requests/list_zone_views.rb +23 -0
- data/lib/fog/compute/google/requests/list_zones.rb +26 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_instance_group_instance.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_health_checks.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_instance.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_instances.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/reset_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_common_instance_metadata.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_forwarding_rule_target.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_global_forwarding_rule_target.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_metadata.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_server_disk_auto_delete.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_server_scheduling.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_tags.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_target_http_proxy_url_map.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/start_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/stop_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/update_url_map.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/validate_url_map.rb +5 -5
- data/lib/fog/{google/dns.rb → dns/google.rb} +9 -9
- data/lib/fog/{google/models/dns → dns/google/models}/change.rb +5 -7
- data/lib/fog/{google/models/dns → dns/google/models}/changes.rb +1 -4
- data/lib/fog/{google/models/dns → dns/google/models}/project.rb +6 -8
- data/lib/fog/{google/models/dns → dns/google/models}/projects.rb +0 -3
- data/lib/fog/{google/models/dns → dns/google/models}/record.rb +17 -27
- data/lib/fog/{google/models/dns → dns/google/models}/records.rb +2 -5
- data/lib/fog/{google/models/dns → dns/google/models}/zone.rb +6 -8
- data/lib/fog/{google/models/dns → dns/google/models}/zones.rb +1 -4
- data/lib/fog/{google/requests/dns → dns/google/requests}/create_change.rb +17 -17
- data/lib/fog/dns/google/requests/create_managed_zone.rb +82 -0
- data/lib/fog/{google/requests/dns → dns/google/requests}/delete_managed_zone.rb +6 -6
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_change.rb +7 -7
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_managed_zone.rb +4 -4
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_project.rb +12 -12
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_changes.rb +7 -7
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_managed_zones.rb +5 -5
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_resource_record_sets.rb +11 -11
- data/lib/fog/google.rb +78 -71
- data/lib/fog/google/models/monitoring/metric_descriptor.rb +3 -3
- data/lib/fog/google/models/monitoring/metric_descriptors.rb +3 -3
- data/lib/fog/google/models/monitoring/timeseries.rb +2 -2
- data/lib/fog/google/models/monitoring/timeseries_collection.rb +3 -3
- data/lib/fog/google/models/monitoring/timeseries_descriptor.rb +1 -1
- data/lib/fog/google/models/monitoring/timeseries_descriptors.rb +3 -3
- data/lib/fog/google/models/sql/backup_run.rb +8 -8
- data/lib/fog/google/models/sql/backup_runs.rb +3 -3
- data/lib/fog/google/models/sql/flag.rb +5 -5
- data/lib/fog/google/models/sql/flags.rb +3 -3
- data/lib/fog/google/models/sql/instance.rb +54 -68
- data/lib/fog/google/models/sql/instances.rb +4 -4
- data/lib/fog/google/models/sql/operation.rb +15 -15
- data/lib/fog/google/models/sql/operations.rb +5 -5
- data/lib/fog/google/models/sql/ssl_cert.rb +17 -19
- data/lib/fog/google/models/sql/ssl_certs.rb +5 -5
- data/lib/fog/google/models/sql/tier.rb +3 -3
- data/lib/fog/google/models/sql/tiers.rb +3 -3
- data/lib/fog/google/monitoring.rb +8 -8
- data/lib/fog/google/requests/monitoring/list_metric_descriptors.rb +131 -131
- data/lib/fog/google/requests/monitoring/list_timeseries.rb +32 -32
- data/lib/fog/google/requests/monitoring/list_timeseries_descriptors.rb +50 -50
- data/lib/fog/google/requests/sql/clone_instance.rb +41 -41
- data/lib/fog/google/requests/sql/delete_instance.rb +26 -26
- data/lib/fog/google/requests/sql/delete_ssl_cert.rb +27 -27
- data/lib/fog/google/requests/sql/export_instance.rb +22 -22
- data/lib/fog/google/requests/sql/get_backup_run.rb +5 -5
- data/lib/fog/google/requests/sql/get_instance.rb +12 -12
- data/lib/fog/google/requests/sql/get_operation.rb +21 -21
- data/lib/fog/google/requests/sql/get_ssl_cert.rb +21 -21
- data/lib/fog/google/requests/sql/import_instance.rb +21 -21
- data/lib/fog/google/requests/sql/insert_instance.rb +76 -78
- data/lib/fog/google/requests/sql/insert_ssl_cert.rb +33 -33
- data/lib/fog/google/requests/sql/list_backup_runs.rb +4 -4
- data/lib/fog/google/requests/sql/list_flags.rb +84 -84
- data/lib/fog/google/requests/sql/list_instances.rb +3 -3
- data/lib/fog/google/requests/sql/list_operations.rb +13 -13
- data/lib/fog/google/requests/sql/list_ssl_certs.rb +13 -13
- data/lib/fog/google/requests/sql/list_tiers.rb +39 -39
- data/lib/fog/google/requests/sql/reset_instance_ssl_config.rb +16 -16
- data/lib/fog/google/requests/sql/restart_instance.rb +16 -16
- data/lib/fog/google/requests/sql/restore_instance_backup.rb +5 -5
- data/lib/fog/google/requests/sql/set_instance_root_password.rb +20 -20
- data/lib/fog/google/requests/sql/update_instance.rb +52 -52
- data/lib/fog/google/sql.rb +7 -7
- data/lib/fog/google/version.rb +1 -1
- data/lib/fog/parsers/storage/google.rb +15 -0
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/access_control_list.rb +13 -13
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/copy_object.rb +3 -3
- data/lib/fog/parsers/storage/google/get_bucket.rb +58 -0
- data/lib/fog/parsers/storage/google/get_bucket_logging.rb +36 -0
- data/lib/fog/parsers/storage/google/get_bucket_object_versions.rb +84 -0
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_bucket_versioning.rb +3 -3
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_request_payment.rb +1 -1
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_service.rb +8 -8
- data/lib/fog/storage/google.rb +20 -0
- data/lib/fog/storage/google_json.rb +146 -0
- data/lib/fog/storage/google_json/models/directories.rb +26 -0
- data/lib/fog/storage/google_json/models/directory.rb +65 -0
- data/lib/fog/storage/google_json/models/file.rb +148 -0
- data/lib/fog/storage/google_json/models/files.rb +89 -0
- data/lib/fog/storage/google_json/requests/copy_object.rb +66 -0
- data/lib/fog/storage/google_json/requests/delete_bucket.rb +42 -0
- data/lib/fog/{google/requests/storage → storage/google_json/requests}/delete_object.rb +12 -12
- data/lib/fog/storage/google_json/requests/get_bucket.rb +86 -0
- data/lib/fog/{google/requests/storage → storage/google_json/requests}/get_bucket_acl.rb +12 -17
- data/lib/fog/storage/google_json/requests/get_object.rb +98 -0
- data/lib/fog/storage/google_json/requests/get_object_acl.rb +59 -0
- data/lib/fog/storage/google_json/requests/get_object_http_url.rb +40 -0
- data/lib/fog/storage/google_json/requests/get_object_https_url.rb +41 -0
- data/lib/fog/storage/google_json/requests/get_object_torrent.rb +13 -0
- data/lib/fog/storage/google_json/requests/get_object_url.rb +22 -0
- data/lib/fog/storage/google_json/requests/get_service.rb +54 -0
- data/lib/fog/storage/google_json/requests/head_object.rb +54 -0
- data/lib/fog/storage/google_json/requests/put_bucket.rb +68 -0
- data/lib/fog/storage/google_json/requests/put_bucket_acl.rb +34 -0
- data/lib/fog/storage/google_json/requests/put_object.rb +118 -0
- data/lib/fog/storage/google_json/requests/put_object_acl.rb +31 -0
- data/lib/fog/storage/google_json/requests/put_object_url.rb +45 -0
- data/lib/fog/{google/storage.rb → storage/google_xml.rb} +49 -53
- data/lib/fog/storage/google_xml/models/directories.rb +34 -0
- data/lib/fog/{google/models/storage → storage/google_xml/models}/directory.rb +13 -21
- data/lib/fog/{google/models/storage → storage/google_xml/models}/file.rb +34 -46
- data/lib/fog/{google/models/storage → storage/google_xml/models}/files.rb +21 -30
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/copy_object.rb +15 -21
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/delete_bucket.rb +10 -12
- data/lib/fog/storage/google_xml/requests/delete_object.rb +44 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_bucket.rb +33 -43
- data/lib/fog/storage/google_xml/requests/get_bucket_acl.rb +53 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object.rb +25 -37
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_acl.rb +16 -24
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_http_url.rb +8 -12
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_https_url.rb +8 -12
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_torrent.rb +10 -16
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_url.rb +1 -1
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_service.rb +13 -17
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/head_object.rb +14 -20
- data/lib/fog/storage/google_xml/requests/put_bucket.rb +71 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_bucket_acl.rb +12 -14
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object.rb +23 -27
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object_acl.rb +12 -14
- data/lib/fog/storage/google_xml/requests/put_object_url.rb +42 -0
- data/tasks/bundler.rake +3 -0
- data/tasks/console.rake +12 -0
- data/tasks/lint.rake +3 -0
- data/tasks/smoke.rake +15 -0
- data/tasks/test.rake +13 -0
- data/test/helpers/integration_test_helper.rb +3 -3
- data/test/helpers/test_collection.rb +1 -1
- data/test/helpers/test_helper.rb +8 -8
- data/test/integration/compute/test_servers.rb +1 -1
- data/test/integration/factories/backend_services_factory.rb +2 -2
- data/test/integration/factories/collection_factory.rb +4 -4
- data/test/integration/factories/disks_factory.rb +3 -3
- data/test/integration/factories/forwarding_rules_factory.rb +3 -4
- data/test/integration/factories/global_forwarding_rules_factory.rb +2 -2
- data/test/integration/factories/http_health_checks_factory.rb +1 -1
- data/test/integration/factories/images_factory.rb +2 -2
- data/test/integration/factories/servers_factory.rb +4 -4
- data/test/integration/factories/target_http_proxies_factory.rb +2 -2
- data/test/integration/factories/target_instances_factory.rb +3 -3
- data/test/integration/factories/target_pools_factory.rb +4 -4
- data/test/integration/factories/url_maps_factory.rb +2 -2
- data/test/integration/storage/test_buckets.rb +56 -0
- data/test/integration/storage/test_directories.rb +60 -0
- data/test/integration/storage/test_files.rb +132 -0
- data/test/integration/storage/test_objects.rb +111 -0
- data/test/integration/test_authentication.rb +14 -10
- data/tests/helper.rb +40 -42
- data/tests/helpers/collection_helper.rb +26 -37
- data/tests/helpers/compute/flavors_helper.rb +4 -8
- data/tests/helpers/compute/server_helper.rb +1 -5
- data/tests/helpers/compute/servers_helper.rb +0 -2
- data/tests/helpers/formats_helper.rb +12 -12
- data/tests/helpers/formats_helper_tests.rb +43 -47
- data/tests/helpers/mock_helper.rb +6 -8
- data/tests/helpers/model_helper.rb +6 -10
- data/tests/helpers/schema_validator_tests.rb +41 -47
- data/tests/helpers/succeeds_helper.rb +1 -1
- data/tests/models/dns/change_tests.rb +8 -10
- data/tests/models/dns/changes_tests.rb +8 -12
- data/tests/models/dns/projects_tests.rb +2 -5
- data/tests/models/dns/record_tests.rb +9 -10
- data/tests/models/dns/records_tests.rb +9 -13
- data/tests/models/dns/zone_tests.rb +6 -6
- data/tests/models/dns/zones_tests.rb +5 -5
- data/tests/models/monitoring/metric_descriptors_tests.rb +2 -5
- data/tests/models/monitoring/timeseries_collection_tests.rb +3 -6
- data/tests/models/monitoring/timeseries_descriptors_tests.rb +3 -6
- data/tests/models/sql/flags_tests.rb +2 -5
- data/tests/models/sql/instance_tests.rb +4 -7
- data/tests/models/sql/instances_tests.rb +4 -9
- data/tests/models/sql/operation_tests.rb +3 -6
- data/tests/models/sql/operations_tests.rb +4 -9
- data/tests/models/sql/ssl_cert_tests.rb +3 -6
- data/tests/models/sql/ssl_certs_tests.rb +4 -9
- data/tests/models/sql/tiers_tests.rb +2 -5
- data/tests/requests/compute/backend_service_tests.rb +43 -47
- data/tests/requests/compute/disk_tests.rb +42 -46
- data/tests/requests/compute/disk_type_tests.rb +18 -21
- data/tests/requests/compute/firewall_tests.rb +42 -45
- data/tests/requests/compute/forwarding_rules_tests.rb +44 -48
- data/tests/requests/compute/global_forwarding_rules_tests.rb +44 -48
- data/tests/requests/compute/http_health_checks_tests.rb +44 -48
- data/tests/requests/compute/image_tests.rb +41 -45
- data/tests/requests/compute/network_tests.rb +38 -41
- data/tests/requests/compute/operation_tests.rb +2 -3
- data/tests/requests/compute/region_tests.rb +18 -18
- data/tests/requests/compute/server_tests.rb +45 -47
- data/tests/requests/compute/target_http_proxies_test.rb +39 -43
- data/tests/requests/compute/target_instances_tests.rb +43 -47
- data/tests/requests/compute/target_pools_tests.rb +43 -47
- data/tests/requests/compute/url_maps_tests.rb +42 -46
- data/tests/requests/compute/zone_tests.rb +15 -19
- data/tests/requests/dns/change_tests.rb +18 -22
- data/tests/requests/dns/managed_zone_tests.rb +27 -30
- data/tests/requests/dns/project_tests.rb +13 -16
- data/tests/requests/dns/record_tests.rb +15 -18
- data/tests/requests/monitoring/metric_descriptor_tests.rb +9 -12
- data/tests/requests/monitoring/timeseries_collection_tests.rb +9 -12
- data/tests/requests/monitoring/timeseries_descriptor_tests.rb +10 -13
- data/tests/requests/sql/flag_tests.rb +11 -14
- data/tests/requests/sql/instance_tests.rb +36 -39
- data/tests/requests/sql/operation_tests.rb +17 -20
- data/tests/requests/sql/ssl_cert_tests.rb +21 -24
- data/tests/requests/sql/tier_tests.rb +9 -12
- data/tests/requests/storage/bucket_tests.rb +30 -36
- data/tests/requests/storage/object_tests.rb +21 -27
- metadata +309 -235
- data/examples/eric-fail.rb +0 -36
- data/examples/image_all.rb +0 -6
- data/examples/launch_micro_instance.rb +0 -29
- data/gemfiles/Gemfile.2.0.0+ +0 -6
- data/gemfiles/Gemfile.2.0.0- +0 -10
- data/lib/fog/google/models/compute/flavor.rb +0 -33
- data/lib/fog/google/models/compute/global_forwarding_rule.rb +0 -86
- data/lib/fog/google/models/compute/http_health_check.rb +0 -84
- data/lib/fog/google/models/compute/snapshot.rb +0 -48
- data/lib/fog/google/models/compute/zone.rb +0 -23
- data/lib/fog/google/models/storage/directories.rb +0 -39
- data/lib/fog/google/parsers/storage/get_bucket.rb +0 -58
- data/lib/fog/google/parsers/storage/get_bucket_logging.rb +0 -36
- data/lib/fog/google/parsers/storage/get_bucket_object_versions.rb +0 -84
- data/lib/fog/google/requests/compute/attach_disk.rb +0 -34
- data/lib/fog/google/requests/compute/get_disk.rb +0 -52
- data/lib/fog/google/requests/compute/get_disk_type.rb +0 -42
- data/lib/fog/google/requests/compute/get_forwarding_rule.rb +0 -46
- data/lib/fog/google/requests/compute/get_global_forwarding_rule.rb +0 -32
- data/lib/fog/google/requests/compute/get_http_health_check.rb +0 -39
- data/lib/fog/google/requests/compute/get_machine_type.rb +0 -43
- data/lib/fog/google/requests/compute/get_server.rb +0 -75
- data/lib/fog/google/requests/compute/get_target_instance.rb +0 -32
- data/lib/fog/google/requests/compute/list_aggregated_disk_types.rb +0 -40
- data/lib/fog/google/requests/compute/list_aggregated_disks.rb +0 -40
- data/lib/fog/google/requests/compute/list_aggregated_servers.rb +0 -40
- data/lib/fog/google/requests/compute/list_backend_services.rb +0 -29
- data/lib/fog/google/requests/compute/list_disk_types.rb +0 -46
- data/lib/fog/google/requests/compute/list_disks.rb +0 -29
- data/lib/fog/google/requests/compute/list_forwarding_rules.rb +0 -29
- data/lib/fog/google/requests/compute/list_global_forwarding_rules.rb +0 -30
- data/lib/fog/google/requests/compute/list_http_health_checks.rb +0 -29
- data/lib/fog/google/requests/compute/list_images.rb +0 -29
- data/lib/fog/google/requests/compute/list_regions.rb +0 -85
- data/lib/fog/google/requests/compute/list_servers.rb +0 -31
- data/lib/fog/google/requests/compute/list_target_http_proxies.rb +0 -30
- data/lib/fog/google/requests/compute/list_target_instances.rb +0 -30
- data/lib/fog/google/requests/compute/list_target_pools.rb +0 -29
- data/lib/fog/google/requests/compute/list_url_maps.rb +0 -29
- data/lib/fog/google/requests/compute/list_zones.rb +0 -28
- data/lib/fog/google/requests/dns/create_managed_zone.rb +0 -82
- data/lib/fog/google/requests/storage/put_bucket.rb +0 -71
- data/lib/fog/google/requests/storage/put_object_url.rb +0 -50
@@ -1,5 +1,5 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "fog/core/collection"
|
2
|
+
require "fog/google/models/sql/instance"
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Google
|
@@ -12,7 +12,7 @@ module Fog
|
|
12
12
|
#
|
13
13
|
# @return [Array<Fog::Google::SQL::Instance>] List of instance resources
|
14
14
|
def all
|
15
|
-
data = service.list_instances.body[
|
15
|
+
data = service.list_instances.body["items"] || []
|
16
16
|
load(data)
|
17
17
|
end
|
18
18
|
|
@@ -30,7 +30,7 @@ module Fog
|
|
30
30
|
rescue Fog::Errors::Error => e
|
31
31
|
# Google SQL returns a 403 if we try to access a non-existing resource
|
32
32
|
# The default behaviour in Fog is to return a nil
|
33
|
-
return nil if e.message ==
|
33
|
+
return nil if e.message == "The client is not authorized to make this request."
|
34
34
|
raise e
|
35
35
|
end
|
36
36
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "fog/core/model"
|
2
2
|
|
3
3
|
module Fog
|
4
4
|
module Google
|
@@ -11,29 +11,29 @@ module Fog
|
|
11
11
|
class Operation < Fog::Model
|
12
12
|
identity :operation
|
13
13
|
|
14
|
-
attribute :end_time, :aliases =>
|
15
|
-
attribute :enqueued_time, :aliases =>
|
14
|
+
attribute :end_time, :aliases => "endTime"
|
15
|
+
attribute :enqueued_time, :aliases => "enqueuedTime"
|
16
16
|
attribute :error
|
17
|
-
attribute :export_context, :aliases =>
|
18
|
-
attribute :import_context, :aliases =>
|
17
|
+
attribute :export_context, :aliases => "exportContext"
|
18
|
+
attribute :import_context, :aliases => "importContext"
|
19
19
|
attribute :instance
|
20
20
|
attribute :kind
|
21
|
-
attribute :operation_type, :aliases =>
|
22
|
-
attribute :start_time, :aliases =>
|
21
|
+
attribute :operation_type, :aliases => "operationType"
|
22
|
+
attribute :start_time, :aliases => "startTime"
|
23
23
|
attribute :state
|
24
|
-
attribute :user_email_address, :aliases =>
|
24
|
+
attribute :user_email_address, :aliases => "userEmailAddress"
|
25
25
|
|
26
|
-
DONE_STATE =
|
27
|
-
PENDING_STATE =
|
28
|
-
RUNNING_STATE =
|
29
|
-
UNKNOWN_STATE =
|
26
|
+
DONE_STATE = "DONE"
|
27
|
+
PENDING_STATE = "PENDING"
|
28
|
+
RUNNING_STATE = "RUNNING"
|
29
|
+
UNKNOWN_STATE = "UNKNOWN"
|
30
30
|
|
31
31
|
##
|
32
32
|
# Checks if the instance operation is pending
|
33
33
|
#
|
34
34
|
# @return [Boolean] True if the operation is pending; False otherwise
|
35
35
|
def pending?
|
36
|
-
|
36
|
+
state == PENDING_STATE
|
37
37
|
end
|
38
38
|
|
39
39
|
##
|
@@ -41,7 +41,7 @@ module Fog
|
|
41
41
|
#
|
42
42
|
# @return [Boolean] True if the operation is done; False otherwise
|
43
43
|
def ready?
|
44
|
-
|
44
|
+
state == DONE_STATE
|
45
45
|
end
|
46
46
|
|
47
47
|
##
|
@@ -51,7 +51,7 @@ module Fog
|
|
51
51
|
def reload
|
52
52
|
requires :identity
|
53
53
|
|
54
|
-
data = collection.get(
|
54
|
+
data = collection.get(instance, identity)
|
55
55
|
merge_attributes(data.attributes)
|
56
56
|
self
|
57
57
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "fog/core/collection"
|
2
|
+
require "fog/google/models/sql/operation"
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Google
|
@@ -15,11 +15,11 @@ module Fog
|
|
15
15
|
def all(instance_id)
|
16
16
|
data = []
|
17
17
|
begin
|
18
|
-
data = service.list_operations(instance_id).body[
|
18
|
+
data = service.list_operations(instance_id).body["items"] || []
|
19
19
|
rescue Fog::Errors::Error => e
|
20
20
|
# Google SQL returns a 403 if we try to access a non-existing resource
|
21
21
|
# The default behaviour in Fog is to return an empty Array
|
22
|
-
raise e unless e.message ==
|
22
|
+
raise e unless e.message == "The client is not authorized to make this request."
|
23
23
|
end
|
24
24
|
|
25
25
|
load(data)
|
@@ -40,7 +40,7 @@ module Fog
|
|
40
40
|
rescue Fog::Errors::Error => e
|
41
41
|
# Google SQL returns a 403 if we try to access a non-existing resource
|
42
42
|
# The default behaviour in Fog is to return a nil
|
43
|
-
return nil if e.message ==
|
43
|
+
return nil if e.message == "The client is not authorized to make this request."
|
44
44
|
raise e
|
45
45
|
end
|
46
46
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "fog/core/model"
|
2
2
|
|
3
3
|
module Fog
|
4
4
|
module Google
|
@@ -8,20 +8,20 @@ module Fog
|
|
8
8
|
#
|
9
9
|
# @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/sslCerts
|
10
10
|
class SslCert < Fog::Model
|
11
|
-
identity :sha1_fingerprint, :aliases =>
|
11
|
+
identity :sha1_fingerprint, :aliases => "sha1Fingerprint"
|
12
12
|
|
13
13
|
attribute :cert
|
14
|
-
attribute :cert_serial_number, :aliases =>
|
15
|
-
attribute :common_name, :aliases =>
|
16
|
-
attribute :create_time, :aliases =>
|
17
|
-
attribute :expiration_time, :aliases =>
|
14
|
+
attribute :cert_serial_number, :aliases => "certSerialNumber"
|
15
|
+
attribute :common_name, :aliases => "commonName"
|
16
|
+
attribute :create_time, :aliases => "createTime"
|
17
|
+
attribute :expiration_time, :aliases => "expirationTime"
|
18
18
|
attribute :instance
|
19
19
|
attribute :kind
|
20
20
|
|
21
21
|
# These attributes are not available in the representation of a 'SSL Certificate' returned by the SQL API.
|
22
22
|
# These attributes are only available as a reponse to a create operation
|
23
|
-
attribute :server_ca_cert, :aliases =>
|
24
|
-
attribute :cert_private_key, :aliases =>
|
23
|
+
attribute :server_ca_cert, :aliases => "serverCaCert"
|
24
|
+
attribute :cert_private_key, :aliases => "certPrivateKey"
|
25
25
|
|
26
26
|
##
|
27
27
|
# Deletes a SSL certificate. The change will not take effect until the instance is restarted.
|
@@ -32,11 +32,9 @@ module Fog
|
|
32
32
|
def destroy(options = {})
|
33
33
|
requires :instance, :identity
|
34
34
|
|
35
|
-
data = service.delete_ssl_cert(
|
36
|
-
operation = Fog::Google::SQL::Operations.new(:service => service).get(
|
37
|
-
unless options.fetch(:async, true)
|
38
|
-
operation.wait_for { ready? }
|
39
|
-
end
|
35
|
+
data = service.delete_ssl_cert(instance, identity)
|
36
|
+
operation = Fog::Google::SQL::Operations.new(:service => service).get(instance, data.body["operation"])
|
37
|
+
operation.wait_for { ready? } unless options.fetch(:async, true)
|
40
38
|
operation
|
41
39
|
end
|
42
40
|
|
@@ -47,7 +45,7 @@ module Fog
|
|
47
45
|
def reload
|
48
46
|
requires :instance, :identity
|
49
47
|
|
50
|
-
data = collection.get(
|
48
|
+
data = collection.get(instance, identity)
|
51
49
|
merge_attributes(data.attributes)
|
52
50
|
self
|
53
51
|
end
|
@@ -59,12 +57,12 @@ module Fog
|
|
59
57
|
def save
|
60
58
|
requires :instance, :common_name
|
61
59
|
|
62
|
-
raise Fog::Errors::Error.new(
|
60
|
+
raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
|
63
61
|
|
64
|
-
data = service.insert_ssl_cert(
|
65
|
-
merge_attributes(data[
|
66
|
-
self.server_ca_cert = Fog::Google::SQL::SslCert.new(data[
|
67
|
-
self.cert_private_key = data[
|
62
|
+
data = service.insert_ssl_cert(instance, common_name).body
|
63
|
+
merge_attributes(data["clientCert"]["certInfo"])
|
64
|
+
self.server_ca_cert = Fog::Google::SQL::SslCert.new(data["serverCaCert"])
|
65
|
+
self.cert_private_key = data["clientCert"]["certPrivateKey"]
|
68
66
|
self
|
69
67
|
end
|
70
68
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "fog/core/collection"
|
2
|
+
require "fog/google/models/sql/ssl_cert"
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Google
|
@@ -15,11 +15,11 @@ module Fog
|
|
15
15
|
def all(instance_id)
|
16
16
|
data = []
|
17
17
|
begin
|
18
|
-
data = service.list_ssl_certs(instance_id).body[
|
18
|
+
data = service.list_ssl_certs(instance_id).body["items"] || []
|
19
19
|
rescue Fog::Errors::Error => e
|
20
20
|
# Google SQL returns a 403 if we try to access a non-existing resource
|
21
21
|
# The default behaviour in Fog is to return an empty Array
|
22
|
-
raise e unless e.message ==
|
22
|
+
raise e unless e.message == "The client is not authorized to make this request."
|
23
23
|
end
|
24
24
|
|
25
25
|
load(data)
|
@@ -40,7 +40,7 @@ module Fog
|
|
40
40
|
rescue Fog::Errors::Error => e
|
41
41
|
# Google SQL returns a 403 if we try to access a non-existing resource
|
42
42
|
# The default behaviour in Fog is to return a nil
|
43
|
-
return nil if e.message ==
|
43
|
+
return nil if e.message == "The client is not authorized to make this request."
|
44
44
|
raise e
|
45
45
|
end
|
46
46
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "fog/core/model"
|
2
2
|
|
3
3
|
module Fog
|
4
4
|
module Google
|
@@ -10,9 +10,9 @@ module Fog
|
|
10
10
|
class Tier < Fog::Model
|
11
11
|
identity :tier
|
12
12
|
|
13
|
-
attribute :disk_quota, :aliases =>
|
13
|
+
attribute :disk_quota, :aliases => "DiskQuota"
|
14
14
|
attribute :kind
|
15
|
-
attribute :ram, :aliases =>
|
15
|
+
attribute :ram, :aliases => "RAM"
|
16
16
|
attribute :region
|
17
17
|
end
|
18
18
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "fog/core/collection"
|
2
|
+
require "fog/google/models/sql/tier"
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Google
|
@@ -12,7 +12,7 @@ module Fog
|
|
12
12
|
#
|
13
13
|
# @return [Array<Fog::Google::SQL::Tier>] List of tiers
|
14
14
|
def all
|
15
|
-
data = service.list_tiers.body[
|
15
|
+
data = service.list_tiers.body["items"] || []
|
16
16
|
load(data)
|
17
17
|
end
|
18
18
|
end
|
@@ -5,13 +5,13 @@ module Fog
|
|
5
5
|
recognizes :google_client_email, :google_key_location, :google_key_string, :google_client,
|
6
6
|
:app_name, :app_version, :google_json_key_location, :google_json_key_string
|
7
7
|
|
8
|
-
GOOGLE_MONITORING_API_VERSION =
|
9
|
-
GOOGLE_MONITORING_BASE_URL =
|
10
|
-
GOOGLE_MONITORING_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/monitoring
|
8
|
+
GOOGLE_MONITORING_API_VERSION = "v2beta2".freeze
|
9
|
+
GOOGLE_MONITORING_BASE_URL = "https://www.googleapis.com/cloudmonitoring/"
|
10
|
+
GOOGLE_MONITORING_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/monitoring)
|
11
11
|
|
12
12
|
##
|
13
13
|
# MODELS
|
14
|
-
model_path
|
14
|
+
model_path "fog/google/models/monitoring"
|
15
15
|
|
16
16
|
# Timeseries
|
17
17
|
model :timeseries
|
@@ -27,7 +27,7 @@ module Fog
|
|
27
27
|
|
28
28
|
##
|
29
29
|
# REQUESTS
|
30
|
-
request_path
|
30
|
+
request_path "fog/google/requests/monitoring"
|
31
31
|
|
32
32
|
# Timeseries
|
33
33
|
request :list_timeseries
|
@@ -50,7 +50,7 @@ module Fog
|
|
50
50
|
hash[key] = {
|
51
51
|
:timeseries => {},
|
52
52
|
:timeseries_descriptors => {},
|
53
|
-
:metric_descriptors => {}
|
53
|
+
:metric_descriptors => {}
|
54
54
|
}
|
55
55
|
end
|
56
56
|
end
|
@@ -76,10 +76,10 @@ module Fog
|
|
76
76
|
|
77
77
|
def initialize(options)
|
78
78
|
shared_initialize(options[:google_project], GOOGLE_MONITORING_API_VERSION, GOOGLE_MONITORING_BASE_URL)
|
79
|
-
options.merge!(:google_api_scope_url => GOOGLE_MONITORING_API_SCOPE_URLS.join(
|
79
|
+
options.merge!(:google_api_scope_url => GOOGLE_MONITORING_API_SCOPE_URLS.join(" "))
|
80
80
|
|
81
81
|
@client = initialize_google_client(options)
|
82
|
-
@monitoring = @client.discovered_api(
|
82
|
+
@monitoring = @client.discovered_api("cloudmonitoring", api_version)
|
83
83
|
end
|
84
84
|
end
|
85
85
|
end
|
@@ -5,181 +5,181 @@ module Fog
|
|
5
5
|
# List metric descriptors that match the query. If the query is not set, then all of the metric descriptors
|
6
6
|
# will be returned.
|
7
7
|
#
|
8
|
-
# @see https://
|
8
|
+
# @see https://cloud.google.com/monitoring/v2beta2/metricDescriptors/list
|
9
9
|
class Real
|
10
10
|
def list_metric_descriptors(options = {})
|
11
11
|
api_method = @monitoring.metric_descriptors.list
|
12
12
|
parameters = {
|
13
|
-
|
13
|
+
"project" => @project
|
14
14
|
}
|
15
15
|
|
16
|
-
parameters[
|
17
|
-
parameters[
|
18
|
-
parameters[
|
16
|
+
parameters["count"] = options[:count] if options.key?(:count)
|
17
|
+
parameters["pageToken"] = options[:page_token] if options.key?(:page_token)
|
18
|
+
parameters["query"] = options[:query] if options.key?(:query)
|
19
19
|
|
20
20
|
request(api_method, parameters)
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
24
|
class Mock
|
25
|
-
def list_metric_descriptors(
|
25
|
+
def list_metric_descriptors(_options = {})
|
26
26
|
body = {
|
27
|
-
|
28
|
-
|
29
|
-
{
|
30
|
-
|
31
|
-
|
32
|
-
{
|
33
|
-
{
|
34
|
-
{
|
35
|
-
{
|
36
|
-
{
|
27
|
+
"kind" => 'cloudmonitoring#listMetricDescriptorsResponse',
|
28
|
+
"metrics" => [
|
29
|
+
{ "name" => "compute.googleapis.com/instance/cpu/reserved_cores",
|
30
|
+
"project" => @project,
|
31
|
+
"labels" => [
|
32
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
33
|
+
{ "key" => "cloud.googleapis.com/location" },
|
34
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
35
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
36
|
+
{ "key" => "cloud.googleapis.com/service" }
|
37
37
|
],
|
38
|
-
|
39
|
-
|
38
|
+
"typeDescriptor" => { "metricType" => "gauge", "valueType" => "double" },
|
39
|
+
"description" => "Number of cores reserved on the host of the instance."
|
40
40
|
},
|
41
41
|
{
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
{
|
46
|
-
{
|
47
|
-
{
|
48
|
-
{
|
49
|
-
{
|
42
|
+
"name" => "compute.googleapis.com/instance/cpu/usage_time",
|
43
|
+
"project" => @project,
|
44
|
+
"labels" => [
|
45
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
46
|
+
{ "key" => "cloud.googleapis.com/location" },
|
47
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
48
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
49
|
+
{ "key" => "cloud.googleapis.com/service" }
|
50
50
|
],
|
51
|
-
|
52
|
-
|
51
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "double" },
|
52
|
+
"description" => "Delta CPU usage time. Units are seconds. You can get the per-core CPU utilization ratio by performing a rate operation on a point: doubleValue/(end-start), then divide by compute.googleapis.com/instance/cpu/reserved_cores at the corresponding end timestamp."
|
53
53
|
},
|
54
54
|
{
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
{
|
59
|
-
{
|
60
|
-
{
|
61
|
-
{
|
62
|
-
{
|
63
|
-
{
|
64
|
-
{
|
55
|
+
"name" => "compute.googleapis.com/instance/disk/read_bytes_count",
|
56
|
+
"project" => @project,
|
57
|
+
"labels" => [
|
58
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
59
|
+
{ "key" => "compute.googleapis.com/device_name" },
|
60
|
+
{ "key" => "compute.googleapis.com/device_type" },
|
61
|
+
{ "key" => "cloud.googleapis.com/location" },
|
62
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
63
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
64
|
+
{ "key" => "cloud.googleapis.com/service" }
|
65
65
|
],
|
66
|
-
|
67
|
-
|
66
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
67
|
+
"description" => "Delta count of bytes read from disk."
|
68
68
|
},
|
69
69
|
{
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
{
|
74
|
-
{
|
75
|
-
{
|
76
|
-
{
|
77
|
-
{
|
78
|
-
{
|
79
|
-
{
|
70
|
+
"name" => "compute.googleapis.com/instance/disk/read_ops_count",
|
71
|
+
"project" => @project,
|
72
|
+
"labels" => [
|
73
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
74
|
+
{ "key" => "compute.googleapis.com/device_name" },
|
75
|
+
{ "key" => "compute.googleapis.com/device_type" },
|
76
|
+
{ "key" => "cloud.googleapis.com/location" },
|
77
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
78
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
79
|
+
{ "key" => "cloud.googleapis.com/service" }
|
80
80
|
],
|
81
|
-
|
82
|
-
|
81
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
82
|
+
"description" => "Delta count of disk read IO operations."
|
83
83
|
},
|
84
84
|
{
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
{
|
89
|
-
{
|
90
|
-
{
|
91
|
-
{
|
92
|
-
{
|
93
|
-
{
|
94
|
-
{
|
85
|
+
"name" => "compute.googleapis.com/instance/disk/write_bytes_count",
|
86
|
+
"project" => @project,
|
87
|
+
"labels" => [
|
88
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
89
|
+
{ "key" => "compute.googleapis.com/device_name" },
|
90
|
+
{ "key" => "compute.googleapis.com/device_type" },
|
91
|
+
{ "key" => "cloud.googleapis.com/location" },
|
92
|
+
{ "key" => '"compute.googleapis.com/resource_id' },
|
93
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
94
|
+
{ "key" => "cloud.googleapis.com/service" }
|
95
95
|
],
|
96
|
-
|
97
|
-
|
96
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
97
|
+
"description" => "Delta count of bytes written to disk."
|
98
98
|
},
|
99
99
|
{
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
{
|
104
|
-
{
|
105
|
-
{
|
106
|
-
{
|
107
|
-
{
|
108
|
-
{
|
109
|
-
{
|
100
|
+
"name" => "compute.googleapis.com/instance/disk/write_ops_count",
|
101
|
+
"project" => @project,
|
102
|
+
"labels" => [
|
103
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
104
|
+
{ "key" => "compute.googleapis.com/device_name" },
|
105
|
+
{ "key" => '"compute.googleapis.com/device_type' },
|
106
|
+
{ "key" => "cloud.googleapis.com/location" },
|
107
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
108
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
109
|
+
{ "key" => "cloud.googleapis.com/service" }
|
110
110
|
],
|
111
|
-
|
112
|
-
|
111
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
112
|
+
"description" => "Delta count of disk write IO operations."
|
113
113
|
},
|
114
114
|
{
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
{
|
119
|
-
{
|
120
|
-
{
|
121
|
-
{
|
122
|
-
{
|
123
|
-
{
|
115
|
+
"name" => "compute.googleapis.com/instance/network/received_bytes_count",
|
116
|
+
"project" => @project,
|
117
|
+
"labels" => [
|
118
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
119
|
+
{ "key" => "compute.googleapis.com/loadbalanced" },
|
120
|
+
{ "key" => "cloud.googleapis.com/location" },
|
121
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
122
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
123
|
+
{ "key" => "cloud.googleapis.com/service" }
|
124
124
|
],
|
125
|
-
|
126
|
-
|
125
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
126
|
+
"description" => "Delta count of bytes received from network."
|
127
127
|
},
|
128
128
|
{
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
{
|
133
|
-
{
|
134
|
-
{
|
135
|
-
{
|
136
|
-
{
|
137
|
-
{
|
129
|
+
"name" => "compute.googleapis.com/instance/network/received_packets_count",
|
130
|
+
"project" => @project,
|
131
|
+
"labels" => [
|
132
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
133
|
+
{ "key" => "compute.googleapis.com/loadbalanced" },
|
134
|
+
{ "key" => "cloud.googleapis.com/location" },
|
135
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
136
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
137
|
+
{ "key" => "cloud.googleapis.com/service" }
|
138
138
|
],
|
139
|
-
|
140
|
-
|
139
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
140
|
+
"description" => "Delta count of packets received from network."
|
141
141
|
},
|
142
142
|
{
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
{
|
147
|
-
{
|
148
|
-
{
|
149
|
-
{
|
150
|
-
{
|
151
|
-
{
|
143
|
+
"name" => "compute.googleapis.com/instance/network/sent_bytes_count",
|
144
|
+
"project" => @project,
|
145
|
+
"labels" => [
|
146
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
147
|
+
{ "key" => "compute.googleapis.com/loadbalanced" },
|
148
|
+
{ "key" => "cloud.googleapis.com/location" },
|
149
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
150
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
151
|
+
{ "key" => "cloud.googleapis.com/service" }
|
152
152
|
],
|
153
|
-
|
154
|
-
|
153
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
154
|
+
"description" => "Delta count of bytes sent over network."
|
155
155
|
},
|
156
156
|
{
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
{
|
161
|
-
{
|
162
|
-
{
|
163
|
-
{
|
164
|
-
{
|
165
|
-
{
|
157
|
+
"name" => "compute.googleapis.com/instance/network/sent_packets_count",
|
158
|
+
"project" => @project,
|
159
|
+
"labels" => [
|
160
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
161
|
+
{ "key" => "compute.googleapis.com/loadbalanced" },
|
162
|
+
{ "key" => "cloud.googleapis.com/location" },
|
163
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
164
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
165
|
+
{ "key" => "cloud.googleapis.com/service" }
|
166
166
|
],
|
167
|
-
|
168
|
-
|
167
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
|
168
|
+
"description" => "Delta count of packets sent over network."
|
169
169
|
},
|
170
170
|
{
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
{
|
175
|
-
{
|
176
|
-
{
|
177
|
-
{
|
178
|
-
{
|
171
|
+
"name" => "compute.googleapis.com/instance/uptime",
|
172
|
+
"project" => @project,
|
173
|
+
"labels" => [
|
174
|
+
{ "key" => "compute.googleapis.com/instance_name" },
|
175
|
+
{ "key" => "cloud.googleapis.com/location" },
|
176
|
+
{ "key" => "compute.googleapis.com/resource_id" },
|
177
|
+
{ "key" => "compute.googleapis.com/resource_type" },
|
178
|
+
{ "key" => "cloud.googleapis.com/service" }
|
179
179
|
],
|
180
|
-
|
181
|
-
|
182
|
-
}
|
180
|
+
"typeDescriptor" => { "metricType" => "delta", "valueType" => "double" },
|
181
|
+
"description" => "Indicates the VM running time in seconds."
|
182
|
+
}
|
183
183
|
]
|
184
184
|
}
|
185
185
|
|