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
@@ -12,8 +12,8 @@ module Fog
|
|
12
12
|
def reset_instance_ssl_config(instance_id)
|
13
13
|
api_method = @sql.instances.reset_ssl_config
|
14
14
|
parameters = {
|
15
|
-
|
16
|
-
|
15
|
+
"project" => @project,
|
16
|
+
"instance" => instance_id
|
17
17
|
}
|
18
18
|
|
19
19
|
request(api_method, parameters)
|
@@ -22,23 +22,23 @@ module Fog
|
|
22
22
|
|
23
23
|
class Mock
|
24
24
|
def reset_instance_ssl_config(instance_id)
|
25
|
-
operation =
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
25
|
+
operation = random_operation
|
26
|
+
data[:operations][instance_id] ||= {}
|
27
|
+
data[:operations][instance_id][operation] = {
|
28
|
+
"kind" => 'sql#instanceOperation',
|
29
|
+
"instance" => instance_id,
|
30
|
+
"operation" => operation,
|
31
|
+
"operationType" => "UPDATE",
|
32
|
+
"state" => Fog::Google::SQL::Operation::DONE_STATE,
|
33
|
+
"userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
|
34
|
+
"enqueuedTime" => Time.now.iso8601,
|
35
|
+
"startTime" => Time.now.iso8601,
|
36
|
+
"endTime" => Time.now.iso8601
|
37
37
|
}
|
38
38
|
|
39
39
|
body = {
|
40
|
-
|
41
|
-
|
40
|
+
"kind" => 'sql#instancesResetSslConfig',
|
41
|
+
"operation" => operation
|
42
42
|
}
|
43
43
|
|
44
44
|
build_excon_response(body)
|
@@ -10,8 +10,8 @@ module Fog
|
|
10
10
|
def restart_instance(instance_id)
|
11
11
|
api_method = @sql.instances.restart
|
12
12
|
parameters = {
|
13
|
-
|
14
|
-
|
13
|
+
"project" => @project,
|
14
|
+
"instance" => instance_id
|
15
15
|
}
|
16
16
|
|
17
17
|
request(api_method, parameters)
|
@@ -20,23 +20,23 @@ module Fog
|
|
20
20
|
|
21
21
|
class Mock
|
22
22
|
def restart_instance(instance_id)
|
23
|
-
operation =
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
23
|
+
operation = random_operation
|
24
|
+
data[:operations][instance_id] ||= {}
|
25
|
+
data[:operations][instance_id][operation] = {
|
26
|
+
"kind" => 'sql#instanceOperation',
|
27
|
+
"instance" => instance_id,
|
28
|
+
"operation" => operation,
|
29
|
+
"operationType" => "RESTART",
|
30
|
+
"state" => Fog::Google::SQL::Operation::DONE_STATE,
|
31
|
+
"userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
|
32
|
+
"enqueuedTime" => Time.now.iso8601,
|
33
|
+
"startTime" => Time.now.iso8601,
|
34
|
+
"endTime" => Time.now.iso8601
|
35
35
|
}
|
36
36
|
|
37
37
|
body = {
|
38
|
-
|
39
|
-
|
38
|
+
"kind" => 'sql#instancesRestart',
|
39
|
+
"operation" => operation
|
40
40
|
}
|
41
41
|
|
42
42
|
build_excon_response(body)
|
@@ -10,10 +10,10 @@ module Fog
|
|
10
10
|
def restore_instance_backup(identity, backup_configuration, due_time)
|
11
11
|
api_method = @sql.instances.reset_ssl_config
|
12
12
|
parameters = {
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
13
|
+
"project" => @project,
|
14
|
+
"instance" => identity,
|
15
|
+
"backupConfiguration" => backup_configuration,
|
16
|
+
"dueTime" => due_time
|
17
17
|
}
|
18
18
|
|
19
19
|
request(api_method, parameters)
|
@@ -21,7 +21,7 @@ module Fog
|
|
21
21
|
end
|
22
22
|
|
23
23
|
class Mock
|
24
|
-
def restore_instance_backup(
|
24
|
+
def restore_instance_backup(_identity, _backup_configuration, _due_time)
|
25
25
|
Fog::Mock.not_implemented
|
26
26
|
end
|
27
27
|
end
|
@@ -10,14 +10,14 @@ module Fog
|
|
10
10
|
def set_instance_root_password(instance_id, password)
|
11
11
|
api_method = @sql.instances.set_root_password
|
12
12
|
parameters = {
|
13
|
-
|
14
|
-
|
13
|
+
"project" => @project,
|
14
|
+
"instance" => instance_id
|
15
15
|
}
|
16
16
|
|
17
17
|
body = {
|
18
|
-
|
19
|
-
|
20
|
-
|
18
|
+
"setRootPasswordContext" => {
|
19
|
+
"kind" => 'sql#setRootUserContext',
|
20
|
+
"password" => password
|
21
21
|
}
|
22
22
|
}
|
23
23
|
|
@@ -26,24 +26,24 @@ module Fog
|
|
26
26
|
end
|
27
27
|
|
28
28
|
class Mock
|
29
|
-
def set_instance_root_password(instance_id,
|
30
|
-
operation =
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
29
|
+
def set_instance_root_password(instance_id, _password)
|
30
|
+
operation = random_operation
|
31
|
+
data[:operations][instance_id] ||= {}
|
32
|
+
data[:operations][instance_id][operation] = {
|
33
|
+
"kind" => 'sql#instanceOperation',
|
34
|
+
"instance" => instance_id,
|
35
|
+
"operation" => operation,
|
36
|
+
"operationType" => "INJECT_USER",
|
37
|
+
"state" => Fog::Google::SQL::Operation::DONE_STATE,
|
38
|
+
"userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
|
39
|
+
"enqueuedTime" => Time.now.iso8601,
|
40
|
+
"startTime" => Time.now.iso8601,
|
41
|
+
"endTime" => Time.now.iso8601
|
42
42
|
}
|
43
43
|
|
44
44
|
body = {
|
45
|
-
|
46
|
-
|
45
|
+
"kind" => 'sql#instancesSetRootPassword',
|
46
|
+
"operation" => operation
|
47
47
|
}
|
48
48
|
|
49
49
|
build_excon_response(body)
|
@@ -10,53 +10,53 @@ module Fog
|
|
10
10
|
def update_instance(instance_id, settings_version, tier, options = {})
|
11
11
|
api_method = @sql.instances.update
|
12
12
|
parameters = {
|
13
|
-
|
14
|
-
|
13
|
+
"project" => @project,
|
14
|
+
"instance" => instance_id
|
15
15
|
}
|
16
16
|
|
17
17
|
body = {
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
18
|
+
"project" => @project,
|
19
|
+
"instance" => instance_id,
|
20
|
+
"settings" => {
|
21
|
+
"settingsVersion" => settings_version,
|
22
|
+
"tier" => tier
|
23
23
|
}
|
24
24
|
}
|
25
25
|
|
26
26
|
if options[:activation_policy]
|
27
|
-
body[
|
27
|
+
body["settings"]["activationPolicy"] = options[:activation_policy]
|
28
28
|
end
|
29
29
|
if options[:autorized_gae_applications]
|
30
|
-
body[
|
30
|
+
body["settings"]["authorizedGaeApplications"] = Array(options[:autorized_gae_applications])
|
31
31
|
end
|
32
32
|
if options[:backup_configuration]
|
33
|
-
body[
|
33
|
+
body["settings"]["backupConfiguration"] = options[:backup_configuration]
|
34
34
|
end
|
35
35
|
if options[:ip_configuration_authorized_networks]
|
36
|
-
body[
|
37
|
-
body[
|
36
|
+
body["settings"]["ipConfiguration"] ||= {}
|
37
|
+
body["settings"]["ipConfiguration"]["authorizedNetworks"] = Array(options[:ip_configuration_authorized_networks])
|
38
38
|
end
|
39
39
|
if options[:ip_configuration_enabled]
|
40
|
-
body[
|
41
|
-
body[
|
40
|
+
body["settings"]["ipConfiguration"] ||= {}
|
41
|
+
body["settings"]["ipConfiguration"]["enabled"] = options[:ip_configuration_enabled]
|
42
42
|
end
|
43
43
|
if options[:ip_configuration_require_ssl]
|
44
|
-
body[
|
45
|
-
body[
|
44
|
+
body["settings"]["ipConfiguration"] ||= {}
|
45
|
+
body["settings"]["ipConfiguration"]["requireSsl"] = options[:ip_configuration_require_ssl]
|
46
46
|
end
|
47
47
|
if options[:location_preference_zone_follow_gae_application]
|
48
|
-
body[
|
49
|
-
body[
|
48
|
+
body["settings"]["locationPreference"] ||= {}
|
49
|
+
body["settings"]["locationPreference"]["followGaeApplication"] = options[:location_preference_zone_follow_gae_application]
|
50
50
|
end
|
51
51
|
if options[:location_preference_zone]
|
52
|
-
body[
|
53
|
-
body[
|
52
|
+
body["settings"]["locationPreference"] ||= {}
|
53
|
+
body["settings"]["locationPreference"]["zone"] = options[:location_preference_zone]
|
54
54
|
end
|
55
55
|
if options[:pricing_plan]
|
56
|
-
body[
|
56
|
+
body["settings"]["pricingPlan"] = options[:pricing_plan]
|
57
57
|
end
|
58
58
|
if options[:replication_type]
|
59
|
-
body[
|
59
|
+
body["settings"]["replicationType"] = options[:replication_type]
|
60
60
|
end
|
61
61
|
|
62
62
|
request(api_method, parameters, body)
|
@@ -64,63 +64,63 @@ module Fog
|
|
64
64
|
end
|
65
65
|
|
66
66
|
class Mock
|
67
|
-
def update_instance(instance_id,
|
67
|
+
def update_instance(instance_id, _settings_version, tier, options = {})
|
68
68
|
data = self.data[:instances][instance_id]
|
69
|
-
data[
|
69
|
+
data["tier"] = tier
|
70
70
|
if options[:activation_policy]
|
71
|
-
data[
|
71
|
+
data["settings"]["activationPolicy"] = options[:activation_policy]
|
72
72
|
end
|
73
73
|
if options[:autorized_gae_applications]
|
74
|
-
data[
|
74
|
+
data["settings"]["authorizedGaeApplications"] = Array(options[:autorized_gae_applications])
|
75
75
|
end
|
76
76
|
if options[:backup_configuration]
|
77
|
-
data[
|
77
|
+
data["settings"]["backupConfiguration"] = options[:backup_configuration]
|
78
78
|
end
|
79
79
|
if options[:ip_configuration_authorized_networks]
|
80
|
-
data[
|
81
|
-
data[
|
80
|
+
data["settings"]["ipConfiguration"] ||= {}
|
81
|
+
data["settings"]["ipConfiguration"]["authorizedNetworks"] = Array(options[:ip_configuration_authorized_networks])
|
82
82
|
end
|
83
83
|
if options[:ip_configuration_enabled]
|
84
|
-
data[
|
85
|
-
data[
|
84
|
+
data["settings"]["ipConfiguration"] ||= {}
|
85
|
+
data["settings"]["ipConfiguration"]["enabled"] = options[:ip_configuration_enabled]
|
86
86
|
end
|
87
87
|
if options[:ip_configuration_require_ssl]
|
88
|
-
data[
|
89
|
-
data[
|
88
|
+
data["settings"]["ipConfiguration"] ||= {}
|
89
|
+
data["settings"]["ipConfiguration"]["requireSsl"] = options[:ip_configuration_require_ssl]
|
90
90
|
end
|
91
91
|
if options[:location_preference_zone_follow_gae_application]
|
92
|
-
data[
|
93
|
-
data[
|
92
|
+
data["settings"]["locationPreference"] ||= {}
|
93
|
+
data["settings"]["locationPreference"]["followGaeApplication"] = options[:location_preference_zone_follow_gae_application]
|
94
94
|
end
|
95
95
|
if options[:location_preference_zone]
|
96
|
-
data[
|
97
|
-
data[
|
96
|
+
data["settings"]["locationPreference"] ||= {}
|
97
|
+
data["settings"]["locationPreference"]["zone"] = options[:location_preference_zone]
|
98
98
|
end
|
99
99
|
if options[:pricing_plan]
|
100
|
-
data[
|
100
|
+
data["settings"]["pricingPlan"] = options[:pricing_plan]
|
101
101
|
end
|
102
102
|
if options[:replication_type]
|
103
|
-
data[
|
103
|
+
data["settings"]["replicationType"] = options[:replication_type]
|
104
104
|
end
|
105
105
|
self.data[:instances][instance_id] = data
|
106
106
|
|
107
|
-
operation =
|
107
|
+
operation = random_operation
|
108
108
|
self.data[:operations][instance_id] ||= {}
|
109
109
|
self.data[:operations][instance_id][operation] = {
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
110
|
+
"kind" => 'sql#instanceOperation',
|
111
|
+
"instance" => instance_id,
|
112
|
+
"operation" => operation,
|
113
|
+
"operationType" => "UPDATE",
|
114
|
+
"state" => Fog::Google::SQL::Operation::DONE_STATE,
|
115
|
+
"userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
|
116
|
+
"enqueuedTime" => Time.now.iso8601,
|
117
|
+
"startTime" => Time.now.iso8601,
|
118
|
+
"endTime" => Time.now.iso8601
|
119
119
|
}
|
120
120
|
|
121
121
|
body = {
|
122
|
-
|
123
|
-
|
122
|
+
"kind" => 'sql#instancesUpdate',
|
123
|
+
"operation" => operation
|
124
124
|
}
|
125
125
|
status = 200
|
126
126
|
|
@@ -129,4 +129,4 @@ module Fog
|
|
129
129
|
end
|
130
130
|
end
|
131
131
|
end
|
132
|
-
end
|
132
|
+
end
|
data/lib/fog/google/sql.rb
CHANGED
@@ -5,14 +5,14 @@ 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_SQL_API_VERSION =
|
9
|
-
GOOGLE_SQL_BASE_URL =
|
8
|
+
GOOGLE_SQL_API_VERSION = "v1beta3"
|
9
|
+
GOOGLE_SQL_BASE_URL = "https://www.googleapis.com/sql/"
|
10
10
|
GOOGLE_SQL_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/sqlservice.admin
|
11
11
|
https://www.googleapis.com/auth/cloud-platform)
|
12
12
|
|
13
13
|
##
|
14
14
|
# MODELS
|
15
|
-
model_path
|
15
|
+
model_path "fog/google/models/sql"
|
16
16
|
|
17
17
|
# Backup Run
|
18
18
|
model :backup_run
|
@@ -40,7 +40,7 @@ module Fog
|
|
40
40
|
|
41
41
|
##
|
42
42
|
# REQUESTS
|
43
|
-
request_path
|
43
|
+
request_path "fog/google/requests/sql"
|
44
44
|
|
45
45
|
# Backup Run
|
46
46
|
request :get_backup_run
|
@@ -89,7 +89,7 @@ module Fog
|
|
89
89
|
:backup_runs => {},
|
90
90
|
:instances => {},
|
91
91
|
:operations => {},
|
92
|
-
:ssl_certs => {}
|
92
|
+
:ssl_certs => {}
|
93
93
|
}
|
94
94
|
end
|
95
95
|
end
|
@@ -119,10 +119,10 @@ module Fog
|
|
119
119
|
|
120
120
|
def initialize(options)
|
121
121
|
shared_initialize(options[:google_project], GOOGLE_SQL_API_VERSION, GOOGLE_SQL_BASE_URL)
|
122
|
-
options.merge!(:google_api_scope_url => GOOGLE_SQL_API_SCOPE_URLS.join(
|
122
|
+
options.merge!(:google_api_scope_url => GOOGLE_SQL_API_SCOPE_URLS.join(" "))
|
123
123
|
|
124
124
|
@client = initialize_google_client(options)
|
125
|
-
@sql = @client.discovered_api(
|
125
|
+
@sql = @client.discovered_api("sqladmin", api_version)
|
126
126
|
end
|
127
127
|
end
|
128
128
|
end
|
data/lib/fog/google/version.rb
CHANGED
@@ -0,0 +1,15 @@
|
|
1
|
+
module Fog
|
2
|
+
module Parsers
|
3
|
+
module Storage
|
4
|
+
module Google
|
5
|
+
autoload :AccessControlList, File.expand_path("../google/access_control_list", __FILE__)
|
6
|
+
autoload :CopyObject, File.expand_path("../google/copy_object", __FILE__)
|
7
|
+
autoload :GetBucket, File.expand_path("../google/get_bucket", __FILE__)
|
8
|
+
autoload :GetBucketLogging, File.expand_path("../google/get_bucket_logging", __FILE__)
|
9
|
+
autoload :GetBucketObjectVersions, File.expand_path("../google/get_bucket_object_versions", __FILE__)
|
10
|
+
autoload :GetRequestPayment, File.expand_path("../google/get_request_payment", __FILE__)
|
11
|
+
autoload :GetService, File.expand_path("../google/get_service", __FILE__)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -5,35 +5,35 @@ module Fog
|
|
5
5
|
class AccessControlList < Fog::Parsers::Base
|
6
6
|
def reset
|
7
7
|
@in_entries = false
|
8
|
-
@entry = {
|
9
|
-
@response = {
|
8
|
+
@entry = { "Scope" => {} }
|
9
|
+
@response = { "Owner" => {}, "AccessControlList" => [] }
|
10
10
|
end
|
11
11
|
|
12
12
|
def start_element(name, attrs = [])
|
13
13
|
super
|
14
14
|
case name
|
15
|
-
when
|
15
|
+
when "Entries"
|
16
16
|
@in_entries = true
|
17
|
-
when
|
17
|
+
when "Scope"
|
18
18
|
struct = attrs.first
|
19
|
-
@entry[
|
19
|
+
@entry["Scope"][struct.localname] = struct.value
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
23
|
def end_element(name)
|
24
24
|
case name
|
25
|
-
when
|
25
|
+
when "Entries"
|
26
26
|
@in_entries = false
|
27
|
-
when
|
28
|
-
@response[
|
29
|
-
@entry = {
|
30
|
-
when
|
27
|
+
when "Entry"
|
28
|
+
@response["AccessControlList"] << @entry
|
29
|
+
@entry = { "Scope" => {} }
|
30
|
+
when "DisplayName", "ID"
|
31
31
|
if @in_entries
|
32
|
-
@entry[
|
32
|
+
@entry["Scope"][name] = value
|
33
33
|
else
|
34
|
-
@response[
|
34
|
+
@response["Owner"][name] = value
|
35
35
|
end
|
36
|
-
when
|
36
|
+
when "Permission"
|
37
37
|
@entry[name] = value
|
38
38
|
end
|
39
39
|
end
|